Changeset 2162 in lmdz_wrf

Timestamp:

Oct 4, 2018, 4:36:15 PM (7 years ago)

Author:

lfita

Message:

Adding change of year in `days_month'

File:

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

trunk/tools/generic_tools.py

@@ -5052 +5052 @@
 
     date1=dt.date(year,month,1)
-    date2=dt.date(year,month+1,1)
+    if month+1 > 12:
+        date2=dt.date(year+1,1,1)
+    else:
+        date2=dt.date(year,month+1,1)
 
     diffdate = date2-date1
@@ -14081 +14084 @@
     dcyc = cycvar.shape[0]
     # Indices of the beginning and end of the period
-    print 'cycvar:', cycvar
-    print 'bper:', bper, 'eper:', eper, 'val:', val
-
     bind = index_vec(cycvar,bper)
     eind = index_vec(cycvar,eper)
@@ -14089 +14089 @@
     # Index of the value
     vind = index_vec(cycvar,val)
-
-    print 'bind:', bind, 'eind:', eind, 'vind:', vind
 
     if eind < bind:
@@ -14148 +14146 @@
         Ncyctimes = Ncyctimes + 1
 
-        print 'cyctimes:', cyctimes
-
         iit = 0
         itt = 0
@@ -14159 +14155 @@
             ttv = mattimes[it,imat]
             timeslice[1] = it
-            print it, ttv, 'ip:', ip, 'ep:', ep, '<>', (ttv >= ip and ttv < ep)
             if not (ttv >= ip and ttv < ep):
                 slices.append(timeslice)
@@ -14186 +14181 @@
             ttv = mattimes[it,imat]
             timeslice[1] = it
-            print it, '.', itt, '|', ttv, 'ip:', ip, 'ep:', ep, '<>', cyclevar_within(cyctimes, ip, ep, ttv)
             if not (cyclevar_within(cyctimes, ip, ep, ttv)):
                 slices.append(timeslice)
@@ -14196 +14190 @@
     elif per == 'day':
         imat = 2
-        # Getting unique values
-        years = list(mattimes[:,imat])
-        setvar = set(years)
-        utimes = list(setvar)
-        utimes.sort()
-        Nutimes = len(utimes)
-
-        # introducing amounts
-        print '  unique ', Nutimes, 'times:', utimes, '<>', utimes[0], utimes[Nutimes-1]+amount, amount
-        atimes = np.arange(utimes[0], utimes[Nutimes-1]+amount, amount)
-        Ntimes = len(atimes)
-        print '  amount ', Ntimes, 'periods:', atimes
+
+        for it in range(dimt):
+
+            # cycle for days as function of the month
+            Ncyctimes = days_month(mattimes[it,0],mattimes[it,1])
+            cyctimes = np.arange(Ncyctimes)+1
         
-        itt = 0
-        for iat in range(Ntimes-1):
+            print 'cyctimes:', cyctimes
+
+            # First cycle time from first time
+            iit = 0
+            itt = index_vec(cyctimes,mattimes[0,imat])
+            ip = cyctimes[itt]
+            ep = cyclevar(cyctimes, itt+amount)
+
             # timeslice: [ini_slice, end_slice, freq_slice]
-            timeslice = [itt,itt,1]
-            ip = atimes[iat]
-            ep = atimes[iat+1]
-
-            for it in range(itt,dimt):
-                if mattimes[it,imat] >= ip and mattimes[it,imat] < ep: 
-                    timeslice[1] = it
-                else:
-                    timeslice[1] = it
-                    slices.append(timeslice)
-                    itt = it + 0
-                    break
+            timeslice = [iit,iit,1]
+            ttv = mattimes[it,imat]
+            timeslice[1] = it
+            if not (cyclevar_within(cyctimes, ip, ep, ttv)):
+                slices.append(timeslice)
+                iit = it + 0
+                itt = itt + amount
+                ip = cyclevar(cyctimes,itt)
+                ep = cyclevar(cyctimes,itt+amount)
     else:
         print errormsg
@@ -14238 +14229 @@
 tv = []
 values = []
-totT = 30.
-dT = 7.
+totT = 24.*60.
+dT = 7.*60.
 for it in range(0,10):
     for itt in range(3):
@@ -14247 +14238 @@
 vals = np.array(values)
 itdim = 0
-tu = 'days since 1949-12-01 00:00:00'
-per = 'month'
+tu = 'minutes since 1949-12-01 00:00:00'
+per = 'day'
 calend = 'standard'
 amount = 1