Changeset 1552 for trunk

Timestamp:

04/08/22 11:28:51 (2 years ago)

Author:

aclsce

Message:

Modified to use CMIP6 workflow for non CMIP6 runs.

Location:

trunk/libIGCM

Files:

• libIGCM_comp/libIGCM_comp.ksh (modified) (1 diff)
• libIGCM_post/xios_parser.py (modified) (2 diffs)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -1566 +1566 @@
         # Modify path from dr2xml_{compname}.xml
         if [ X${config_Post_dr2xmlIPSL} = XTRUE ]; then
-          ${libIGCM}/libIGCM_post/xios_parser.py -v modifydr2xmlIPSL --newPath ${CMIP6_DIR} --splitLastDate ${EndYear_p1} --JobName ${config_UserChoices_JobName} --ModelName ${config_UserChoices_ModelName} --ModelVersion ${config_UserChoices_LongName} --file dr2xml_${compname}.xml
+          ${libIGCM}/libIGCM_post/xios_parser.py -v modifydr2xmlIPSL --newPath ${CMIP6_DIR} --splitLastDate ${EndYear_p1} --JobName ${config_UserChoices_JobName} --ModelName ${config_UserChoices_ModelName} --ModelVersion ${config_UserChoices_LongName} --ExperimentName ${config_UserChoices_ExperimentName} --file dr2xml_${compname}.xml
         else
           ${libIGCM}/libIGCM_post/xios_parser.py -v modifyPath --newPath ${CMIP6_DIR} --file dr2xml_${compname}.xml

trunk/libIGCM/libIGCM_post/xios_parser.py

@@ -215 +215 @@
                             if childElem.attrib.get('name') == 'source_id':
                                childElem.text = args.ModelName[0]
+                if args.ExperimentName is not None:
+                    for childElem in elem.iter(tag='variable'):
+                        if args.verbosity >= 2: print childElem.tag, childElem.attrib
+                        if childElem.attrib.get('name') is not None:
+                            if childElem.attrib.get('name') == 'experiment':
+                               childElem.text = args.ExperimentName[0]
 
 
@@ -364 +370 @@
         parser_check.add_argument('--ModelName', nargs=1, required=False, help='Name of the model to be added in the name of file produced from dr2xml_file type')
         parser_check.add_argument('--ModelVersion', nargs=1, required=False, help='Model version to be added in global attributes of files produced from dr2xml_file type')
+        parser_check.add_argument('--ExperimentName',nargs=1, required=False, help='Name of the experiment')
         parser_check.add_argument('--file', nargs='+', required=True, help='XIOS xml dr2xml_file type')
         parser_check.add_argument('--splitLastDate', nargs=1, required=False, help='Date to be used as split_last_date')