Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change "_control_vocabulary_file" to "_controlled_vocabulary_file" in user input file. #582

Merged
merged 1 commit into from
Mar 2, 2020
Merged

Change "_control_vocabulary_file" to "_controlled_vocabulary_file" in user input file. #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Test/CMOR_input_TestTables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

"#note": " **** The following are set correctly for CMIP6 and should not normally need editing",

"_control_vocabulary_file": "Tables/CMIP6_CV.json",
"_controlled_vocabulary_file": "Tables/CMIP6_CV.json",
"_AXIS_ENTRY_FILE": "Tables/CMIP6_coordinate.json",
"_FORMULA_VAR_FILE": "Tables/CMIP6_formula_terms.json",
"_cmip6_option": "CMIP6",
Expand Down
2 changes: 1 addition & 1 deletion Test/CMOR_input_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

"#note": " **** The following are set correctly for CMIP6 and should not normally need editing",

"_control_vocabulary_file": "CMIP6_CV.json",
"_controlled_vocabulary_file": "CMIP6_CV.json",
"_AXIS_ENTRY_FILE": "CMIP6_coordinate.json",
"_FORMULA_VAR_FILE": "CMIP6_formula_terms.json",
"_cmip6_option": "CMIP6",
Expand Down
2 changes: 1 addition & 1 deletion Test/baddirectory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_control_vocabulary_file": "CMIP6_CV.json",
"_controlled_vocabulary_file": "CMIP6_CV.json",
"_cmip6_option": "CMIP6",

"tracking_prefix": "hdl:21.14100",
Expand Down
2 changes: 1 addition & 1 deletion Test/cmor_speed_and_compression.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_control_vocabulary_file": "CMIP6_CV.json",
"_controlled_vocabulary_file": "CMIP6_CV.json",
"_cmip6_option": "CMIP6",

"activity_id": "CMIP",
Expand Down
2 changes: 1 addition & 1 deletion Test/common_user_inputNOBOUNDS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_control_vocabulary_file": "Tables/CMIP6_CV.json",
"_controlled_vocabulary_file": "Tables/CMIP6_CV.json",
"_AXIS_ENTRY_FILE": "CMIP6_coordinateTESTNOBOUNDS.json",
"_FORMULA_VAR_FILE": "Tables/CMIP6_formula_terms.json",
"_cmip6_option": "CMIP6",
Expand Down
2 changes: 1 addition & 1 deletion Test/common_user_input_NOID.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_control_vocabulary_file": "CMIP6_CV.json",
"_controlled_vocabulary_file": "CMIP6_CV.json",
"_AXIS_ENTRY_FILE": "CMIP6_coordinate.json",
"_FORMULA_VAR_FILE": "CMIP6_formula_terms.json",
"_cmip6_option": "CMIP6",
Expand Down
2 changes: 1 addition & 1 deletion Test/common_user_input_hier.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_control_vocabulary_file": "CMIP6_CV_hierarchical.json",
"_controlled_vocabulary_file": "CMIP6_CV_hierarchical.json",
"_AXIS_ENTRY_FILE": "CMIP6_coordinate.json",
"_FORMULA_VAR_FILE": "CMIP6_formula_terms.json",
"_cmip6_option": "CMIP6",
Expand Down
2 changes: 1 addition & 1 deletion Test/metadata-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_control_vocabulary_file": "CMIP6_CV.json",
"_controlled_vocabulary_file": "CMIP6_CV.json",
"_cmip6_option": "CMIP6",

"activity_id": "CMIP",
Expand Down
2 changes: 1 addition & 1 deletion Test/test_python_CMIP6_CV_badsourcetypeCHEMAER.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_control_vocabulary_file": "CMIP6_CV.json",
"_controlled_vocabulary_file": "CMIP6_CV.json",
"_cmip6_option": "CMIP6",

"tracking_prefix": "hdl:21.14100",
Expand Down
2 changes: 1 addition & 1 deletion cmip6-cmor-tables
Open in desktop
Submodule cmip6-cmor-tables updated 45 files
+1 −1 Tables/CMIP6_3hr.json
+1 −1 Tables/CMIP6_6hrLev.json
+1 −1 Tables/CMIP6_6hrPlev.json
+1 −1 Tables/CMIP6_6hrPlevPt.json
+1 −1 Tables/CMIP6_AERday.json
+1 −1 Tables/CMIP6_AERhr.json
+1 −1 Tables/CMIP6_AERmon.json
+1 −1 Tables/CMIP6_AERmonZ.json
+1 −1 Tables/CMIP6_Amon.json
+1 −1 Tables/CMIP6_CF3hr.json
+1 −1 Tables/CMIP6_CFday.json
+1 −1 Tables/CMIP6_CFmon.json
+1 −1 Tables/CMIP6_CFsubhr.json
+1 −1 Tables/CMIP6_E1hr.json
+1 −1 Tables/CMIP6_E1hrClimMon.json
+1 −1 Tables/CMIP6_E3hr.json
+1 −1 Tables/CMIP6_E3hrPt.json
+1 −1 Tables/CMIP6_E6hrZ.json
+1 −1 Tables/CMIP6_Eday.json
+1 −1 Tables/CMIP6_EdayZ.json
+1 −1 Tables/CMIP6_Efx.json
+1 −1 Tables/CMIP6_Emon.json
+1 −1 Tables/CMIP6_EmonZ.json
+1 −1 Tables/CMIP6_Esubhr.json
+1 −1 Tables/CMIP6_Eyr.json
+1 −1 Tables/CMIP6_IfxAnt.json
+1 −1 Tables/CMIP6_IfxGre.json
+1 −1 Tables/CMIP6_ImonAnt.json
+1 −1 Tables/CMIP6_ImonGre.json
+1 −1 Tables/CMIP6_IyrAnt.json
+1 −1 Tables/CMIP6_IyrGre.json
+1 −1 Tables/CMIP6_LImon.json
+1 −1 Tables/CMIP6_Lmon.json
+2 −2 Tables/CMIP6_Oclim.json
+1 −1 Tables/CMIP6_Oday.json
+1 −1 Tables/CMIP6_Odec.json
+1 −1 Tables/CMIP6_Ofx.json
+1 −1 Tables/CMIP6_Omon.json
+1 −1 Tables/CMIP6_Oyr.json
+1 −1 Tables/CMIP6_SIday.json
+1 −1 Tables/CMIP6_SImon.json
+1 −1 Tables/CMIP6_day.json
+1 −1 Tables/CMIP6_fx.json
+1 −1 Tables/CMIP6_grids.json
+1 −1 Tables/CMIP6_input_example.json
2 changes: 1 addition & 1 deletion include/cmor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
#define GLOBAL_ATT_TITLE_MSG "%s output prepared for %s"
#define GLOBAL_ATT_EXTERNAL_VAR "external_variables"
#define GLOBAL_ATT_MIP_ERA "mip_era"
#define GLOBAL_CV_FILENAME GLOBAL_INTERNAL"control_vocabulary_file"
#define GLOBAL_CV_FILENAME GLOBAL_INTERNAL"controlled_vocabulary_file"
#define GLOBAL_IS_CMIP6 GLOBAL_INTERNAL"cmip6_option"

#define NO_PARENT "no parent"
Expand Down