@@ -587,8 +587,8 @@ def _create_raw_xml_file_impl(case, xml, filepath=None):
587
587
... <enable_postcondition_checks type='logical'>true</enable_postcondition_checks>
588
588
... </atm_proc_base>
589
589
... <physics_proc_base inherit='atm_proc_base'>
590
- ... <Grid>Physics GLL </Grid>
591
- ... <Grid grid='ne4ne4'>Physics PG2 </Grid>
590
+ ... <Grid>physics_gll </Grid>
591
+ ... <Grid grid='ne4ne4'>physics_pg2 </Grid>
592
592
... </physics_proc_base>
593
593
... <atm_proc_group inherit="atm_proc_base">
594
594
... <atm_procs_list>NONE</atm_procs_list>
@@ -617,7 +617,7 @@ def _create_raw_xml_file_impl(case, xml, filepath=None):
617
617
('enable_postcondition_checks', True),
618
618
( 'P1',
619
619
OrderedDict([ ('prop1', 'hi'),
620
- ('Grid', 'Physics PG2 '),
620
+ ('Grid', 'physics_pg2 '),
621
621
('number_of_subcycles', 1),
622
622
('enable_precondition_checks', True),
623
623
('enable_postcondition_checks', True)])),
@@ -940,7 +940,7 @@ def create_input_data_list_file(case,caseroot):
940
940
with open (eamxx_xml_file , "r" ) as fd :
941
941
eamxx_xml = ET .parse (fd ).getroot ()
942
942
943
- scorpio = get_child (eamxx_xml ,'Scorpio ' )
943
+ scorpio = get_child (eamxx_xml ,'scorpio ' )
944
944
out_files_xml = get_child (scorpio ,"output_yaml_files" ,must_exist = False )
945
945
# out_files = out_files_xml.text.split(",") if (out_files_xml is not None and out_files_xml.text is not None) else []
946
946
# for fn in out_files:
@@ -1009,7 +1009,7 @@ def do_cime_vars_on_yaml_output_files(case, caseroot):
1009
1009
with open (eamxx_xml_file , "r" ) as fd :
1010
1010
eamxx_xml = ET .parse (fd ).getroot ()
1011
1011
1012
- scorpio = get_child (eamxx_xml ,'Scorpio ' )
1012
+ scorpio = get_child (eamxx_xml ,'scorpio ' )
1013
1013
out_files_xml = get_child (scorpio ,"output_yaml_files" ,must_exist = False )
1014
1014
out_files = out_files_xml .text .split ("," ) if (out_files_xml is not None and out_files_xml .text is not None ) else []
1015
1015
@@ -1027,10 +1027,10 @@ def do_cime_vars_on_yaml_output_files(case, caseroot):
1027
1027
scream_input = yaml .load (open (scream_input_file ,"r" ),Loader = loader )
1028
1028
1029
1029
# Determine the physics grid type for use in CIME-var substitution.
1030
- pgt = 'GLL '
1030
+ pgt = 'gll '
1031
1031
atm_grid = case .get_value ('ATM_GRID' )
1032
1032
if '.pg' in atm_grid :
1033
- pgt = 'PG ' + atm_grid [- 1 ]
1033
+ pgt = 'pg ' + atm_grid [- 1 ]
1034
1034
1035
1035
for fn in out_files :
1036
1036
# Get full name
@@ -1052,10 +1052,10 @@ def do_cime_vars_on_yaml_output_files(case, caseroot):
1052
1052
# produces an output at t=0, which is not present in the restarted run, and
1053
1053
# which also causes different timestamp in the file name.
1054
1054
# Hence, change default output settings to perform a single AVERAGE step at the end of the run
1055
- if case .get_value ("TESTCASE" ) in ["ERP" , "ERS" ] and content ['Averaging Type ' ].upper ()== "INSTANT" :
1055
+ if case .get_value ("TESTCASE" ) in ["ERP" , "ERS" ] and content ['averaging_type ' ].upper ()== "INSTANT" :
1056
1056
hist_n = int (case .get_value ("HIST_N" ,resolved = True ))
1057
1057
hist_opt = case .get_value ("HIST_OPTION" ,resolved = True )
1058
- content ['output_control' ]['Frequency ' ] = hist_n
1058
+ content ['output_control' ]['frequency ' ] = hist_n
1059
1059
content ['output_control' ]['frequency_units' ] = hist_opt
1060
1060
content ['output_control' ]['skip_t0_output' ] = True
1061
1061
print ("ERS/ERP test with INSTANT output detected. Adjusting output control specs:\n " )
@@ -1065,7 +1065,7 @@ def do_cime_vars_on_yaml_output_files(case, caseroot):
1065
1065
# If frequency_units is not nsteps, verify that we don't request
1066
1066
# a frequency faster than the model timestep
1067
1067
if content ['output_control' ]['frequency_units' ] in ['nsecs' ,'nmins' ,'nhours' ]:
1068
- freq = content ['output_control' ]['Frequency ' ]
1068
+ freq = content ['output_control' ]['frequency ' ]
1069
1069
units = content ['output_control' ]['frequency_units' ]
1070
1070
dt_out = 1 if units == "nsecs" else 60 if units == "nmins" else 3600
1071
1071
dt_out = dt_out * int (freq )
@@ -1074,18 +1074,18 @@ def do_cime_vars_on_yaml_output_files(case, caseroot):
1074
1074
expect (dt_atm <= dt_out ,
1075
1075
"Cannot have output frequency faster than atm timestep.\n "
1076
1076
f" yaml file: { fn .strip ()} \n "
1077
- f" Frequency : { freq } \n "
1077
+ f" frequency : { freq } \n "
1078
1078
f" frequency_units: { units } \n "
1079
1079
f" ATM_NCPL: { case .get_value ('ATM_NCPL' )} \n "
1080
- f" This yields dt_atm={ dt_atm } > dt_output={ dt_out } . Please, adjust 'Frequency ' and/or 'frequency_units'\n " )
1080
+ f" This yields dt_atm={ dt_atm } > dt_output={ dt_out } . Please, adjust 'frequency ' and/or 'frequency_units'\n " )
1081
1081
1082
1082
ordered_dump (content , open (dst_yaml , "w" ))
1083
1083
1084
1084
output_yaml_files .append (dst_yaml )
1085
1085
1086
1086
# Now update the output yaml files entry, and dump the new content
1087
1087
# of the scream input to YAML file
1088
- scream_input ["Scorpio " ]["output_yaml_files" ] = refine_type ("," .join (output_yaml_files ),"array(string)" )
1088
+ scream_input ["scorpio " ]["output_yaml_files" ] = refine_type ("," .join (output_yaml_files ),"array(string)" )
1089
1089
with open (scream_input_file , "w" ) as fd :
1090
1090
fd .write (
1091
1091
"""################################################################
0 commit comments