Changeset 2403 in lmdz_wrf for trunk

Timestamp:

Mar 12, 2019, 2:56:41 PM (6 years ago)

Author:

lfita

Message:

Adding the depoyment of all the possible values on 'agg'

File:

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

trunk/tools/generic_tools.py

@@ -14825 +14825 @@
     availper = ['year', 'season', 'month', 'day', 'hour', 'minute', 'aggseason',     \
       'aggmonth', 'aggday', 'agghour']
+    availagg = ['season', 'month', 'day', 'hour', 'minute']
 
     if not searchInlist(availper, per):
@@ -15068 +15069 @@
         Lper=len(per)
         pern = per[3:Lper+1]
+        if pern == 'season': 
+            aggvals = np.arange(4)
+        elif pern == 'month': 
+            aggvals = np.arange(12)+1
+        elif pern == 'day': 
+            aggvals = np.arange(365)+1
+        elif pern == 'hour': 
+            aggvals = np.arange(24)
+        elif pern == 'minute': 
+            aggvals = np.arange(60)
+        else:
+            print errormsg
+            print '  ' + fname + ": aggregation over '" + pern+ "' not ready !!"
+            print '    avaialble ones:', availagg
+            quit(-1)
+
         vtemp_desc = temp_desc[pern]
         vvtdesc = list(vtemp_desc.keys())
@@ -15073 +15090 @@
 
         Nslices = len(vtemp_desc)
+        Naggv = aggvals.shape[0]
         slices = []
-        for islc in range(Nslices):
-            vvtemp_desc = vtemp_desc[vvtdesc[islc]]
-            Ltt = len(vvtemp_desc)
-            slices.append(vvtemp_desc)
-        
+        for iagg in range(Naggv):
+            iaggv = aggvals[iagg]
+            found = False
+            for islc in range(Nslices):
+                if vvtdesc[islc] == iaggv:
+                    vvtemp_desc = vtemp_desc[vvtdesc[islc]]
+                    slices.append(vvtemp_desc)
+                    found = True
+                    break
+            if not found: slices.append(None)
+        Nslices = Naggv + 0
     else:
         Nslices = len(stmatdates.keys())