Changeset 2693 in lmdz_wrf for trunk

Timestamp:

Aug 12, 2019, 5:52:44 PM (5 years ago)

Author:

lfita

Message:

Using `CFtimeU_inf' in 'CFtimesvar_datetime'

File:

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

trunk/tools/generic_tools.py

@@ -730 +730 @@
         self.refdate = origSrefdate + ' ' + horrefS + ':' + minrefS + ':' + secrefS
         self.refdateYmdHMS = origSrefdate[0:4] + origSrefdate[5:7] +                 \
-          origSrefdate[8:10] + horrefS + ':' + minrefS + ':' + secrefS
+          origSrefdate[8:10] + horrefS + minrefS + secrefS
         self.refdatemat = [yrref, monref, dayref, horref, minref, secref]
         self.refdatejuliand = juliandate(yrref,monref,dayref,horref,minref,secref)
@@ -2898 +2898 @@
     fname = 'CFtimesvar_datetime'
 
+    timeinf = CFtimeU_inf(units)
+    
+    tunits = timeinf.Tunits
+    Srefdate = timeinf.refdate
+    refdate = timeinf.refdateDT
+
     availtunits = ['weeks', 'days', 'hours', 'minutes', 'seconds', 'miliseconds']
 
     txtunits = units.split(' ')
-    tunits = txtunits[0]
-    Srefdate = txtunits[len(txtunits) - 1]
-# Does reference date contain a time value [YYYY]-[MM]-[DD] [HH]:[MI]:[SS]
-##
-    timeval = Srefdate.find(':')
-    if not timeval == -1:
-#        print '  refdate with time!'
-        refdate = datetimeStr_datetime(txtunits[len(txtunits) - 2] + '_' + Srefdate)
-    else:
-        refdate = dateStr_date(Srefdate)
 
     dimt = len(times)