Changeset 1467

Timestamp:

07/13/18 10:18:25 (6 years ago)

Author:

sdipsl

Message:

• Add option dr2xmlFilePrefix under the [Post] section of config.card. It will add the JobName? as the prefix of CMIP6 files produced by the WF.

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

@@ -1571 +1571 @@
       eval IGCM_sys_Mkdir \${CMIP6_BUF_${comp}}
       eval CMIP6_DIR=\${CMIP6_BUF_${comp}}
-
       # Modify path from dr2xml_{compname}.xml
-      ${libIGCM}/libIGCM_post/xios_parser.py -v modifyPath --newPath ${CMIP6_DIR} --file dr2xml_${compname}.xml
-
+      if [ X${config_Post_dr2xmlFilePrefix} = XTRUE ]; then
+        ${libIGCM}/libIGCM_post/xios_parser.py -v modifyPath --newPath ${CMIP6_DIR} --filePrefix ${config_UserChoices_JobName} --file dr2xml_${compname}.xml
+      else
+        ${libIGCM}/libIGCM_post/xios_parser.py -v modifyPath --newPath ${CMIP6_DIR} --file dr2xml_${compname}.xml
+      fi
       # Overwrite the original file
       IGCM_sys_Mv modified.dr2xml_${compname}.xml dr2xml_${compname}.xml

trunk/libIGCM/libIGCM_post/xios_parser.py

@@ -196 +196 @@
             if not elem.attrib.get('mode') == 'read':
                 name=elem.attrib.get('name')
-                elem.set('name', os.path.normpath(args.newPath[0]) + '/' + os.path.normpath(name))
+                if args.filePrefix is not None:
+                    elem.set('name', os.path.normpath(args.newPath[0]) + '/' + args.filePrefix[0] + '_' + os.path.normpath(name))
+                else:
+                    elem.set('name', os.path.normpath(args.newPath[0]) + '/' + os.path.normpath(name))
                 if args.verbosity >= 2: print elem.tag, elem.attrib
-
+                    
         # Write out the results
         if args.verbosity >= 1: print '\nWriting dr2xml_def_xml=','modified.' + inputFile
@@ -310 +313 @@
         parser_check = subparsers.add_parser('modifyPath', help='Will make sure dr2xml write files where it should be')
         parser_check.add_argument('--newPath', nargs=1, required=True, help='Directory output for file produced from dr2xml_file type')
+        parser_check.add_argument('--filePrefix', nargs=1, required=False, help='Prefix to be added to file produced from dr2xml_file type')
         parser_check.add_argument('--file', nargs='+', required=True, help='XIOS xml dr2xml_file type')
         parser_check.set_defaults(func=modifyPath)