Changeset 1420 for trunk/libIGCM

Timestamp:

01/22/18 16:46:08 (6 years ago)

Author:

sdipsl

Message:

• optimize the way we drive where dr2xml_${compname}.xml write files

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

@@ -1562 +1562 @@
       eval CMIP6_DIR=\${CMIP6_BUF_${comp}}
 
-      ${libIGCM}/libIGCM_post/xios_parser.py tsquery --file dr2xml_${compname}.xml > dr2xml.temp.${compname}.txt
-
-      while read line  
-      do  
-          output_freq=$( echo ${line} | awk -F "," '{print $1}' | awk -F "=" '{print $2}' )
-          name=$(        echo ${line} | awk -F "," '{print $2}' | awk -F "=" '{print $2}' | awk -F "[ ]" '{print $2}' )
-          IGCM_debug_Print 1 "Changing in dr2xml_${compname}.xml this string : ${name} by this one ${CMIP6_DIR}/${name}"
-          sed -i -e "s:\"${name}:\"${CMIP6_DIR}/${name}:g" dr2xml_${compname}.xml
-      done < dr2xml.temp.${compname}.txt
-    fi
+      # Modify path from dr2xml_{compname}.xml
+      ${libIGCM}/libIGCM_post/xios_parser.py -v modifyPath --newPath ${CMIP6_DIR} --file dr2xml_${compname}.xml
+
+      # Overwrite the original file
+      IGCM_sys_Mv modified.dr2xml_${compname}.xml dr2xml_${compname}.xml
 
   done

trunk/libIGCM/libIGCM_post/xios_parser.py

@@ -175 +175 @@
             print s1
         print '\n'
-    
+   
+def modifyPath(args):
+    """Recursively find tree element with file tag and change the path prefix of the name attribute."""
+
+    # Loop over file_def files
+    for inputFile in args.file:
+        # Read the file_def_xml
+        if args.verbosity >= 1: print '\nReading dr2xml_def_xml=',inputFile
+        try:
+            tree = ET.parse(inputFile)
+        except:
+            print "Parse error. Please fix so that it can be parsed."
+            traceback.print_exc(file=sys.stdout)
+            return
+        root=tree.getroot()
+        if args.verbosity >= 3: print root.tag, root.attrib, '\n'
+
+        # Change file name prefix to point where we want
+        for elem in tree.iter(tag='file'):
+            name=elem.attrib.get('name')
+            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
+        try:
+            tree.write ('modified.' + inputFile)
+        except:
+            print "Write error. Please fix so that it can be parsed."
+            traceback.print_exc(file=sys.stdout)
+            return
+ 
 if __name__ == '__main__':
 
@@ -206 +237 @@
         parser_check.set_defaults(func=check, correction=True)
 
-        # create the parser for the "modify" command
+        # create the parser for the "modifyPath" command
+        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('--file', nargs='+', required=True, help='XIOS xml dr2xml_file type')
+        parser_check.set_defaults(func=modifyPath)
+        
+        # create the parser for the "showtime" command
         parser_check = subparsers.add_parser('showtime', help='Just want to make sure you feel good today')
         parser_check.set_defaults(func=showtime)