Changeset 54a8a01 in flex_extract.git for python/EcFlexpart.py

Timestamp:

Aug 31, 2018, 7:50:37 AM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

597d4d1

Parents:

e1228f3

Message:

restructuring, documentations and bug fixes

File:

• python/EcFlexpart.py (modified) (15 diffs)

python/EcFlexpart.py

@@ -1 +1 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#************************************************************************
-# ToDo AP
-# - specifiy file header documentation
-# - add class description in header information
-# - apply classtests
-# - add references to ECMWF specific software packages
-# - add describtion of deacc_fluxes
-# - change name of func deacc ( weil disagg )
-# - add desc of retrieve function
-#************************************************************************
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
@@ -151 +141 @@
 
             fluxes: boolean, optional
-                Decides if a the flux parameter settings are stored or
+                Decides if the flux parameter settings are stored or
                 the rest of the parameter list.
                 Default value is False.
@@ -175 +165 @@
         self.dtime = c.dtime
         i = 0
-        if fluxes is True and c.maxstep < 24:
+        if fluxes and c.maxstep <= 24:
             # no forecast beyond one day is needed!
             # Thus, prepare flux data manually as usual
@@ -192 +182 @@
                     btlist = [13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0]
 
-                if i % int(c.dtime) == 0 and c.maxstep > 24 or i in btlist:
+                if i % int(c.dtime) == 0 and (i in btlist or c.maxstep > 24):
 
                     if ty not in self.types.keys():
@@ -207 +197 @@
                         self.types[ty]['steps'] += st
                 i += 1
-
 
         self.marsclass = c.marsclass
@@ -304 +293 @@
                                          '{}'.format((int(self.resol) + 1) / 2)]
 
-            if c.omega == '1':
+            if hasattr(c, 'omega') and c.omega == '1':
                 self.params['OG__ML'][0] += '/W'
 
             # add cloud water content if necessary
-            if c.cwc == '1':
+            if hasattr(c, 'cwc') and c.cwc == '1':
                 self.params['OG__ML'][0] += '/CLWC/CIWC'
 
             # add vorticity and geopotential height for WRF if necessary
-            if c.wrf == '1':
+            if hasattr(c, 'wrf') and c.wrf == '1':
                 self.params['OG__ML'][0] += '/Z/VO'
                 if '/D' not in self.params['OG__ML'][0]:
@@ -740 +729 @@
                                            c.gateway, '-remote', c.destination,
                                            '-source', ofile])
-                print('ectrans:', p)
+                #print('ectrans:', p)
 
         if int(c.ecstorage) == 1 and c.ecapi is False:
@@ -890 +879 @@
 
         for prod in product(*index_vals):
-            # flag for Fortran program CONVERT2, initially False
+            # flag for Fortran program CONVERT2 and file merging
             convertFlag = False
             print 'current prod: ', prod
@@ -906 +895 @@
             # prepare some date and time parameter before reading the data
             if gid is not None:
-                # Fortran program CONVERT2 is only done if gid at this time is
-                # not None, therefore save information in convertFlag
+                # Combine all temporary data files into final grib file if
+                # gid is at least one time not None. Therefore set convertFlag
+                # to save information. The fortran program CONVERT2 is also
+                # only done if convertFlag is True
                 convertFlag = True
                 # remove old fort.* files and open new ones
+                # they are just valid for a single product
                 for k, f in fdict.iteritems():
                     silent_remove(c.inputdir + "/fort." + k)
@@ -922 +914 @@
                                               '%Y%m%d%H')
                 timestamp += timedelta(hours=int(step))
-
                 cdateH = datetime.strftime(timestamp, '%Y%m%d%H')
 
@@ -966 +957 @@
                 levtype = grib_get(gid, 'typeOfLevel')
                 if paramId == 133 and gridtype == 'reduced_gg':
-                # Relative humidity (Q.grb) is used as a template only
+                # Specific humidity (Q.grb) is used as a template only
                 # so we need the first we "meet"
                     with open(c.inputdir + '/fort.18', 'w') as fout:
@@ -1028 +1019 @@
                            not available for this type or date/time\n'
                     print 'Check parameters CLASS, TYPE, STREAM, START_DATE\n'
-                    my_error(c, 'fort.21 is empty while parameter eta is set \
-                                to 1 in CONTROL file')
+                    my_error(c.mailfail, 'fort.21 is empty while parameter eta \
+                             is set to 1 in CONTROL file')
 
                 # create the corresponding output file fort.15
@@ -1061 +1052 @@
                 with open(fnout, 'wb') as fout:
                     for f in flist:
-                        shutil.copyfileobj(open(c.inputdir + '/' + f, 'rb'), fout)
+                        shutil.copyfileobj(
+                            open(c.inputdir + '/' + f, 'rb'), fout)
 
                 if c.omega == '1':
@@ -1068 +1060 @@
                             open(c.inputdir + '/fort.25', 'rb'), fout)
 
-        if c.wrf == '1':
+        if hasattr(c, 'wrf') and c.wrf == '1':
             fwrf.close()
 
@@ -1307 +1299 @@
         grib_index_release(iid)
 
-        exit()
         return