Changeset 2683 in lmdz_wrf for trunk

Timestamp:

Jul 14, 2019, 8:50:54 AM (5 years ago)

Author:

lfita

Message:

Using `CFtimeU_inf' in 'datetimeStr_conversion'

File:

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

trunk/tools/generic_tools.py

@@ -1022 +1022 @@
     if typeSi[0:6] == 'cfTime' and typeSi[0:9] != 'cfTimeCal':
         timeval = np.float(StringDT)
+        cftunits = typeSi.split(',')[1]
         tunits = typeSi.split(',')[1].split(' ')[0]
-        Srefdate = typeSi.split(',')[1].split(' ')[2]
-
-# Does reference date contain a time value [YYYY]-[MM]-[DD] [HH]:[MI]:[SS]
-##
-        yrref=Srefdate[0:4]
-        monref=Srefdate[5:7]
-        dayref=Srefdate[8:10]
-
-        trefT = typeSi.split(',')[1].find(':')
-        if not trefT == -1:
-            if len(typeSi.split(',')[1].split(' ')) == 3:
-                horref=Srefdate[11:13]
-                minref=Srefdate[14:16]
-                secref=Srefdate[17:19]
-            else:
-                Sreftime = typeSi.split(',')[1].split(' ')[3]
-                horref=Sreftime[0:2]
-                minref=Sreftime[3:5]
-                secref=Sreftime[6:8]                
-            refdate = datetimeStr_datetime( yrref + '-' + monref + '-' + dayref +    \
-              '_' + horref + ':' + minref + ':' + secref)
-        else:
-            refdate = datetimeStr_datetime( yrref + '-' + monref + '-' + dayref +    \
-              '_00:00:00')
+        timeinf = CFtimeU_inf(cftunits)
+
+        Srefdate = timeinf.refdate
+        refdate = timeinf.refdateDT
 
         if tunits == 'weeks':