Changeset 645 in lmdz_wrf for trunk

Timestamp:

Sep 19, 2015, 4:59:59 PM (9 years ago)

Author:

lfita

Message:

Fixing the extra time-ticks issue on 'CFtime_plot'

File:

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

trunk/tools/drawing_tools.py

@@ -2055 +2055 @@
             mon = firstTvec[1]
             day = firstTvec[2]
-
+ 
+            Iunits = np.mod(hour,Nunits)
             if np.sum(firstTvec[2:5]) > 0:
                 firstTdt = dt.datetime(yr, mon, day+1, 0, 0, 0)
                 datev = dt.datetime(yr, mon, day+1, 0, 0, 0)
+            elif Iunits != 0:
+                nNunits = int(day/Nunits)
+                firstTdt = dt.datetime(yr, mon, nNunits*Nunits, 0, 0, 0)
+                datev = dt.datetime(yr, mon, nNunits*Nunits, 0, 0, 0)
             else:
                 firstTdt = dt.datetime(yr, mon, day, 0, 0, 0)
@@ -2076 +2081 @@
             hour = firstTvec[3]
 
-            if np.sum(firstTvec[4:5]) > 0 or np.mod(hour,Nunits) != 0:
+            Iunits = np.mod(hour,Nunits)
+            if np.sum(firstTvec[4:5]) > 0 or Iunits != 0:
                 tadvance = 2*Nunits
                 if tadvance >= 24:
@@ -2082 +2088 @@
                     datev = dt.datetime(yr, mon, day+1, 0, 0, 0)
                 else:
-                    firstTdt = dt.datetime(yr, mon, day, Nunits, 0, 0)
-                    datev = dt.datetime(yr, mon, day, Nunits, 0, 0)
+                    nNunits = int(hour/Nunits)
+                    firstTdt = dt.datetime(yr, mon, day, nNunits*Nunits, 0, 0)
+                    datev = dt.datetime(yr, mon, day, nNunits*Nunits, 0, 0)
             else:
                 firstTdt = dt.datetime(yr, mon, day, hour, 0, 0)
@@ -2101 +2108 @@
             minu = firstTvec[4]
 
-            if firstTvec[5] > 0 or np.mod(minu,Nunits) != 0:
+            Iunits = np.mod(minu,Nunits)
+            if firstTvec[5] > 0 or Iunits != 0:
                 tadvance = 2*Nunits
                 if tadvance >= 60:
@@ -2107 +2115 @@
                     datev = dt.datetime(yr, mon, day, hour, 0, 0)
                 else:
-                    firstTdt = dt.datetime(yr, mon, day, hour, Nunits, 0)
-                    datev = dt.datetime(yr, mon, day, hour, Nunits, 0)
+                    nNunits = int(minu/Nunits)
+                    firstTdt = dt.datetime(yr, mon, day, hour, nNunits*Nunits, 0)
+                    datev = dt.datetime(yr, mon, day, hour, nNunits*Nunits, 0)
             else:
                 firstTdt = dt.datetime(yr, mon, day, hour, minu, 0)
@@ -2119 +2128 @@
         elif tu == 's':
             datev=firstTdt
+            yr = firstTvec[0]
+            mon = firstTvec[1]
+            day = firstTvec[2]
+            hour = firstTvec[3]
+            min = firstTvec[4]
+            secu = firstTvec[5]
+
+            Iunits = np.mod(secu,Nunits)
+            if firstTvec[5] > 0 or Iunits != 0:
+                tadvance = 2*Nunits
+                if tadvance >= 60:
+                    firstTdt = dt.datetime(yr, mon, day, hour, min, 0)
+                    datev = dt.datetime(yr, mon, day, hour, min, 0)
+                else:
+                    nNunits = int(minu/Nunits)
+                    firstTdt = dt.datetime(yr, mon, day, hour, min, nNunits*Nunits)
+                    datev = dt.datetime(yr, mon, day, hour, min, nNunits*Nunits)
+            else:
+                firstTdt = dt.datetime(yr, mon, day, hour, min, secu)
+                datev = dt.datetime(yr, mon, day, hour, min, secu)
             it=0
             while datev <= lastTdt:
-                datev = firstTdt + dt.timedelta(seconds=Nunits)
+                datev = firstTdt + dt.timedelta(seconds=Nunits*it)
                 timeout.append(datev)
                 it = it + 1