Changeset 2433 in lmdz_wrf

Timestamp:

Apr 11, 2019, 7:31:13 PM (6 years ago)

Author:

lfita

Message:

Fixing 'datetimeStr_conversion' for `cfTimeCal' output

Location:

trunk/tools

Files:

• generic.py (modified) (2 diffs)
• generic_tools.py (modified) (5 diffs)

trunk/tools/generic.py

@@ -202 +202 @@
         newvals.append(vals[0])
         newvals.append(vals[1]+','+vals[2])
-        if vals[2] == 'cfTime': newvals.append(vals[3]+','+vals[4].replace('!',' '))
-        vals = list(newvals)
+        if vals[2] == 'cfTime': 
+            newvals.append(vals[3]+','+vals[4].replace('!',' '))
+        else:
+            newvals.append(vals[2])
     elif vals[1] == 'cfTimeCal':
         newvals.append(vals[0])
@@ -209 +211 @@
         if vals[2] == 'cfTimeCal': newvals.append(vals[3] + ',' +                    \
           vals[4].replace('!',' ')+','+vals[5])
-        vals = list(newvals)
+        else:
+            newvals.append(vals[4])
     if vals[2] == 'cfTime':
         newvals.append(vals[0])
         newvals.append(vals[1])
         newvals.append(vals[2]+','+vals[3].replace('!',' '))
-        vals = list(newvals)
     elif vals[2] == 'cfTimeCal':
         newvals.append(vals[0])
         newvals.append(vals[1])
-        if vals[2] == 'cfTimeCal': newvals.append(vals[2] + ',' +                    \
-          vals[3].replace('!',' ')+','+vals[4])
+        newvals.append(vals[2] + ',' + vals[3].replace('!',' ')+','+vals[4])
+    if len(newvals) > 0:
         vals = list(newvals)
+
     if len(vals) != Nvals:
         print errormsg

trunk/tools/generic_tools.py

@@ -755 +755 @@
             newdate = refdate + dt.timedelta(hours=float(timeval))
         elif tunits == 'minutes':
-            print 'Lluis here ', removeleap, calendar
             if removeleap: timeval = timeval + 1.*24.*60.*Nleapd
             newdate = refdate + dt.timedelta(minutes=float(timeval))
@@ -858 +857 @@
         quit(-1)
 
-    if typeSo[0:6] == 'cfTime':
+    if typeSo[0:6] == 'cfTime' and typeSo[0:9] != 'cfTimeCal':
         tunits = typeSo.split(',')[1].split(' ')[0]
         Srefdate = typeSo.split(',')[1].split(' ')[2]
@@ -886 +885 @@
             refdate = datetimeStr_datetime( yrref + '-' + monref + '-' + dayref +    \
               '_00:00:00')
+
         datei = dt.datetime(yr, mo, da, ho, mi, se)
         difft = datei - refdate
@@ -913 +913 @@
         dateYmdHMS = cfdt
         
-    elif typeSo[0:6] == 'cfTimeCal':
+    elif typeSo[0:9] == 'cfTimeCal':
         tunits = typeSo.split(',')[1].split(' ')[0]
         Srefdate = typeSo.split(',')[1].split(' ')[2]
         calendar = typeSo.split(',')[2]
 
-        if not gen.searchInlist(availcalendar , calendar):
+        if not searchInlist(availcalendar , calendar):
             print errormsg
             print '  ' + fname + ": calendar '" + + "' not ready !!"
@@ -958 +958 @@
         if calendar == 'noleap' or calendar == '365d':
             removeleap = False
-            if days_month(newdate.year,2) == 29:
+            if int(yrref) <= datei.year:
+                Nleapd = leapdays(int(yrref), datei.year)
+            else:
+                Nleapd = leapdays(datei.year, int(yrref))
+            removeleap = True
+            totsecs = totsecs-Nleapd*24*3600.
+
+        if calendar == 'noleap' or calendar == '365d':
+            removeleap = False
+            if days_month(datei.year,2) == 29:
                 if datei.month == 2 and datei.day == 28:
                     totsecs = totsecs - 24.*3600.