Changeset d43706b in flex_extract.git

Timestamp:

Nov 24, 2018, 4:03:00 PM (5 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

1244a7b

Parents:

2f5ca80

Message:

BugFix?: sorted time for product generation

File:

• source/python/classes/EcFlexpart.py (modified) (5 diffs)

source/python/classes/EcFlexpart.py

@@ -424 +424 @@
         for key in index_keys:
             key_vals = codes_index_get(iid, key)
-            print(key_vals)
-            # have to sort the steps for disaggregation,
+            # have to sort the key values for correct disaggregation,
             # therefore convert to int first
-            if key == 'step':
-                key_vals = [int(k) for k in key_vals]
-                key_vals.sort()
-                key_vals = [str(k) for k in key_vals]
+            key_vals = [int(k) for k in key_vals]
+            key_vals.sort()
+            key_vals = [str(k) for k in key_vals]
             index_vals.append(key_vals)
             # index_vals looks for example like:
@@ -762 +760 @@
             #             (  date    ,time, step)
 
-            print('current product: ', prod)
+            print('CURRENT PRODUCT: ', prod)
 
             for i in range(len(index_keys)):
@@ -860 +858 @@
 
                         if c.maxstep > 12:
-                            codes_set(gid, 'step', max(0, step-2*int(c.dtime)))
+                            codes_set(gid, 'stepRange', max(0, step-2*int(c.dtime)))
                         else:
-                            codes_set(gid, 'step', 0)
+                            codes_set(gid, 'stepRange', 0)
                             codes_set(gid, 'time', t_m2dt.hour*100)
                             codes_set(gid, 'date', int(t_m2dt.strftime('%Y%m%d')))
@@ -887 +885 @@
                             values = svdp[3]
                             codes_set_values(gid, values)
-                            codes_set(gid, 'step', 0)
+                            codes_set(gid, 'stepRange', 0)
                             truedatetime = t_m2dt + timedelta(hours=
                                                               2*int(c.dtime))
@@ -902 +900 @@
                                 values = disaggregation.dapoly(list(reversed(svdp)))
 
-                            codes_set(gid, 'step', 0)
+                            codes_set(gid, 'stepRange', 0)
                             truedatetime = t_m2dt + timedelta(hours=int(c.dtime))
                             codes_set(gid, 'time', truedatetime.hour * 100)