Merge pull request #12 from NOAA-GFDL/10-schemaedit

10 schemaedit
NOAA-GFDL · Jul 26, 2024 · 2d6222d · 2d6222d
2 parents 6bc010d + 7eac468
commit 2d6222d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/catalogbuilder/tests/test_config.yaml b/catalogbuilder/tests/test_config.yaml
@@ -13,9 +13,9 @@
 #with the ESM collection specification standards and the appropriate workflows.
 
 headerlist: ["activity_id", "institution_id", "source_id", "experiment_id",
-                  "frequency", "modeling_realm", "table_id",
+                  "frequency", "realm", "table_id",
                   "member_id", "grid_label", "variable_id",
-                  "temporal_subset", "chunk_freq","grid_label","platform","dimensions","cell_methods","path"]
+                  "time_range", "chunk_freq","grid_label","platform","dimensions","cell_methods","path"]
 
 #what kind of directory structure to expect?
 #For a directory structure like /archive/am5/am5/am5f3b1r0/c96L65_am5f3b1r0_pdclim1850F/gfdl.ncrc5-deploy-prod-openmp/pp
@@ -27,9 +27,9 @@ headerlist: ["activity_id", "institution_id", "source_id", "experiment_id",
 #The fourth directory is am5f3b1r0 which does not map to an existing header value. So we simply NA in output_path_template
 #for the fourth value.
 
-output_path_template: ['NA','NA','source_id','NA','experiment_id','platform','custom_pp','modeling_realm','cell_methods','frequency','chunk_freq']
+output_path_template: ['NA','NA','source_id','NA','experiment_id','platform','custom_pp','realm','cell_methods','frequency','chunk_freq']
 
-output_file_template: ['modeling_realm','temporal_subset','variable_id']
+output_file_template: ['realm','time_range','variable_id']
 
 #OUTPUT FILE INFO is currently passed as command-line argument.
 #We will revisit adding a csvfile, jsonfile and logfile configuration to the builder configuration file in the future.

diff --git a/configs/config-cmip.yaml b/configs/config-cmip.yaml
@@ -13,9 +13,9 @@
 #with the ESM collection specification standards and the appropriate workflows.
 
 headerlist: ["activity_id", "institution_id", "source_id", "experiment_id",
-                  "frequency", "modeling_realm", "table_id",
+                  "frequency", "realm", "table_id",
                   "member_id", "grid_label", "variable_id","version_id",
-                  "temporal_subset", "chunk_freq","platform","dimensions","cell_methods","path"]
+                  "time_range", "chunk_freq","platform","dimensions","cell_methods","path"]
 
 #what kind of directory structure to expect?
 #For a directory structure like /archive/am5/am5/am5f3b1r0/c96L65_am5f3b1r0_pdclim1850F/gfdl.ncrc5-deploy-prod-openmp/pp
@@ -30,7 +30,7 @@ headerlist: ["activity_id", "institution_id", "source_id", "experiment_id",
 #/uda/CMIP6/CMIP/NOAA-GFDL/GFDL-ESM4/1pctCO2/r1i1p1f1/Amon/tas/gr1/v20180701/tas_Amon_GFDL-ESM4_1pctCO2_r1i1p1f1_gr1_000101-010012.nc
 output_path_template: ['NA','activity_id','NA','institution_id','source_id','experiment_id','member_id','table_id','variable_id','grid_label','version_id']
 
-output_file_template: ['variable_id','table_id','source_id','experiment_id','member_id','grid_label','temporal_subset']
+output_file_template: ['variable_id','table_id','source_id','experiment_id','member_id','grid_label','time_range']
 
 #OUTPUT FILE INFO is currently passed as command-line argument.
 #We will revisit adding a csvfile, jsonfile and logfile configuration to the builder configuration file in the future.

diff --git a/configs/config-template.yaml b/configs/config-template.yaml
@@ -1,8 +1,8 @@
 #The headerlist contains expected column names in your catalog/csv file. This is usually determined by the users in conjuction
 #with the ESM collection specification standards and the appropriate workflows.
 
-headerlist: ["activity_id", "institution_id", "source_id", "experiment_id", "frequency", "modeling_realm", "table_id","member_id",
-            "grid_label", "variable_id", "temporal_subset", "chunk_freq","grid_label","platform","dimensions","cell_methods","path"]
+headerlist: ["activity_id", "institution_id", "source_id", "experiment_id", "frequency", "realm", "table_id","member_id",
+            "grid_label", "variable_id", "time_range", "chunk_freq","grid_label","platform","dimensions","cell_methods","path"]
 
 
 #what kind of directory structure to expect?
@@ -16,7 +16,7 @@ headerlist: ["activity_id", "institution_id", "source_id", "experiment_id", "fre
 
 output_path_template: ['NA','NA','source_id','NA','experiment_id','platform','custom_pp','modeling_realm','cell_methods','frequency','chunk_freq']
 
-output_file_template: ['modeling_realm','temporal_subset','variable_id']
+output_file_template: ['realm','time_range','variable_id']
 
 
 #ENTER INPUT PATH HERE (ex: /Users/ar46/archive/am5/am5/am5f3b1r0/c96L65_am5f3b1r0_pdclim1850F/gfdl.ncrc5-deploy-prod-openmp/pp/)

diff --git a/configs/config.yaml b/configs/config.yaml
@@ -13,9 +13,9 @@
 #with the ESM collection specification standards and the appropriate workflows.
 
 headerlist: ["activity_id", "institution_id", "source_id", "experiment_id",
-                  "frequency", "modeling_realm", "table_id",
+                  "frequency", "realm", "table_id",
                   "member_id", "grid_label", "variable_id",
-                  "temporal_subset", "chunk_freq","platform","dimensions","cell_methods","path"]
+                  "time_range", "chunk_freq","platform","dimensions","cell_methods","path"]
 
 #what kind of directory structure to expect?
 #For a directory structure like /archive/am5/am5/am5f3b1r0/c96L65_am5f3b1r0_pdclim1850F/gfdl.ncrc5-deploy-prod-openmp/pp
@@ -27,9 +27,9 @@ headerlist: ["activity_id", "institution_id", "source_id", "experiment_id",
 #The fourth directory is am5f3b1r0 which does not map to an existing header value. So we simply NA in output_path_template
 #for the fourth value.
 
-output_path_template: ['NA','NA','source_id','NA','experiment_id','platform','custom_pp','modeling_realm','cell_methods','frequency','chunk_freq']
+output_path_template: ['NA','NA','source_id','NA','experiment_id','platform','custom_pp','realm','cell_methods','frequency','chunk_freq']
 
-output_file_template: ['modeling_realm','temporal_subset','variable_id']
+output_file_template: ['realm','time_range','variable_id']
 
 #OUTPUT FILE INFO is currently passed as command-line argument.
 #We will revisit adding a csvfile, jsonfile and logfile configuration to the builder configuration file in the future.