Changeset 1906 in lmdz_wrf

Timestamp:

Apr 13, 2018, 3:22:33 PM (7 years ago)

Author:

lfita

Message:

Making use of 'Nstr' at each call of `datetimeStr_conversion' on cfTime

File:

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

trunk/tools/nc_var_tools.py

@@ -11039 +11039 @@
 
     for it in range(dt):
-        wrfdates = datetimeStr_conversion(str(timewrfv[it]) +',minutes since ' +     \
+        wrfdates = datetimeStr_conversion(gen.Nstr(timewrfv[it]) +',minutes since '+ \
           startdate, 'cfTime', 'matYmdHMS') 
         cftimes[it] = realdatetime1_CFcompilant(wrfdates, refdate, tunitsval)
@@ -14156 +14156 @@
             fdates = ncf.variables[varn][:]
             for it in range(fdates.shape[0]):
-                datesv.append(datetimeStr_conversion(fdates[it], 'cfTime,' + tunits ,\
-                   'YmdHMS'))
+                datesv.append(datetimeStr_conversion(gen.Nstr(fdates[it]), 'cfTime,'+\
+                  tunits , 'YmdHMS'))
 
         ncobjs[filename] = datesv
@@ -22865 +22865 @@
 
     # Times period
-    begTmat= gen.datetimeStr_conversion(str(timev[0]),'cfTime,'+tunits, 'matYmdHMS')
-    endTmat= gen.datetimeStr_conversion(str(timev[dimt-1]),'cfTime,'+tunits,'matYmdHMS')
+    begTmat=gen.datetimeStr_conversion(gen.Nstr(timev[0]),'cfTime,'+tunits,'matYmdHMS')
+    endTmat = gen.datetimeStr_conversion(gen.Nstr(timev[dimt-1]),'cfTime,'+tunits,   \
+      'matYmdHMS')
     CFbeg = gen.realdatetime1_CFcompilant(begTmat, refdate, tunitsval)
     CFend = gen.realdatetime1_CFcompilant(endTmat, refdate, tunitsval)
@@ -23780 +23781 @@
             CFdimvalues['calendar'] = tcal
             
-            Sinit = gen.datetimeStr_conversion(str(CFitime), 'cfTime,'+tunits,       \
+            Sinit = gen.datetimeStr_conversion(gen.Nstr(CFitime), 'cfTime,'+tunits,  \
               'Y-m-dTH:M:SZ')
-            Sendt = gen.datetimeStr_conversion(str(CFetime), 'cfTime,'+tunits,       \
+            Sendt = gen.datetimeStr_conversion(gen.Nstr(CFetime), 'cfTime,'+tunits,  \
               'Y-m-dTH:M:SZ')
             secfreq = gen.CFtime_freq(axisv[0], axisv[1], tunits)
@@ -24327 +24328 @@
         mattvals = np.zeros((itvals.shape[0],6), dtype=int)
         for it in range(len(tvals)):
-            mattvals[it,:]= gen.datetimeStr_conversion(str(tvals[it]),               \
+            mattvals[it,:]= gen.datetimeStr_conversion(gen.Nstr(tvals[it]),          \
               'cfTime,minutes since 1949-12-01 00:00:00', 'matYmdHMS')
     elif tkind[0:6] == 'CFtime':
@@ -24334 +24335 @@
         mattvals = np.zeros((itvals.shape[0],6), dtype=int)
         for it in range(len(tvals)):
-            mattvals[it,:]= gen.datetimeStr_conversion(str(tvals[it]),               \
+            mattvals[it,:]= gen.datetimeStr_conversion(gen.Nstr(tvals[it]),          \
               'cfTime,'+utime, 'matYmdHMS')
     elif tkind[0:6] == 'string':