Changeset 2092 in lmdz_wrf

Timestamp:

Aug 24, 2018, 9:50:39 PM (7 years ago)

Author:

lfita

Message:

Fixing `datetimeStr_conversion'

File:

• trunk/tools/generic.py (modified) (1 diff)

trunk/tools/generic.py

@@ -173 +173 @@
     Nvals = 3
     vals = opts.values.split(cS)
+    if vals[0] == 'h':
+        print gen.datetimeStr_conversion.__doc__
+        quit(-1)
+
     newvals = []
     if vals[1] == 'cfTime':
         newvals.append(vals[0])
         newvals.append(vals[1]+','+vals[2])
-        if vals[2] == 'cfTime': newvals.append(vals[3]+','+vals[4])
+        if vals[2] == 'cfTime': newvals.append(vals[3]+','+vals[4].replace('!',' '))
         vals = list(newvals)
     if vals[2] == 'cfTime':
         newvals.append(vals[0])
         newvals.append(vals[1])
-        newvals.append(vals[2]+','+vals[3])
+        newvals.append(vals[2]+','+vals[3].replace('!',' '))
         vals = list(newvals)
-
-    if vals[0] == 'h':
+    if len(vals) != Nvals:
+        print errormsg
+        print '  ' + main + ": operation '" + oper + "' requires", Nvals, 'and', \
+          len(vals), ' has passed!!'
         print gen.datetimeStr_conversion.__doc__
         quit(-1)
-    else:
-        if len(vals) != Nvals:
-            print errormsg
-            print '  ' + main + ": operation '" + oper + "' requires", Nvals, 'and', \
-              len(vals), ' has passed!!'
-            print gen.datetimeStr_conversion.__doc__
-            quit(-1)
-        print gen.datetimeStr_conversion(vals[0], vals[1], vals[2])
+    print gen.datetimeStr_conversion(vals[0], vals[1], vals[2])
 
 #'days_period'