Changeset 1339 for trunk/libIGCM

Timestamp:

08/17/16 10:09:01 (8 years ago)

Author:

sdipsl

Message:

• adjust the printed look and feel

Location:

trunk/libIGCM

Files:

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

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -630 +630 @@
     if [ ${#FileDef[@]} -ne 0 ] ; then
       # Check XMLs coherency now
-      ${libIGCM}/libIGCM_post/xios_parser.py check --field ${FieldDef} --file ${FileDef}
+      IGCM_debug_Print 1 "${libIGCM}/libIGCM_post/xios_parser.py check --field ${FieldDef[*]} --file ${FileDef[*]}"
+      ${libIGCM}/libIGCM_post/xios_parser.py check --field ${FieldDef[*]} --file ${FileDef[*]}
       if [ $? = 0 ] ; then
-        IGCM_debug_Print 3 "${compname} XIOS XMLs are consistent"
+        IGCM_debug_Print 1 "${compname} XIOS XMLs are consistent"
       else
-        IGCM_debug_Print 3 "${compname} XIOS XMLs ARE NOT consistent"
-        ${libIGCM}/libIGCM_post/xios_parser.py -v modify --field ${FieldDef} --file ${FileDef}
-        [ $? != 0] &&  IGCM_debug_Exit "Failed to fix XIOS xml files for ${compname}"
+        IGCM_debug_Print 1 "${compname} XIOS XMLs ARE NOT consistent. Try to fix it:"
+        IGCM_debug_Print 3 "${libIGCM}/libIGCM_post/xios_parser.py -v modify --field ${FieldDef[*]} --file ${FileDef[*]}"
+        ${libIGCM}/libIGCM_post/xios_parser.py -vv modify --field ${FieldDef[*]} --file ${FileDef[*]}
+        [ $? != 0 ] &&  IGCM_debug_Exit "Failed to fix XIOS xml files for ${compname}"
       fi
     fi

trunk/libIGCM/libIGCM_post/xios_parser.py

@@ -13 +13 @@
 #**************************************************************
 
-import os, pwd, sys, traceback, argparse, readline, rlcompleter
+import os, pwd, sys, traceback, argparse
 import xml.etree.ElementTree as ET
-readline.parse_and_bind("tab: complete")
+#import readline, rlcompleter
+#readline.parse_and_bind("tab: complete")
 
 indent = 0
@@ -50 +51 @@
 
 def findField(root):
-    """Recursively find and list field tag with ID or field_ref attribute."""
+    """Recursively find and list field tag with "id" or "field_ref" attribute."""
     global fromField
     global fromFile
@@ -104 +105 @@
         # Compare the two lists. fromField must be a superset of fromFile.
         if set(fromField).issuperset(set(fromFile)):
-            if args.verbosity >= 1: print 'ALL GOOD with %s' % (inputFile)
+            if args.verbosity >= 1: print '\nALL GOOD with %s' % (inputFile)
             if args.verbosity >= 3: print 'fromField=', fromField
             if args.verbosity >= 3: print 'fromFile=', fromFile
         else:
-            if args.verbosity >= 1: print 'TROUBLE AHEAD with %s' % (inputFile)
+            if args.verbosity >= 1: print '\nTROUBLE AHEAD with %s' % (inputFile)
             if args.verbosity >= 3: print ', '.join(sorted(list(set(fromFile)-set(fromField))))
             # Identify fields in fromFile but not in fromField
@@ -175 +176 @@
     except KeyboardInterrupt:
         print "Shutdown requested...exiting"
-    except Exception:
-        traceback.print_exc(file=sys.stdout)
+    #except Exception:
+    #    traceback.print_exc(file=sys.stdout)
     sys.exit(0)