Changes in Source/Python/Classes/MarsRetrieval.py [e3c679d:f0dedeb] in flex_extract.git

File:

• Source/Python/Classes/MarsRetrieval.py (modified) (1 diff)

Source/Python/Classes/MarsRetrieval.py

@@ -505 +505 @@
             newattrs['year'] = date.year
             newattrs['month'] = date.month
-            newattrs['day'] =  date.day          
-  
-        # need to correct the time apperance 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 access 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 in here
-            newattrs['time'] = [ attrs['time'] ]
+            newattrs['day'] =  date.day                  
         
         newattrs['product_type'] = 'reanalysis'
         newattrs['area'] = attrs['area'].split('/')
         newattrs['grid'] = list(map(float,attrs['grid'].split('/')))
-        newattrs['param'] = attrs['param'].split('/')    
+        newattrs['param'] = attrs['param'].split('/')        
+        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'