Changeset 2482 in lmdz_wrf

Timestamp:

Apr 29, 2019, 8:35:45 PM (7 years ago)

Author:

lfita

Message:

Improving `gen_impose_gregorian' by making use of 'CFtimeU_inf' class

File:

• trunk/tools/generic_tools.py (modified) (3 diffs)

trunk/tools/generic_tools.py

@@ -2336 +2336 @@
     availcalendar = ['noleap', '365d', '365_day']
 
-    lTunits = Tunits.split(' ')
-    NTunits = len(lTunits)
-    Tu = lTunits[0]
-
-    if NTunits < 4: 
-        print infmsg
-        print '  ' + fname + ": CF-time units without time, adding '00:00:00' !!"
-        Srefdate = lTunits[2] + ' 00:00:00'
-    else:
-        Srefdate = lTunits[2] + ' ' + lTunits[3]
-    refdate = [int(Srefdate[0:4]), int(Srefdate[5:7]), int(Srefdate[8:10]),          \
-      int(Srefdate[11:13]), int(Srefdate[14:16]), int(Srefdate[17:19]) ]
+    timeinf = CFtimeU_inf(Tunits)
+
+    refdate = timeinf.refdate
+    Tu = timeinf.Tunits
 
     if type(timev) == type(range(2)):
@@ -2367 +2359 @@
         quit(-1)
 
-    if Tu == 'weeks':
-        timevdays = timev * 7
-    elif Tu == 'days':
-        timevdays = timev * 1.
-    elif Tu == 'hours':
-        timevdays = timev / 24.
-    elif Tu == 'minutes':
-        timevdays = timev / (24.*60.)
-    elif Tu == 'seconds':
-        timevdays = timev / (24.*3600.)
-    else:
-        print errormsg
-        print '  ' + fname + ": CF time units '" + Tu + "' not ready !!"
-        print '    available ones:', availTu
-        quit(-1)
+    # Transforming to days
+    factordays = timeinf.utodays
+    timevdays = timev * factordays
 
     newtimes = np.zeros((dimt), dtype=np.float64)
-
-    refdays = juliandate(refdate[0], refdate[1], refdate[2], refdate[3], refdate[4], refdate[5])
-
-    yrref = refdate[0]
+    refdays = timeinf.refdatejuliand
+    yrref = timeinf.refdatemat[0]
     if cal == 'noleap' or cal == '365d' or cal == '365_day':
         for it in range(dimt):
@@ -2409 +2387 @@
         
     # Re-transforming to the original units
-    if Tu == 'weeks':
-        newtimes = newtimes/(7.)
-    elif Tu == 'days':
-        newtimes = newtimes*1.
-    elif Tu == 'hours':
-        newtimes = newtimes*60.
-    elif Tu == 'minutes':
-        newtimes = newtimes*24.*3600.
+    newtimes = newtimes/factordays
 
     return newtimes