Changeset 2497 in lmdz_wrf for trunk/tools

Timestamp:

May 2, 2019, 4:40:56 PM (6 years ago)

Author:

lfita

Message:

Making us of class `CFtimeU_inf' from generic_tools.py into 'cls_time_information'

File:

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

trunk/tools/nc_var_tools.py

@@ -2581 +2581 @@
             else:
                 units = times.getncattr('units')
+                lunits = uints.split(' ')
+                tunitsinf = CFtimeU_inf(units)
 
                 self.unitsval = units
@@ -2592 +2594 @@
                     cal = 'gregorian'
                 else:
+                    cal = tunitsinf.calendar
                     atimes = times.ncattrs()
-                    if gen.searchInlist(atimes, 'calendar'): 
-                        self.calendar = times.getncattr('calendar')
-                    elif gen.searchInlist(atimes, 'calendar_type'): 
-                        self.calendar = times.getncattr('calendar_type')
-                    cal = times.getncattr('calendar')
   
-                txtunits = units.split(' ')
-                self.units = 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!'
-                    self.refdate= gen.datetimeStr_datetime(txtunits[len(txtunits)-2]+\
-                      '_' + Srefdate)
-                    self.Urefdate = txtunits[len(txtunits) - 2] + ' ' + Srefdate
-                else:
-                    self.refdate = gen.datetimeStr_datetime(Srefdate + '_00:00:00')
-                    self.Urefdate = Srefdate
-
-                self.Srefdate = self.refdate.strftime("%Y%m%d%H%M%S")
+                self.units = tunitsinf.Tunits
+                self.refdate = tunitsinf.refdateDT
+                Srefdate = tunitsinf.refdate
+                if len(lunits) > 3: self.Urefdate = lunits[2] + '_' + lunits[3]
+                self.Srefdate = tunitsinf.refdateYmdHMS
                 timev = times[:]
 
@@ -2621 +2607 @@
                 self.dt = timev[1]-timev[0]
                 self.firstTu = timev[0]
-                print 'Lluis:', self.refdate, self.firstTu, self.units, cal
                 self.firstTt = gen.timeref_datetime(self.refdate, self.firstTu,      \
                   self.units, cal)