Changeset 2705 in lmdz_wrf for trunk/tools/generic_tools.py

Timestamp:

Sep 18, 2019, 4:54:14 PM (5 years ago)

Author:

lfita

Message:

Dealing with lowering time-units

File:

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

trunk/tools/generic_tools.py

@@ -645 +645 @@
           00 UTC)
         refdateDT = reference date as datetime object
-        Tunits = origtunits
+        Tunits = units of time (one of 'weeks', 'days', 'hours', 'minutes', 'seconds')
         utoweeks = Factor to convert values from original temporal units to weeks
         utodays = Factor to convert values from original temporal units to days
@@ -744 +744 @@
             self.refdateDT = None
 
-        self.Tunits = origtunits
+        self.Tunits = origtunits.lower()
 
 
@@ -10614 +10614 @@
     fname = 'coincident_CFtimes'
 
-    tunitA = tunitA.replace('_',' ')
-    tunitB = tunitB.replace('_',' ')
-
-    if len(tunitA) == 4:
-        trefA = tunitA.split(' ')[2] + ' ' + tunitA.split(' ')[3]
-    else:
-        print warnmsg
-        print '  ' + fname + ": time-units without time '" + tunitA + "' !!"
-        print "    adding: '00:00:00"
-        trefA = tunitA.split(' ')[2] + ' 00:00:00'
-
-    if len(tunitB) == 4:
-        trefB = tunitB.split(' ')[2] + ' ' + tunitB.split(' ')[3]
-    else:
-        print warnmsg
-        print '  ' + fname + ": time-units without time '" + tunitB + "' !!"
-        print "    adding: '00:00:00"
-        trefB = tunitB.split(' ')[2] + ' 00:00:00'
-    tuA = tunitA.split(' ')[0]
-    tuB = tunitB.split(' ')[0]
+    tinfA = CFtimeU_inf(tunitA)
+    tinfB = CFtimeU_inf(tunitB)
+
+    trefA = tinfA.refdate
+    trefB = tinfB.refdate
+
+    tuA = tinfA.Tunits
+    tuB = tinfB.Tunits
 
 #    if tuB == 'months':