Changeset 2229 in lmdz_wrf

Timestamp:

Nov 14, 2018, 9:30:59 PM (6 years ago)

Author:

lfita

Message:

Finally fixing `cycle_within'?

File:

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

trunk/tools/generic_tools.py

@@ -14025 +14025 @@
     >>> cyclevar_within(np.arange(12)+1, 12, 2, 2)
     True
+    >>> cyclevar_within(np.arange(12)+1, 12, 2, 12)
+    True
     """
     fname = 'cyclevar_within'
@@ -14038 +14040 @@
     if eind < bind:
         eind = eind + dcyc
-        vind = vind + dcyc
+        if vind != bind: vind = vind + dcyc
 
     if vind < bind:
@@ -14655 +14657 @@
     """ Function to return temporal slices of a series of times for a given amount 
         of periods
-      tv: time vallues (CF format)
+      tv: time values (CF format)
       tu: CF time-units
       cal: calendar
@@ -14703 +14705 @@
         print '    available ones:', type(np.arange(1)), type(range(2))
         quit(-1)
-    #print 'mat times _______'    
+    #print 'mat times _______'
     #for it in range(dimt):
     #    print '  ',it, mattimes[it,:]
@@ -14769 +14771 @@
             if cyclevar_within(months12, bseas, eseas, estats[1]):
                 estats[1] = bseas
-                bereak
+                break
         # Checking if the end of season is on the following year...
         if bseas < mone: estats[0] = estats[0] + 1
@@ -14980 +14982 @@
 for it in range(0,10):
    for itt in range(3):
-        tv.append(iTT+it*totT+dT*itt)
+        days = iTT+it*totT+dT*itt
+        tv.append(days)
         #values.append((it*3+itt)*1.)
-        values.append(it*1.)
-
-print 'tv:', tv
-print 'values:', values
+        Nyear = int((days-31)/365)
+        dyear = (days-31) - Nyear*365
+        if dyear < 59: 
+            values.append(0.)
+        elif dyear >= 59 and dyear < 151:
+            values.append(1.)
+        elif dyear >= 151 and dyear < 243: 
+            values.append(2.)
+        elif dyear >= 243 and dyear < 334: 
+            values.append(3.)
+
+for it in range(len(values)):
+    print it, tv[it], values[it]
 
 vals = np.array(values)
 itdim = 0
 tu = 'days since 1949-12-01 00:00:00'
-per = 'aggseason'
+per = 'season'
 calend = 'standard'
 amount = 1
@@ -15016 +15028 @@
             origshape[itdim] = aggslc[iislc]
             iishape[itdim] = iislc
-            print iislc, ':', iishape, '<>', origshape
+            print iislc, ':', iishape, '<>', origshape, vals[tuple(origshape)]
             tvals[tuple(iishape)] = vals[tuple(origshape)]