Changes in / [7896304:81c180c] in flex_extract.git

Files:

• Run/Control/CONTROL_EA5 (modified) (1 diff)
• Source/Python/Classes/MarsRetrieval.py (modified) (2 diffs)

Run/Control/CONTROL_EA5

@@ -20 +20 @@
 PREFIX EA
 CWC 1
-RRINT 1
 ECTRANS 1

Source/Python/Classes/MarsRetrieval.py

@@ -505 +505 @@
             newattrs['year'] = date.year
             newattrs['month'] = date.month
-            newattrs['day'] =  date.day                  
+            newattrs['day'] =  date.day          
+  
+        # need to correct the time appearance for CDS surface field retrievals 
+        if attrs['type'] == 'FC': # for EA5 only flux fields are retrieved as FC type
+            # need to convert fc start times 06/18 to usual AN times
+            # since the surface fields can only be accessed through their validity time
+            start, end, step = map(int,attrs['step'].split('/')[::2])
+            newattrs['time'] = [ "{0:0=2d}".format(s) for s in range(0,24,step) ]
+        elif '/' in attrs['time']: # we expect a list of times separated by /
+            newattrs['time'] = attrs['time'].split('/')
+        elif isinstance(attrs['time'], str): # we expect a single time here
+            newattrs['time'] = [ attrs['time'] ]
         
         newattrs['product_type'] = 'reanalysis'
@@ -511 +522 @@
         newattrs['grid'] = list(map(float,attrs['grid'].split('/')))
         newattrs['param'] = attrs['param'].split('/')        
-        newattrs['time'] = list(map(str,range(0,24,3)))
+        if '/' in attrs['step']:
+            sstep = int(attrs['step'].split('/')[4])
+            newattrs['time'] = list(map(str,range(0,24,sstep)))              
+        elif '160.128' in attrs['param']: 
+            newattrs['time'] = attrs['time']
         newattrs['format'] = 'grib'