Changeset 2694 in lmdz_wrf for trunk

Timestamp:

Aug 12, 2019, 8:09:28 PM (6 years ago)

Author:

lfita

Message:

Making use in different places of `CFtimeU_inf'

Location:

trunk/tools

Files:

• generic_tools.py (modified) (2 diffs)
• nc_var_tools.py (modified) (1 diff)

trunk/tools/generic_tools.py

@@ -15533 +15533 @@
             for it in range(dimt):
                 if mattimes[it,1] == 2 and mattimes[it,2] == 29:
-                    print '  ' + fname + ": for time section '" + timesce +          \
+                    print '  ' + fname + ": for time section '" + timesec +          \
                       "' no leap date February 29 !!"
                 else:
@@ -15834 +15834 @@
 
     # Passing to CF-times
-    Srefdate0 = tu.split(' ')[2]
-    Sreftime0 = tu.split(' ')[3]
-    tunits = tu.split(' ')[0]
-
-    if Srefdate0.find('/') != -1: Srdate = Srefdate0.replace('/', '')
-    elif Srefdate0.find('-') != -1: Srdate = Srefdate0.replace('-','')
-    else:
-        print errormsg
-        print '  ' + fname + ": I do not know how to create a [YYYY][MM][DD] " +     \
-          "date with '" + Srefdate0 + "' !!"
-        print "    expecting '/' or '-' splitting characters"
-        quit(-1)
-
-    if Sreftime0.find(':') != -1: Srtime = Sreftime0.replace(':', '')
-    else:
-        print errormsg
-        print '  ' + fname + ": I do not know how to create a [HH][MI][SS] " +       \
-          "date with '" + Sreftime0 + "' !!"
-        print "    expecting ':' splitting character"
-        quit(-1)
-
-    Srefdate = Srdate + Srtime
+    tinf = CFtimeU_inf(tu)
+
+    Srefdate = tinf.refdateYmdHMS
+    tunits = tinf.Tunits
+
     #print '  dates slices ________'
     if per[0:3] == 'agg':

trunk/tools/nc_var_tools.py

@@ -26306 +26306 @@
         timec = 'standard'
 
-    tunits = timeu.split(' ')[0]
-    trefdate = timeu.split(' ')[2] + '_' + timeu.split(' ')[3]
+    timeinf = gen.CFtimeU_inf(timeu)
+    tunits = timeinf.Tunits
+    trefdate = timeinf.refdate
 
     # Getting periods