Changeset 2161 in lmdz_wrf

Timestamp:

Oct 4, 2018, 4:27:23 PM (6 years ago)

Author:

lfita

Message:

Fixing `cyclevar_within', assuming independently overpassing cycles

File:

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

trunk/tools/generic_tools.py

@@ -2353 +2353 @@
     fname = 'index_vec'
 
-    vecv = np.array(vec)
-
-    valpos = -1
-    for i in range(vecv.shape[0]):
-        if vecv[i] == val:
-            valpos = i
-            break
+    if type(vec) == type(np.arange(2)):
+        valpos = -1
+        for i in range(vec.shape[0]):
+            if vec[i] == val:
+                valpos = i
+                break
+    elif type(vec) == type(range(2)):
+        valpos = vec.index(val)
 
     return valpos
@@ -14060 +14061 @@
     return cycvar[rescyc]
 
-def cyclevar_within(cycvar,bper, eper, val):
+def cyclevar_within(cycvar, bper, eper, val):
     """ Function to tell if a given value is within a period of a cycle variable. 
         A cycle variable is a given structure with a series of values, once the 
@@ -14066 +14067 @@
         year)
       cycvar: array of values
-      ind: index to provide the value from
-    >>> cyclevar(np.arange(12)+1, 3, 6, 4)
+      bper: beginning period
+      eper: end period (if eper < bper, assuming period overpassing cycle)
+      val: value to look for (if val < bper, assuming value next cycle)
+    >>> cyclevar_within(np.arange(12)+1, 3, 6, 4)
     True
-    >>> cyclevar(np.arange(12)+1, 12, 3, 2)
+    >>> cyclevar_within(np.arange(12)+1, 12, 3, 2)
     True
-    >>> cyclevar(np.arange(12)+1, 12, 3, 5)
+    >>> cyclevar_within(np.arange(12)+1, 12, 3, 5)
     False
     """
@@ -14078 +14081 @@
     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)
@@ -14084 +14090 @@
     vind = index_vec(cycvar,val)
 
-    if eind < bind: 
+    print 'bind:', bind, 'eind:', eind, 'vind:', vind
+
+    if eind < bind:
         eind = eind + dcyc
+
+    if vind < bind:
         vind = vind + dcyc
 
@@ -14176 +14186 @@
             ttv = mattimes[it,imat]
             timeslice[1] = it
-            print it, '.', itt, '|', ttv, 'ip:', ip, 'ep:', ep, '<>', (ttv >= ip and ttv < ep)
-            if not (ttv >= ip and ttv < ep):
+            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)
                 iit = it + 0