Changeset 0e576fc in flex_extract.git for source/python/classes/EcFlexpart.py

Timestamp:

Oct 8, 2018, 3:44:58 PM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

0aaeb04

Parents:

ae88f7d

Message:

implemented extraction possibility of EA5 und CERA

File:

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

source/python/classes/EcFlexpart.py

@@ -135 +135 @@
 
         if c.maxstep > len(c.type):    # Pure forecast mode
-            c.type = [c.type[1]]
+            c.type = [c.type[0]]
             c.step = ['{:0>3}'.format(int(c.step[0]))]
             c.time = [c.time[0]]
@@ -155 +155 @@
             # the initialisation times of the flux fields
             # and therefore are zero all the time)
-            self.types[c.type[1]] = {'times': '00/12', 'steps':
-                                     '{}/to/12/by/{}'.format(c.dtime, c.dtime)}
+            self.types[str(c.acctype)] = {'times': str(c.acctime),
+                                          'steps': '{}/to/{}/by/{}'.format(
+                                              c.dtime, c.accmaxstep, c.dtime)}
         else:
             for ty, st, ti in zip(c.type, c.step, c.time):
@@ -165 +166 @@
                     btlist = [13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0]
 
-                if i % int(c.dtime) == 0 and (i in btlist or c.maxstep > 24):
+                if ((ty.upper() == 'AN' and
+                     int(c.time[i]) % int(c.dtime) ==0) or
+                    (ty.upper() != 'AN' and
+                     int(c.step[i]) % int(c.dtime) == 0 and
+                     int(c.step[i]) % int(c.dtime) == 0) ) and \
+                    (int(c.time[i]) in btlist or c.maxstep > 24):
 
                     if ty not in self.types.keys():
@@ -191 +197 @@
         # for gaussian grid retrieval
         self.glevelist = '1/to/' + c.level
-
-        if hasattr(c, 'gaussian') and c.gaussian:
-            self.gaussian = c.gaussian
-        else:
-            self.gaussian = ''
+        self.gaussian = c.gaussian
 
         if 'N' in c.grid:  # Gaussian output grid
@@ -239 +241 @@
                 self.params['OG__SL'][0] += '/' + '/'.join(c.addpar)
 
-            self.params['OG_OROLSM__SL'] = ["160/27/28/173", \
-                                            'SFC', '1', self.grid]
+            if c.marsclass.upper() == 'EA' or c.marsclass.upper() == 'EP':
+                self.params['OG_OROLSM__SL'] = ["160/27/28/244",
+                                                'SFC', '1', self.grid]
+            else:
+                self.params['OG_OROLSM__SL'] = ["160/27/28/173", \
+                                                'SFC', '1', self.grid]
 
             self.params['OG__ML'] = ['T/Q', 'ML', self.levelist, self.grid]
@@ -543 +549 @@
                 if pk == 'OG_OROLSM__SL' and not oro:
                     oro = True
-                    retr_param_dict['stream'] = 'OPER'
+                    # in CERA20C (class EP) there is no stream "OPER"!
+                    if self.marsclass.upper() != 'EP':
+                        retr_param_dict['stream'] = 'OPER'
                     retr_param_dict['type'] = 'AN'
                     retr_param_dict['time'] = '00'
@@ -834 +842 @@
                     values = (np.reshape(values, (nj, ni))).flatten() / fak
                     vdp.append(values[:])  # save the accumulated values
-                    if step <= int(c.dtime):
+                    if c.marsclass.upper() == 'EA' or \
+                       step <= int(c.dtime):
                         svdp.append(values[:] / int(c.dtime))
                     else:  # deaccumulate values