Changeset 1224 in lmdz_wrf for trunk

Timestamp:

Oct 20, 2016, 5:33:29 PM (8 years ago)

Author:

lfita

Message:

Including the single combinations as option in `combos'

Location:

trunk/tools

Files:

• generic_tools.py (modified) (4 diffs)
• model_graphics.py (modified) (1 diff)

trunk/tools/generic_tools.py

@@ -312 +312 @@
       Num= number of elements
     >>> list_norepeatcombos(4)
-    [[0, 1], [0, 2], [0, 3], [1, 2], [1, 3], [2, 3], [0, 1, 2], [0, 1, 3], [0, 2, 3], [1, 2, 3], [0, 1, 2, 3]]
+    [[0], [1], [2], [3], [0, 1], [0, 2], [0, 3], [1, 2], [1, 3], [2, 3], [0, 1, 2], [0, 1, 3], [0, 2, 3], [1, 2, 3], [0, 1, 2, 3]]
     """
     from math import factorial
@@ -318 +318 @@
 
     listv = range(Num)
+    # Single values are also combinations!
+    combos = []
+    for i in range(Num):
+        combos.append([i])
 
     samevals = []
@@ -325 +329 @@
         if searchInlist(samevals,iv): samevals.append(iv)
 
-    combos = []
     Nlvs = len(listv)
     # Number of possible combinations
@@ -9750 +9753 @@
     timestep.sort()
     return timestep
+print timestep_conform(86400,3600,5)
 
 #quit()

trunk/tools/model_graphics.py

@@ -3868 +3868 @@
                 ModI = ModelInf(mod, mod, 'lon', 'lat', 'pres', 'time', 'depth',     \
                   'lon', 'lat', 'pres', 'time', 'depth', None)
+                print fname + '; Lluis vn:', vn, 'values0:', values[0], 'values2:', values[2],' values3:', values[3]
                 VarI = VariableInf(vn, values[0], values[2], values[3])
                 usefs = {values[0]: ofileorig}