You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by hu...@apache.org on 2017/05/11 21:25:57 UTC

[1/2] climate git commit: CLIMATE-915 - Updates for the NARCCAP example configuration files

Repository: climate
Updated Branches:
  refs/heads/master 1ad9e17c6 -> 55e51c89e


CLIMATE-915 - Updates for the NARCCAP example configuration files

- Fig14_and_Fig15.yaml, Fig16_summer.yaml, and Fig16_winter.yaml have been updated.


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/e84bd183
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/e84bd183
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/e84bd183

Branch: refs/heads/master
Commit: e84bd1839dbbeb7bd64a9cd837e0895a0c86e092
Parents: 1ad9e17
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Thu May 11 13:22:11 2017 -0700
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Thu May 11 13:22:11 2017 -0700

----------------------------------------------------------------------
 RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml | 4 +++-
 RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml    | 5 +++--
 RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml    | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/e84bd183/RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml
----------------------------------------------------------------------
diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml
index 83a2e32..11410a2 100644
--- a/RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml
+++ b/RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml
@@ -22,9 +22,11 @@ regrid:
     regrid_dlat: 0.50
     regrid_dlon: 0.50
 
+# generic_dataset_name: If false, data filenames must include the elements of dataset_name list. 
 datasets:
   - loader_name: local
-    name: SRB
+    generic_dataset_name: True
+    dataset_name: ['SRB']
     file_path: ./data/NARCCAP_data/srb_rel3.0_shortwave_from_1983_to_2007.nc
     variable_name: sw_sfc_dn
 

http://git-wip-us.apache.org/repos/asf/climate/blob/e84bd183/RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml
----------------------------------------------------------------------
diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml
index dca3c00..05cda15 100644
--- a/RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml
+++ b/RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml
@@ -21,10 +21,11 @@ regrid:
     regrid_on_reference: False
     regrid_dlat: 0.50
     regrid_dlon: 0.50
-
+# generic_dataset_name: If false, data filenames must include the elements of dataset_name list.
 datasets:
   - loader_name: local
-    name: SRB
+    generic_dataset_name: True
+    dataset_name: ['SRB']
     file_path: ./data/NARCCAP_data/srb_rel3.0_shortwave_from_1983_to_2007.nc
     variable_name: sw_sfc_dn
 

http://git-wip-us.apache.org/repos/asf/climate/blob/e84bd183/RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml
----------------------------------------------------------------------
diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml
index d6e647f..622bbe3 100644
--- a/RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml
+++ b/RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml
@@ -22,9 +22,11 @@ regrid:
     regrid_dlat: 0.50
     regrid_dlon: 0.50
 
+# generic_dataset_name: If false, data filenames must include the elements of dataset_name list.
 datasets:
   - loader_name: local
-    name: SRB
+    generic_dataset_name: True
+    dataset_name: ['SRB']
     file_path: ./data/NARCCAP_data/srb_rel3.0_shortwave_from_1983_to_2007.nc
     variable_name: sw_sfc_dn
 


[2/2] climate git commit: Merge branch 'CLIMATE-915'

Posted by hu...@apache.org.
Merge branch 'CLIMATE-915'


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/55e51c89
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/55e51c89
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/55e51c89

Branch: refs/heads/master
Commit: 55e51c89ee0e606bf657d53c0122007595b41206
Parents: 1ad9e17 e84bd18
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Thu May 11 14:25:44 2017 -0700
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Thu May 11 14:25:44 2017 -0700

----------------------------------------------------------------------
 RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml | 4 +++-
 RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml    | 5 +++--
 RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml    | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------