Changeset ff99eae – FLEXPART.EU

python/ControlFile.py

-                      r812283d
+                      rff99eae
 # -*- coding: utf-8 -*-
 #************************************************************************
 # TODO AP
+# ToDo AP
 # - write a test class
 #************************************************************************
 …
 #    - __init__
 #    - __str__
+#    - tolist
+#    - to_list
+#
+# @Class Attributes:
+#    - start_date
+#    - end_date
+#    - accuracy
+#    - omega
+#    - cwc
+#    - omegadiff
+#    - etadiff
+#    - level
+#    - levelist
+#    - step
+#    - maxstep
+#    - prefix
+#    - makefile
+#    - basetime
+#    - date_chunk
+#    - grib2flexpart
+#    - exedir
+#    - flexpart_root_scripts
+#    - ecmwfdatadir
+#
 #*******************************************************************************
 …
 import os
 import inspect
 # software specific module from flex_extract
+import Tools
+from tools import get_list_as_string, my_error
 # ------------------------------------------------------------------------------
 # CLASS
 # ------------------------------------------------------------------------------
 class ControlFile:
+class ControlFile(object):
     '''
     Class containing the information of the flex_extract CONTROL file.
 …
                         for d in dd:
                             data.append(d)
-                    pass
                 if len(data) == 2:
                     if '$' in data[1]:
 …
                                 data[1] = data[1][:i] + var + data[1][k+1:]
                             else:
+                                Tools.myerror(None,
+                                              'Could not find variable ' +
+                                              data[1][j+1:k] +
+                                              ' while reading ' +
+                                              filename)
+                                my_error(None, 'Could not find variable ' +
+                                         data[1][j+1:k] + ' while reading ' +
+                                         filename)
                         setattr(self, data[0].lower() + '_expanded', data[1])
                     else:
 …
         if not hasattr(self, 'levelist'):
             if not hasattr(self, 'level'):
                 print('Warning: neither levelist nor level \
                        specified in CONTROL file')
+                print 'Warning: neither levelist nor level \
+                       specified in CONTROL file'
             else:
                 self.levelist = '1/to/' + self.level
 …
         return ', '.join("%s: %s" % item for item in attrs.items())
     def tolist(self):
+    def to_list(self):
         '''
         @Description:
 …
                 pass
             else:
                 if type(item[1]) is list:
+                if isinstance(item[1], list):
                     stot = ''
                     for s in item[1]:
 …
         return sorted(l)
+    # def to_dict(self):
+        # '''
+        # '''
+        # parameters_dict = vars(self)
+        # # remove unneeded parameter
+        # parameters_dict.pop('_expanded', None)
+        # parameters_dict.pop('exedir', None)
+        # parameters_dict.pop('flexpart_root_scripts', None)
+        # parameters_dict.pop('ecmwfdatadir', None)
+        # parameters_dict_str = {}
+        # for key, value in parameters_dict.iteritems():
+            # if isinstance(value, list):
+                # parameters_dict_str[str(key)] = get_list_as_string(value, ' ')
+            # else:
+                # parameters_dict_str[str(key)] = str(value)
+        # return parameters_dict_str

python/EcFlexpart.py

-                      r991df6a
+                      rff99eae
 # -*- coding: utf-8 -*-
 #************************************************************************
 # TODO AP
+# ToDo AP
 # - specifiy file header documentation
 # - add class description in header information
 …
 #        - extended with class Control
 #        - removed functions mkdir_p, daterange, years_between, months_between
 #        - added functions darain, dapoly, toparamId, init128, normalexit,
 #          myerror, cleanup, install_args_and_control,
+#        - added functions darain, dapoly, to_param_id, init128, normal_exit,
+#          my_error, clean_up, install_args_and_control,
 #          interpret_args_and_control,
 #        - removed function __del__ in class EIFLexpart
 …
 #        - applied PEP8 style guide
 #        - added documentation
 #        - removed function getFlexpartTime in class ECFlexpart
+#        - removed function getFlexpartTime in class EcFlexpart
 #        - outsourced class ControlFile
 #        - outsourced class MarsRetrieval
 #        - changed class name from EIFlexpart to ECFlexpart
+#        - changed class name from EIFlexpart to EcFlexpart
 #        - applied minor code changes (style)
 #        - removed "dead code" , e.g. retrieval of Q since it is not needed
 …
 #    - deacc_fluxes
+#
+# @Class Attributes:
+#    - dtime
+#    - basetime
+#    - server
+#    - marsclass
+#    - stream
+#    - resol
+#    - accuracy
+#    - number
+#    - expver
+#    - glevelist
+#    - area
+#    - grid
+#    - level
+#    - levelist
+#    - types
+#    - dates
+#    - area
+#    - gaussian
+#    - params
+#    - inputdir
+#    - outputfilelist
+#
 #*******************************************************************************
+#pylint: disable=unsupported-assignment-operation
+# this is disabled because its an error in pylint for this specific case
+#pylint: disable=consider-using-enumerate
+# this is not useful in this case
 # ------------------------------------------------------------------------------
 # MODULES
 …
 import shutil
 import os
-import sys
-import inspect
 import glob
+import datetime
+from numpy import *
+from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
+ecapi = True
+try:
+    import ecmwfapi
+except ImportError:
+    ecapi = False
+from gribapi import *
+from datetime import datetime, timedelta
+import numpy as np
+from gribapi import grib_set, grib_index_select, grib_new_from_index, grib_get,\
+                    grib_write, grib_get_values, grib_set_values, grib_release,\
+                    grib_index_release, grib_index_get
 # software specific classes and modules from flex_extract
+from GribTools import GribTools
+from Tools import init128, toparamId, silentremove, product
+from ControlFile import ControlFile
+from MARSretrieval import MARSretrieval
+import Disagg
+from Gribtools import Gribtools
+from tools import init128, to_param_id, silent_remove, product, my_error
+from MarsRetrieval import MarsRetrieval
+import disaggregation
 # ------------------------------------------------------------------------------
 # CLASS
 # ------------------------------------------------------------------------------
 class ECFlexpart:
+class EcFlexpart(object):
     '''
     Class to retrieve FLEXPART specific ECMWF data.
 …
         '''
         @Description:
             Creates an object/instance of ECFlexpart with the
+            Creates an object/instance of EcFlexpart with the
             associated settings of its attributes for the retrieval.
         @Input:
             self: instance of ECFlexpart
+            self: instance of EcFlexpart
                 The current object of the class.
 …
         # different mars types for retrieving data for flexpart
         self.types = dict()
+        try:
+            if c.maxstep > len(c.type):    # Pure forecast mode
+                c.type = [c.type[1]]
+                c.step = ['{:0>3}'.format(int(c.step[0]))]
+                c.time = [c.time[0]]
+                for i in range(1, c.maxstep + 1):
+                    c.type.append(c.type[0])
+                    c.step.append('{:0>3}'.format(i))
+                    c.time.append(c.time[0])
+        except:
+            pass
+        if c.maxstep > len(c.type):    # Pure forecast mode
+            c.type = [c.type[1]]
+            c.step = ['{:0>3}'.format(int(c.step[0]))]
+            c.time = [c.time[0]]
+            for i in range(1, c.maxstep + 1):
+                c.type.append(c.type[0])
+                c.step.append('{:0>3}'.format(i))
+                c.time.append(c.time[0])
         self.inputdir = c.inputdir
 …
                     btlist = [13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0]
+                if mod(i, int(c.dtime)) == 0 and \
+                    (c.maxstep > 24 or i in btlist):
+                if i % int(c.dtime) == 0 and c.maxstep > 24 or i in btlist:
                     if ty not in self.types.keys():
 …
                     if ti not in self.types[ty]['times']:
                         if len(self.types[ty]['times']) > 0:
+                        if self.types[ty]['times']:
                             self.types[ty]['times'] += '/'
                         self.types[ty]['times'] += ti
                     if st not in self.types[ty]['steps']:
                         if len(self.types[ty]['steps']) > 0:
+                        if self.types[ty]['steps']:
                             self.types[ty]['steps'] += '/'
                         self.types[ty]['steps'] += st
                 i += 1
+        # Different grids need different retrievals
+        # SH = Spherical Harmonics, GG = Gaussian Grid,
+        # OG = Output Grid, ML = MultiLevel, SL = SingleLevel
+        self.params = {'SH__ML': '', 'SH__SL': '',
+                       'GG__ML': '', 'GG__SL': '',
+                       'OG__ML': '', 'OG__SL': '',
+                       'OG_OROLSM_SL': '', 'OG_acc_SL': ''}
         self.marsclass = c.marsclass
         self.stream = c.stream
 …
         self.accuracy = c.accuracy
         self.level = c.level
+        try:
+        if c.levelist:
             self.levelist = c.levelist
         except:
+        else:
             self.levelist = '1/to/' + c.level
 …
         self.glevelist = '1/to/' + c.level
         try:
+        if c.gaussian:
             self.gaussian = c.gaussian
         except:
+        else:
             self.gaussian = ''
         try:
+        if c.expver:
             self.expver = c.expver
         except:
+        else:
             self.expver = '1'
         try:
+        if c.number:
             self.number = c.number
         except:
+        else:
             self.number = '0'
 …
         # 4) Download also data for WRF
+        # Different grids need different retrievals
+        # SH = Spherical Harmonics, GG = Gaussian Grid,
+        # OG = Output Grid, ML = MultiLevel, SL = SingleLevel
+        self.params = {'SH__ML': '', 'SH__SL': '',
+                       'GG__ML': '', 'GG__SL': '',
+                       'OG__ML': '', 'OG__SL': '',
+                       'OG_OROLSM_SL': '', 'OG_acc_SL': ''}
         if fluxes is False:
             self.params['SH__SL'] = ['LNSP', 'ML', '1', 'OFF']
 …
             self.params['OG__SL'] = ["141/151/164/165/166/167/168/129/172", \
                                      'SFC', '1', self.grid]
             if len(c.addpar) > 0:
+            if c.addpar:
                 if c.addpar[0] == '/':
                     c.addpar = c.addpar[1:]
 …
                 self.params['SH__ML'] = ['U/V/D', 'ML', self.glevelist, 'OFF']
             else:
                 print('Warning: This is a very costly parameter combination, \
                        use only for debugging!')
+                print 'Warning: This is a very costly parameter combination, \
+                       use only for debugging!'
                 self.params['GG__SL'] = ['Q', 'ML', '1', \
                                          '{}'.format((int(self.resol) + 1) / 2)]
 …
                 self.params['OG__ML'][0] += '/W'
+            try:
+                # add cloud water content if necessary
+                if c.cwc == '1':
+                    self.params['OG__ML'][0] += '/CLWC/CIWC'
+            except:
+                pass
+            try:
+                # add vorticity and geopotential height for WRF if necessary
+                if c.wrf == '1':
+                    self.params['OG__ML'][0] += '/Z/VO'
+                    if '/D' not in self.params['OG__ML'][0]:
+                        self.params['OG__ML'][0] += '/D'
+                    #wrf_sfc = 'sp/msl/skt/2t/10u/10v/2d/z/lsm/sst/ci/sd/stl1/ /
+                    #           stl2/stl3/stl4/swvl1/swvl2/swvl3/swvl4'.upper()
+                    wrf_sfc = '134/235/167/165/166/168/129/172/34/31/141/ \
+/170/183/236/39/40/41/42'.upper()
+                    lwrt_sfc = wrf_sfc.split('/')
+                    for par in lwrt_sfc:
+                        if par not in self.params['OG__SL'][0]:
+                            self.params['OG__SL'][0] += '/' + par
+            except:
+                pass
+            # add cloud water content if necessary
+            if c.cwc == '1':
+                self.params['OG__ML'][0] += '/CLWC/CIWC'
+            # add vorticity and geopotential height for WRF if necessary
+            if c.wrf == '1':
+                self.params['OG__ML'][0] += '/Z/VO'
+                if '/D' not in self.params['OG__ML'][0]:
+                    self.params['OG__ML'][0] += '/D'
+                #wrf_sfc = 'sp/msl/skt/2t/10u/10v/2d/z/lsm/sst/ci/sd/stl1/ /
+                #           stl2/stl3/stl4/swvl1/swvl2/swvl3/swvl4'.upper()
+                wrf_sfc = '134/235/167/165/166/168/129/172/34/31/141/ \
+/170/183/236/39/40/41/42'.upper()
+                lwrt_sfc = wrf_sfc.split('/')
+                for par in lwrt_sfc:
+                    if par not in self.params['OG__SL'][0]:
+                        self.params['OG__SL'][0] += '/' + par
         else:
             self.params['OG_acc_SL'] = ["LSP/CP/SSHF/EWSS/NSSS/SSR", \
 …
         @Input:
             self: instance of ECFlexpart
+            self: instance of EcFlexpart
                 The current object of the class.
 …
         self.inputdir = c.inputdir
         area = asarray(self.area.split('/')).astype(float)
         grid = asarray(self.grid.split('/')).astype(float)
+        area = np.asarray(self.area.split('/')).astype(float)
+        grid = np.asarray(self.grid.split('/')).astype(float)
         if area[1] > area[3]:
             area[1] -= 360
-        zyk = abs((area[3] - area[1] - 360.) + grid[1]) < 1.e-6
         maxl = int((area[3] - area[1]) / grid[1]) + 1
         maxb = int((area[0] - area[2]) / grid[0]) + 1
 …
             f.write('&NAMGEN\n')
             f.write(',\n  '.join(['maxl = ' + str(maxl), 'maxb = ' + str(maxb),
+                    'mlevel = ' + self.level,
+                    'mlevelist = ' + '"' + self.levelist + '"',
+                    'mnauf = ' + self.resol, 'metapar = ' + '77',
+                    'rlo0 = ' + str(area[1]), 'rlo1 = ' + str(area[3]),
+                    'rla0 = ' + str(area[2]), 'rla1 = ' + str(area[0]),
+                    'momega = ' + c.omega, 'momegadiff = ' + c.omegadiff,
+                    'mgauss = ' + c.gauss, 'msmooth = ' + c.smooth,
+                    'meta = ' + c.eta, 'metadiff = ' + c.etadiff,
+                    'mdpdeta = ' + c.dpdeta]))
+                                  'mlevel = ' + self.level,
+                                  'mlevelist = ' + '"' + self.levelist + '"',
+                                  'mnauf = ' + self.resol,
+                                  'metapar = ' + '77',
+                                  'rlo0 = ' + str(area[1]),
+                                  'rlo1 = ' + str(area[3]),
+                                  'rla0 = ' + str(area[2]),
+                                  'rla1 = ' + str(area[0]),
+                                  'momega = ' + c.omega,
+                                  'momegadiff = ' + c.omegadiff,
+                                  'mgauss = ' + c.gauss,
+                                  'msmooth = ' + c.smooth,
+                                  'meta = ' + c.eta,
+                                  'metadiff = ' + c.etadiff,
+                                  'mdpdeta = ' + c.dpdeta]))
             f.write('\n/\n')
 …
         @Input:
             self: instance of ECFlexpart
+            self: instance of EcFlexpart
                 The current object of the class.
 …
     # ------  on demand path  --------------------------------------------------
                 if self.basetime is None:
+                    MR = MARSretrieval(self.server,
+                            marsclass=self.marsclass, stream=mfstream,
+                            type=mftype, levtype=pv[1], levelist=pv[2],
+                            resol=self.resol, gaussian=gaussian,
+                            accuracy=self.accuracy, grid=pv[3],
+                            target=mftarget, area=area, date=mfdate,
+                            time=mftime, number=self.number, step=mfstep,
+                            expver=self.expver, param=pv[0])
+                    MR.displayInfo()
+                    MR.dataRetrieve()
+                    MR = MarsRetrieval(self.server,
+                                       marsclass=self.marsclass,
+                                       stream=mfstream,
+                                       type=mftype,
+                                       levtype=pv[1],
+                                       levelist=pv[2],
+                                       resol=self.resol,
+                                       gaussian=gaussian,
+                                       accuracy=self.accuracy,
+                                       grid=pv[3],
+                                       target=mftarget,
+                                       area=area,
+                                       date=mfdate,
+                                       time=mftime,
+                                       number=self.number,
+                                       step=mfstep,
+                                       expver=self.expver,
+                                       param=pv[0])
+                    MR.display_info()
+                    MR.data_retrieve()
     # ------  operational path  ------------------------------------------------
                 else:
 …
                         tm1 = -1
+                    maxtime = datetime.datetime.strptime(
+                                mfdate.split('/')[-1] + mftime.split('/')[tm1],
+                                '%Y%m%d%H') + datetime.timedelta(
+                                hours=int(mfstep.split('/')[sm1]))
+                    elimit = datetime.datetime.strptime(
+                                mfdate.split('/')[-1] +
+                                self.basetime, '%Y%m%d%H')
+                    maxdate = datetime.strptime(mfdate.split('/')[-1] +
+                                                mftime.split('/')[tm1],
+                                                '%Y%m%d%H')
+                    istep = int(mfstep.split('/')[sm1])
+                    maxtime = maxdate + timedelta(hours=istep)
+                    elimit = datetime.strptime(mfdate.split('/')[-1] +
+                                               self.basetime, '%Y%m%d%H')
                     if self.basetime == '12':
 …
                         # if maxtime-elimit<12h reduce step for last time
                         # A split of the MARS job into 2 is likely necessary.
+                            maxtime = elimit - datetime.timedelta(hours=24)
+                            mfdate = '/'.join(('/'.join(mfdate.split('/')[:-1]),
+                                                datetime.datetime.strftime(
+                                                maxtime, '%Y%m%d')))
+                            MR = MARSretrieval(self.server,
+                                            marsclass=self.marsclass,
+                                            stream=self.stream, type=mftype,
+                                            levtype=pv[1], levelist=pv[2],
+                                            resol=self.resol, gaussian=gaussian,
+                                            accuracy=self.accuracy, grid=pv[3],
+                                            target=mftarget, area=area,
+                                            date=mfdate, time=mftime,
+                                            number=self.number, step=mfstep,
+                                            expver=self.expver, param=pv[0])
+                            MR.displayInfo()
+                            MR.dataRetrieve()
+                            maxtime = elimit - datetime.timedelta(hours=12)
+                            mfdate = datetime.datetime.strftime(maxtime,
+                                                                '%Y%m%d')
+                            maxtime = elimit - timedelta(hours=24)
+                            mfdate = '/'.join(['/'.join(mfdate.split('/')[:-1]),
+                                               datetime.strftime(maxtime,
+                                                                 '%Y%m%d')])
+                            MR = MarsRetrieval(self.server,
+                                               marsclass=self.marsclass,
+                                               stream=self.stream,
+                                               type=mftype,
+                                               levtype=pv[1],
+                                               levelist=pv[2],
+                                               resol=self.resol,
+                                               gaussian=gaussian,
+                                               accuracy=self.accuracy,
+                                               grid=pv[3],
+                                               target=mftarget,
+                                               area=area,
+                                               date=mfdate,
+                                               time=mftime,
+                                               number=self.number,
+                                               step=mfstep,
+                                               expver=self.expver,
+                                               param=pv[0])
+                            MR.display_info()
+                            MR.data_retrieve()
+                            maxtime = elimit - timedelta(hours=12)
+                            mfdate = datetime.strftime(maxtime, '%Y%m%d')
                             mftime = '00'
                             mftarget = self.inputdir + "/" + ftype + pk + \
 …
                                        '.' + str(os.getpid()) + ".grb"
+                            MR = MARSretrieval(self.server,
+                                            marsclass=self.marsclass,
+                                            stream=self.stream, type=mftype,
+                                            levtype=pv[1], levelist=pv[2],
+                                            resol=self.resol, gaussian=gaussian,
+                                            accuracy=self.accuracy, grid=pv[3],
+                                            target=mftarget, area=area,
+                                            date=mfdate, time=mftime,
+                                            number=self.number, step=mfstep,
+                                            expver=self.expver, param=pv[0])
+                            MR.displayInfo()
+                            MR.dataRetrieve()
+                            MR = MarsRetrieval(self.server,
+                                               marsclass=self.marsclass,
+                                               stream=self.stream,
+                                               type=mftype,
+                                               levtype=pv[1],
+                                               levelist=pv[2],
+                                               resol=self.resol,
+                                               gaussian=gaussian,
+                                               accuracy=self.accuracy,
+                                               grid=pv[3],
+                                               target=mftarget,
+                                               area=area,
+                                               date=mfdate,
+                                               time=mftime,
+                                               number=self.number,
+                                               step=mfstep,
+                                               expver=self.expver,
+                                               param=pv[0])
+                            MR.display_info()
+                            MR.data_retrieve()
                         # --------------  non flux data ------------------------
                         else:
+                            MR = MARSretrieval(self.server,
+                                            marsclass=self.marsclass,
+                                            stream=self.stream, type=mftype,
+                                            levtype=pv[1], levelist=pv[2],
+                                            resol=self.resol, gaussian=gaussian,
+                                            accuracy=self.accuracy, grid=pv[3],
+                                            target=mftarget, area=area,
+                                            date=mfdate, time=mftime,
+                                            number=self.number, step=mfstep,
+                                            expver=self.expver, param=pv[0])
+                            MR.displayInfo()
+                            MR.dataRetrieve()
+                            MR = MarsRetrieval(self.server,
+                                               marsclass=self.marsclass,
+                                               stream=self.stream,
+                                               type=mftype,
+                                               levtype=pv[1],
+                                               levelist=pv[2],
+                                               resol=self.resol,
+                                               gaussian=gaussian,
+                                               accuracy=self.accuracy,
+                                               grid=pv[3],
+                                               target=mftarget,
+                                               area=area,
+                                               date=mfdate,
+                                               time=mftime,
+                                               number=self.number,
+                                               step=mfstep,
+                                               expver=self.expver,
+                                               param=pv[0])
+                            MR.display_info()
+                            MR.data_retrieve()
                     else: # basetime == 0 ??? #AP
                         maxtime = elimit - datetime.timedelta(hours=24)
                         mfdate = datetime.datetime.strftime(maxtime,'%Y%m%d')
+                        maxtime = elimit - timedelta(hours=24)
+                        mfdate = datetime.strftime(maxtime, '%Y%m%d')
                         mftimesave = ''.join(mftime)
 …
                             times = mftime.split('/')
                             while ((int(times[0]) +
                                    int(mfstep.split('/')[0]) <= 12) and
                                   (pk != 'OG_OROLSM__SL') and 'acc' not in pk):
+                                    int(mfstep.split('/')[0]) <= 12) and
+                                   (pk != 'OG_OROLSM__SL') and 'acc' not in pk):
                                 times = times[1:]
                             if len(times) > 1:
 …
                                 mftime = times[0]
+                        MR = MARSretrieval(self.server,
+                                        marsclass=self.marsclass,
+                                        stream=self.stream, type=mftype,
+                                        levtype=pv[1], levelist=pv[2],
+                                        resol=self.resol, gaussian=gaussian,
+                                        accuracy=self.accuracy, grid=pv[3],
+                                        target=mftarget, area=area,
+                                        date=mfdate, time=mftime,
+                                        number=self.number, step=mfstep,
+                                        expver=self.expver, param=pv[0])
+                        MR.displayInfo()
+                        MR.dataRetrieve()
+                        MR = MarsRetrieval(self.server,
+                                           marsclass=self.marsclass,
+                                           stream=self.stream,
+                                           type=mftype,
+                                           levtype=pv[1],
+                                           levelist=pv[2],
+                                           resol=self.resol,
+                                           gaussian=gaussian,
+                                           accuracy=self.accuracy,
+                                           grid=pv[3],
+                                           target=mftarget,
+                                           area=area,
+                                           date=mfdate,
+                                           time=mftime,
+                                           number=self.number,
+                                           step=mfstep,
+                                           expver=self.expver,
+                                           param=pv[0])
+                        MR.display_info()
+                        MR.data_retrieve()
                         if (int(mftimesave.split('/')[0]) == 0 and
+                            int(mfstep.split('/')[0]) == 0 and
+                            pk != 'OG_OROLSM__SL'):
+                            mfdate = datetime.datetime.strftime(elimit,'%Y%m%d')
+                                int(mfstep.split('/')[0]) == 0 and
+                                pk != 'OG_OROLSM__SL'):
+                            mfdate = datetime.strftime(elimit, '%Y%m%d')
                             mftime = '00'
                             mfstep = '000'
 …
                                        '.' + str(os.getpid()) + ".grb"
+                            MR = MARSretrieval(self.server,
+                                        marsclass=self.marsclass,
+                                        stream=self.stream, type=mftype,
+                                        levtype=pv[1], levelist=pv[2],
+                                        resol=self.resol, gaussian=gaussian,
+                                        accuracy=self.accuracy, grid=pv[3],
+                                        target=mftarget, area=area,
+                                        date=mfdate, time=mftime,
+                                        number=self.number, step=mfstep,
+                                        expver=self.expver, param=pv[0])
+                            MR.displayInfo()
+                            MR.dataRetrieve()
+        print("MARS retrieve done... ")
+                            MR = MarsRetrieval(self.server,
+                                               marsclass=self.marsclass,
+                                               stream=self.stream,
+                                               type=mftype,
+                                               levtype=pv[1],
+                                               levelist=pv[2],
+                                               resol=self.resol,
+                                               gaussian=gaussian,
+                                               accuracy=self.accuracy,
+                                               grid=pv[3],
+                                               target=mftarget,
+                                               area=area,
+                                               date=mfdate,
+                                               time=mftime,
+                                               number=self.number,
+                                               step=mfstep,
+                                               expver=self.expver,
+                                               param=pv[0])
+                            MR.display_info()
+                            MR.data_retrieve()
+        print "MARS retrieve done... "
         return
 …
         @Input:
             self: instance of ECFlexpart
+            self: instance of EcFlexpart
                 The current object of the class.
 …
         '''
         print('\n\nPostprocessing:\n Format: {}\n'.format(c.format))
+        print '\n\nPostprocessing:\n Format: {}\n'.format(c.format)
         if c.ecapi is False:
 …
                 c.destination = os.getenv('DESTINATION')
             print('ectrans: {}\n gateway: {}\n destination: {}\n '
                     .format(c.ectrans, c.gateway, c.destination))
         print('Output filelist: \n')
         print(self.outputfilelist)
+                  .format(c.ectrans, c.gateway, c.destination))
+        print 'Output filelist: \n'
+        print self.outputfilelist
         if c.format.lower() == 'grib2':
             for ofile in self.outputfilelist:
                 p = subprocess.check_call(['grib_set', '-s', 'edition=2, \
                                             productDefinitionTemplateNumber=8',
                                             ofile, ofile + '_2'])
+                                           productDefinitionTemplateNumber=8',
+                                           ofile, ofile + '_2'])
                 p = subprocess.check_call(['mv', ofile + '_2', ofile])
 …
             for ofile in self.outputfilelist:
                 p = subprocess.check_call(['ectrans', '-overwrite', '-gateway',
                                             c.gateway, '-remote', c.destination,
                                             '-source', ofile])
+                                           c.gateway, '-remote', c.destination,
+                                           '-source', ofile])
                 print('ectrans:', p)
 …
             for ofile in self.outputfilelist:
                 p = subprocess.check_call(['ecp', '-o', ofile,
                                             os.path.expandvars(c.ecfsdir)])
+                                           os.path.expandvars(c.ecfsdir)])
         if c.outputdir != c.inputdir:
 …
                 if '.' in fname[-1]:
                     l = fname[-1].split('.')
                     timestamp = datetime.datetime.strptime(l[0][-6:] + l[1],
                                                            '%y%m%d%H')
                     timestamp += datetime.timedelta(hours=int(l[2]))
                     cdate = datetime.datetime.strftime(timestamp, '%Y%m%d')
                     chms = datetime.datetime.strftime(timestamp, '%H%M%S')
+                    timestamp = datetime.strptime(l[0][-6:] + l[1],
+                                                  '%y%m%d%H')
+                    timestamp += timedelta(hours=int(l[2]))
+                    cdate = datetime.strftime(timestamp, '%Y%m%d')
+                    chms = datetime.strftime(timestamp, '%H%M%S')
                 else:
                     cdate = '20' + fname[-1][-8:-2]
 …
             # generate pathnames file
             pwd = os.path.abspath(c.outputdir)
             with open(pwd + '/pathnames','w') as f:
+            with open(pwd + '/pathnames', 'w') as f:
                 f.write(pwd + '/Options/\n')
                 f.write(pwd + '/\n')
 …
             # read template COMMAND file
+            with open(os.path.expandvars(
+                     os.path.expanduser(c.flexpart_root_scripts)) +
+                     '/../Options/COMMAND', 'r') as f:
+            with open(os.path.expandvars(os.path.expanduser(
+                c.flexpart_root_scripts)) + '/../Options/COMMAND', 'r') as f:
                 lflist = f.read().split('\n')
 …
             # afterwards switch back to the working dir
             os.chdir(c.outputdir)
+            p = subprocess.check_call([os.path.expandvars(
+                        os.path.expanduser(c.flexpart_root_scripts)) +
+                        '/../FLEXPART_PROGRAM/grib2flexpart',
+                        'useAvailable', '.'])
+            p = subprocess.check_call([
+                os.path.expandvars(os.path.expanduser(c.flexpart_root_scripts))
+                + '/../FLEXPART_PROGRAM/grib2flexpart', 'useAvailable', '.'])
             os.chdir(pwd)
 …
         @Input:
             self: instance of ECFlexpart
+            self: instance of EcFlexpart
                 The current object of the class.
             inputfiles: instance of UIOFiles
+            inputfiles: instance of UioFiles
                 Contains a list of files.
 …
         table128 = init128(c.ecmwfdatadir +
                            '/grib_templates/ecmwf_grib1_table_128')
         wrfpars = toparamId('sp/mslp/skt/2t/10u/10v/2d/z/lsm/sst/ci/sd/\
+        wrfpars = to_param_id('sp/mslp/skt/2t/10u/10v/2d/z/lsm/sst/ci/sd/\
                             stl1/stl2/stl3/stl4/swvl1/swvl2/swvl3/swvl4',
                             table128)
 …
         index_keys = ["date", "time", "step"]
         indexfile = c.inputdir + "/date_time_stepRange.idx"
         silentremove(indexfile)
         grib = GribTools(inputfiles.files)
+        silent_remove(indexfile)
+        grib = Gribtools(inputfiles.files)
         # creates new index file
         iid = grib.index(index_keys=index_keys, index_file=indexfile)
 …
         for key in index_keys:
             index_vals.append(grib_index_get(iid, key))
             print(index_vals[-1])
+            print index_vals[-1]
             # index_vals looks for example like:
             # index_vals[0]: ('20171106', '20171107', '20171108') ; date
 …
                 # remove old fort.* files and open new ones
                 for k, f in fdict.iteritems():
                     silentremove(c.inputdir + "/fort." + k)
+                    silent_remove(c.inputdir + "/fort." + k)
                     fdict[k] = open(c.inputdir + '/fort.' + k, 'w')
                 cdate = str(grib_get(gid, 'date'))
                 time = grib_get(gid, 'time')
-                type = grib_get(gid, 'type')
                 step = grib_get(gid, 'step')
                 # create correct timestamp from the three time informations
                 # date, time, step
+                timestamp = datetime.datetime.strptime(
+                                cdate + '{:0>2}'.format(time/100), '%Y%m%d%H')
+                timestamp += datetime.timedelta(hours=int(step))
+                cdateH = datetime.datetime.strftime(timestamp, '%Y%m%d%H')
+                chms = datetime.datetime.strftime(timestamp, '%H%M%S')
+                timestamp = datetime.strptime(cdate + '{:0>2}'.format(time/100),
+                                              '%Y%m%d%H')
+                timestamp += timedelta(hours=int(step))
+                cdateH = datetime.strftime(timestamp, '%Y%m%d%H')
                 if c.basetime is not None:
+                    slimit = datetime.datetime.strptime(
+                                c.start_date + '00', '%Y%m%d%H')
+                    slimit = datetime.strptime(c.start_date + '00', '%Y%m%d%H')
                     bt = '23'
                     if c.basetime == '00':
                         bt = '00'
+                        slimit = datetime.datetime.strptime(
+                                    c.end_date + bt, '%Y%m%d%H') - \
+                                    datetime.timedelta(hours=12-int(c.dtime))
+                        slimit = datetime.strptime(c.end_date + bt, '%Y%m%d%H')\
+                            - timedelta(hours=12-int(c.dtime))
                     if c.basetime == '12':
                         bt = '12'
+                        slimit = datetime.datetime.strptime(
+                                    c.end_date + bt, '%Y%m%d%H') - \
+                                 datetime.timedelta(hours=12-int(c.dtime))
+                    elimit = datetime.datetime.strptime(
+                                c.end_date + bt, '%Y%m%d%H')
+                        slimit = datetime.strptime(c.end_date + bt, '%Y%m%d%H')\
+                            - timedelta(hours=12-int(c.dtime))
+                    elimit = datetime.strptime(c.end_date + bt, '%Y%m%d%H')
                     if timestamp < slimit or timestamp > elimit:
 …
                 paramId = grib_get(gid, 'paramId')
                 gridtype = grib_get(gid, 'gridType')
-                datatype = grib_get(gid, 'dataType')
                 levtype = grib_get(gid, 'typeOfLevel')
                 if paramId == 133 and gridtype == 'reduced_gg':
 …
                         savedfields.append(paramId)
                     else:
                         print('duplicate ' + str(paramId) + ' not written')
+                        print 'duplicate ' + str(paramId) + ' not written'
                 try:
 …
                 os.chdir(c.inputdir)
                 if os.stat('fort.21').st_size == 0 and int(c.eta) == 1:
                     print('Parameter 77 (etadot) is missing, most likely it is \
                            not available for this type or date/time\n')
                     print('Check parameters CLASS, TYPE, STREAM, START_DATE\n')
                     myerror(c, 'fort.21 is empty while parameter eta is set \
+                    print 'Parameter 77 (etadot) is missing, most likely it is \
+                           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')
                 # create the corresponding output file fort.15
                 # (generated by CONVERT2) + fort.16 (paramId 167 and 168)
+                p = subprocess.check_call([os.path.expandvars(
+                        os.path.expanduser(c.exedir)) + '/CONVERT2'], shell=True)
+                p = subprocess.check_call(
+                    [os.path.expandvars(os.path.expanduser(c.exedir)) +
+                     '/CONVERT2'], shell=True)
                 os.chdir(pwd)
 …
                     suffix = cdateH[2:10]
                 fnout += suffix
                 print("outputfile = " + fnout)
+                print "outputfile = " + fnout
                 self.outputfilelist.append(fnout) # needed for final processing
 …
                             open(c.inputdir + '/fort.25', 'rb'), fout)
+        try:
+            if c.wrf == '1':
+                fwrf.close()
+        except:
+            pass
+        if c.wrf == '1':
+            fwrf.close()
         grib_index_release(iid)
 …
         @Input:
             self: instance of ECFlexpart
+            self: instance of EcFlexpart
                 The current object of the class.
             inputfiles: instance of UIOFiles
+            inputfiles: instance of UioFiles
                 Contains a list of files.
 …
         table128 = init128(c.ecmwfdatadir +
                            '/grib_templates/ecmwf_grib1_table_128')
         pars = toparamId(self.params['OG_acc_SL'][0], table128)
+        pars = to_param_id(self.params['OG_acc_SL'][0], table128)
         index_keys = ["date", "time", "step"]
         indexfile = c.inputdir + "/date_time_stepRange.idx"
         silentremove(indexfile)
         grib = GribTools(inputfiles.files)
+        silent_remove(indexfile)
+        grib = Gribtools(inputfiles.files)
         # creates new index file
         iid = grib.index(index_keys=index_keys, index_file=indexfile)
 …
         index_vals = []
         for key in index_keys:
             key_vals = grib_index_get(iid,key)
             print(key_vals)
+            key_vals = grib_index_get(iid, key)
+            print key_vals
             # have to sort the steps for disaggregation,
             # therefore convert to int first
 …
             stepsdict[str(p)] = []
+        print 'maxstep: ', c.maxstep
         for prod in product(*index_vals):
             # e.g. prod = ('20170505', '0', '12')
 …
             gid = grib_new_from_index(iid)
-            # do convert2 program if gid at this time is not None,
-            # therefore save in hid
-            hid = gid
             if gid is not None:
                 cdate = grib_get(gid, 'date')
                 time = grib_get(gid, 'time')
-                type = grib_get(gid, 'type')
                 step = grib_get(gid, 'step')
                 # date+time+step-2*dtime
                 # (since interpolated value valid for step-2*dtime)
                 sdate = datetime.datetime(year=cdate/10000,
                                           month=mod(cdate, 10000)/100,
                                           day=mod(cdate, 100),
                                           hour=time/100)
                 fdate = sdate + datetime.timedelta(
                                     hours=step-2*int(c.dtime))
                 sdates = sdate + datetime.timedelta(hours=step)
+                sdate = datetime(year=cdate/10000,
+                                 month=(cdate % 10000)/100,
+                                 day=(cdate % 100),
+                                 hour=time/100)
+                fdate = sdate + timedelta(hours=step-2*int(c.dtime))
+                sdates = sdate + timedelta(hours=step)
+                elimit = None
             else:
                 break
 …
             else:
                 fnout = c.inputdir + '/flux' + fdate.strftime('%Y%m%d%H')
+                gnout = c.inputdir + '/flux' + (fdate+datetime.timedelta(
+                    hours = int(c.dtime))).strftime('%Y%m%d%H')
+                gnout = c.inputdir + '/flux' + (fdate +
+                                                timedelta(hours=int(c.dtime))
+                                               ).strftime('%Y%m%d%H')
                 hnout = c.inputdir + '/flux' + sdates.strftime('%Y%m%d%H')
                 g = open(gnout, 'w')
                 h = open(hnout, 'w')
             print("outputfile = " + fnout)
+            print "outputfile = " + fnout
             f = open(fnout, 'w')
 …
                         fak = 3600.
                     values = (reshape(values, (nj, ni))).flatten() / fak
+                    values = (np.reshape(values, (nj, ni))).flatten() / fak
                     vdp.append(values[:])  # save the accumulated values
                     if step <= int(c.dtime):
 …
                     print(cparamId, atime, step, len(values),
                           values[0], std(values))
+                          values[0], np.std(values))
                     # save the 1/3-hourly or specific values
                     # svdp.append(values[:])
 …
                         if len(svdp) > 3:
                             if cparamId == '142' or cparamId == '143':
                                 values = Disagg.darain(svdp)
+                                values = disaggregation.darain(svdp)
                             else:
                                 values = Disagg.dapoly(svdp)
+                                values = disaggregation.dapoly(svdp)
                             if not (step == c.maxstep and c.maxstep > 12 \
 …
                         if c.basetime is not None:
+                            elimit = datetime.datetime.strptime(c.end_date +
+                                                                c.basetime,
+                                                                '%Y%m%d%H')
+                            elimit = datetime.strptime(c.end_date +
+                                                       c.basetime, '%Y%m%d%H')
                         else:
                             elimit = sdate + datetime.timedelta(2*int(c.dtime))
+                            elimit = sdate + timedelta(2*int(c.dtime))
                         # squeeze out information of last two steps contained
                         # in svdp
                         # if step+int(c.dtime) == c.maxstep and c.maxstep>12
                         # or sdates+datetime.timedelta(hours = int(c.dtime))
+                        # or sdates+timedelta(hours = int(c.dtime))
                         # >= elimit:
                         # Note that svdp[0] has not been popped in this case
                         if (step == c.maxstep and c.maxstep > 12
                             or sdates == elimit):
+                        if step == c.maxstep and c.maxstep > 12 or \
+                           sdates == elimit:
                             values = svdp[3]
                             grib_set_values(gid, values)
                             grib_set(gid, 'step', 0)
                             truedatetime = fdate + datetime.timedelta(
                                      hours=2*int(c.dtime))
+                            truedatetime = fdate + timedelta(hours=
+*int(c.dtime))
                             grib_set(gid, 'time', truedatetime.hour * 100)
                             grib_set(gid, 'date', truedatetime.year * 10000 +
 …
                             #values = (svdp[1]+svdp[2])/2.
                             if cparamId == '142' or cparamId == '143':
                                 values = Disagg.darain(list(reversed(svdp)))
+                                values = disaggregation.darain(list(reversed(svdp)))
                             else:
+                                values = Disagg.dapoly(list(reversed(svdp)))
+                            grib_set(gid, 'step',0)
+                            truedatetime = fdate + datetime.timedelta(
+                                     hours=int(c.dtime))
+                                values = disaggregation.dapoly(list(reversed(svdp)))
+                            grib_set(gid, 'step', 0)
+                            truedatetime = fdate + timedelta(hours=int(c.dtime))
                             grib_set(gid, 'time', truedatetime.hour * 100)
                             grib_set(gid, 'date', truedatetime.year * 10000 +
 …
         grib_index_release(iid)
+        exit()
         return

python/GribTools.py

-                      rccab809
+                      rff99eae
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#************************************************************************
-# TODO AP
-# - GribTools name möglicherweise etwas verwirrend.
-# - change self.filename in self.filenames!!!
-# - bis auf --init-- und index wird keine Funktion verwendet!?
-#************************************************************************
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
 …
 # @Class Content:
 #    - __init__
 #    - getkeys
 #    - setkeys
+#    - get_keys
+#    - set_keys
 #    - copy
 #    - index
+#
+# @Class Attributes:
+#    - filenames
+#
 #*******************************************************************************
 …
 # ------------------------------------------------------------------------------
 import os
+from gribapi import *
+from gribapi import grib_new_from_file, grib_is_defined, grib_get, \
+                    grib_release, grib_set, grib_write, grib_index_read, \
+                    grib_index_new_from_file, grib_index_add_file,  \
+                    grib_index_write
 # ------------------------------------------------------------------------------
 # CLASS
 # ------------------------------------------------------------------------------
 class GribTools:
+class Gribtools(object):
     '''
     Class for GRIB utilities (new methods) based on GRIB API
 …
         '''
         @Description:
             Initialise an object of GribTools and assign a list
+            Initialise an object of Gribtools and assign a list
             of filenames.
 …
         '''
         self.filename = filenames
+        self.filenames = filenames
         return
     def getkeys(self, keynames, wherekeynames=[], wherekeyvalues=[]):
+    def get_keys(self, keynames, wherekeynames=[], wherekeyvalues=[]):
         '''
         @Description:
 …
                 List of keynames.
             wherekeynames: list of ???, optional
+            wherekeynames: list of strings, optional
                 Default value is an empty list.
             wherekeyvalues: list of ???, optional
+            wherekeyvalues: list of strings, optional
                 Default value is an empty list.
 …
         '''
         fileid = open(self.filename, 'r')
+        fileid = open(self.filenames, 'r')
         return_list = []
 …
     def setkeys(self, fromfile, keynames, keyvalues, wherekeynames=[],
                 wherekeyvalues=[], strict=False, filemode='w'):
+    def set_keys(self, fromfile, keynames, keyvalues, wherekeynames=[],
+                 wherekeyvalues=[], strict=False, filemode='w'):
         '''
         @Description:
 …
                 Filename of the input file to read the grib messages from.
             keynames: list of ???
+            keynames: list of strings
                 List of keynames. Default is an empty list.
             keyvalues: list of ???
+            keyvalues: list of strings
                 List of keynames. Default is an empty list.
             wherekeynames: list of ???, optional
+            wherekeynames: list of strings, optional
                 Default value is an empty list.
             wherekeyvalues: list of ???, optional
+            wherekeyvalues: list of strings, optional
                 Default value is an empty list.
 …
         '''
         fout = open(self.filename, filemode)
+        fout = open(self.filenames, filemode)
         fin = open(fromfile)
 …
                 i += 1
-#AP is it secured that the order of keynames is equal to keyvalues?
             if select:
                 i = 0
 …
                     i += 1
+#AP this is a redundant code section
+# delete the if/else :
+#
+#           grib_write(gid_in, fout)
+#
+            if strict:
+                if select:
+                    grib_write(gid_in, fout)
+            else:
+                grib_write(gid_in, fout)
+#AP end
+            grib_write(gid_in, fout)
             grib_release(gid_in)
 …
                 function. Default is True.
             keynames: list of ???, optional
+            keynames: list of strings, optional
                 List of keynames. Default is an empty list.
             keyvalues: list of ???, optional
+            keyvalues: list of strings, optional
                 List of keynames. Default is an empty list.
 …
         fin = open(filename_in)
         fout = open(self.filename, filemode)
+        fout = open(self.filenames, filemode)
         while 1:
 …
                 Grib index id.
         '''
         print("... index will be done")
         self.iid = None
         if (os.path.exists(index_file)):
             self.iid = grib_index_read(index_file)
             print("Use existing index file: %s " % (index_file))
+        print "... index will be done"
+        iid = None
+        if os.path.exists(index_file):
+            iid = grib_index_read(index_file)
+            print "Use existing index file: %s " % (index_file)
         else:
             for file in self.filename:
                 print("Inputfile: %s " % (file))
                 if self.iid is None:
                     self.iid = grib_index_new_from_file(file, index_keys)
+            for filename in self.filenames:
+                print "Inputfile: %s " % (filename)
+                if iid is None:
+                    iid = grib_index_new_from_file(filename, index_keys)
                 else:
                     print 'in else zweig'
+                    grib_index_add_file(self.iid, file)
+            if self.iid is not None:
+                grib_index_write(self.iid, index_file)
+        print('... index done')
+        return self.iid
+                    grib_index_add_file(iid, filename)
+            if iid is not None:
+                grib_index_write(iid, index_file)
+        print '... index done'
+        return iid

python/MarsRetrieval.py

-                      r991df6a
+                      rff99eae
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#************************************************************************
-# TODO AP
-# -
-#************************************************************************
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
 …
+#
 #   November 2015 - Leopold Haimberger (University of Vienna):
 #        - optimized displayInfo
 #        - optimized dataRetrieve and seperate between python and shell
+#        - optimized display_info
+#        - optimized data_retrieve and seperate between python and shell
 #          script call
+#
 …
 # @Class Content:
 #    - __init__
+#    - displayInfo
+#    - dataRetrieve
+#    - display_info
+#    - data_retrieve
+#
+# @Class Attributes:
+#    - server
+#    - marsclass
+#    - dtype
+#    - levtype
+#    - levelist
+#    - repres
+#    - date
+#    - resol
+#    - stream
+#    - area
+#    - time
+#    - step
+#    - expver
+#    - number
+#    - accuracy
+#    - grid
+#    - gaussian
+#    - target
+#    - param
+#
 #*******************************************************************************
 …
 import os
-ecapi = True
-try:
-    import ecmwfapi
-except ImportError:
-    ecapi = False
 # ------------------------------------------------------------------------------
 # CLASS
 # ------------------------------------------------------------------------------
 class MARSretrieval:
+class MarsRetrieval(object):
     '''
     Class for submitting MARS retrievals.
 …
     '''
     def __init__(self, server, marsclass = "ei", type = "", levtype = "",
                  levelist = "", repres = "", date = "", resol = "", stream = "",
                  area = "", time = "", step = "", expver = "1", number = "",
                  accuracy = "", grid = "", gaussian = "", target = "",
                  param = ""):
+    def __init__(self, server, marsclass="ei", dtype="", levtype="",
+                 levelist="", repres="", date="", resol="", stream="",
+                 area="", time="", step="", expver="1", number="",
+                 accuracy="", grid="", gaussian="", target="",
+                 param=""):
         '''
         @Description:
             Initialises the instance of the MARSretrieval class and
+            Initialises the instance of the MarsRetrieval class and
             defines and assigns a set of the necessary retrieval parameters
             for the FLEXPART input data.
 …
         @Input:
             self: instance of MARSretrieval
+            self: instance of MarsRetrieval
                 For description see class documentation.
 …
                 Default is the ERA-Interim dataset "ei".
             type: string, optional
+            dtype: string, optional
                 Determines the type of fields to be retrieved.
                 Selects between observations, images or fields.
 …
         self.server = server
         self.marsclass = marsclass
         self.type = type
+        self.dtype = dtype
         self.levtype = levtype
         self.levelist = levelist
 …
     def displayInfo(self):
+    def display_info(self):
         '''
         @Description:
 …
         @Input:
             self: instance of MARSretrieval
+            self: instance of MarsRetrieval
                 For description see class documentation.
 …
         # with their corresponding values
         for item in attrs.items():
             if item[0] in ('server'):
+            if item[0] in 'server':
                 pass
             else:
                 print(item[0] + ': ' + str(item[1]))
+                print item[0] + ': ' + str(item[1])
         return
     def dataRetrieve(self):
+    def data_retrieve(self):
         '''
         @Description:
 …
         @Input:
             self: instance of MARSretrieval
+            self: instance of MarsRetrieval
                 For description see class documentation.
 …
         s = 'ret'
         for k, v in attrs.iteritems():
             if k in ('server'):
+            if k in 'server':
                 continue
             if k == 'marsclass':
 …
                 self.server.execute(s, target)
             except:
                 print('MARS Request failed, \
                     have you already registered at apps.ecmwf.int?')
+                print 'MARS Request failed, \
+                    have you already registered at apps.ecmwf.int?'
                 raise IOError
             if os.stat(target).st_size == 0:
                 print('MARS Request returned no data - please check request')
+                print 'MARS Request returned no data - please check request'
                 raise IOError
         # MARS request via extra process in shell
 …
                                  stderr=subprocess.PIPE, bufsize=1)
             pout = p.communicate(input=s)[0]
             print(pout.decode())
+            print pout.decode()
             if 'Some errors reported' in pout.decode():
                 print('MARS Request failed - please check request')
+                print 'MARS Request failed - please check request'
                 raise IOError
             if os.stat(target).st_size == 0:
                 print('MARS Request returned no data - please check request')
+                print 'MARS Request returned no data - please check request'
                 raise IOError

python/UioFiles.py

-                      r991df6a
+                      rff99eae
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#************************************************************************
-# TODO AP
-# - checken welche regelmässigen methoden auf diese Files noch angewendet werden
-# und dann hier implementieren
-# cleanup hier rein
-#************************************************************************
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
 …
+#
 #    November 2015 - Leopold Haimberger (University of Vienna):
 #        - modified method listFiles to work with glob instead of listdir
 #        - added pattern search in method listFiles
+#        - modified method list_files to work with glob instead of listdir
+#        - added pattern search in method list_files
+#
 #    February 2018 - Anne Philipp (University of Vienna):
 #        - applied PEP8 style guide
 #        - added documentation
 #        - optimisation of method listFiles since it didn't work correctly
+#        - optimisation of method list_files since it didn't work correctly
 #          for sub directories
 #        - additional speed up of method listFiles
+#        - additional speed up of method list_files
 #        - modified the class so that it is initiated with a pattern instead
 #          of suffixes. Gives more precision in selection of files.
 …
 # @Class Content:
 #    - __init__
+#    - listFiles
+#    - deleteFiles
+#    - list_files
+#    - delete_files
+#
+# @Class Attributes:
+#    - pattern
+#    - files
+#
 #*******************************************************************************
 …
 # ------------------------------------------------------------------------------
 import os
-import glob
 import fnmatch
-import time
 # software specific module from flex_extract
 import profiling
 from Tools import silentremove
+#import profiling
+from tools import silent_remove
 # ------------------------------------------------------------------------------
 …
 # ------------------------------------------------------------------------------
 class UIOFiles:
+class UioFiles(object):
     '''
     Class to manipulate files. At initialisation it has the attribute
 …
         @Input:
             self: instance of UIOFiles
+            self: instance of UioFiles
                 Description see class documentation.
 …
         self.pattern = pattern
+        self.files = None
         return
     #@profiling.timefn
     def listFiles(self, path, callid=0):
+    def list_files(self, path, callid=0):
         '''
         @Description:
 …
         @Input:
             self: instance of UIOFiles
+            self: instance of UioFiles
                 Description see class documentation.
 …
         if subdirs:
             for subdir in subdirs:
                 self.listFiles(os.path.join(path, subdir), callid=1)
+                self.list_files(os.path.join(path, subdir), callid=1)
         return
     def deleteFiles(self):
+    def delete_files(self):
         '''
         @Description:
 …
         @Input:
             self: instance of UIOFiles
+            self: instance of UioFiles
                 Description see class documentation.
 …
         '''
         for f in self.files:
             silentremove(f)
+        for old_file in self.files:
+            silent_remove(old_file)
         return

python/disaggregation.py

-                      r991df6a
+                      rff99eae
 # -*- coding: utf-8 -*-
 #************************************************************************
 # TODO AP
+# ToDo AP
 # - check alist of size 4 ?
 # - write a test, IMPORTANT
 …
 #        - added structured documentation
 #        - outsourced the disaggregation functions dapoly and darain
 #          to a new module named Disagg
+#          to a new module named disaggregation
+#
 # @License:
 …
+#
 # @Module Description:
 #    Disaggregation of deaccumulated flux data from an ECMWF model FG field.
+#    disaggregationregation of deaccumulated flux data from an ECMWF model FG field.
 #    Initially the flux data to be concerned are:
 #    - large-scale precipitation
 …
         using a cubic polynomial solution which conserves the integrals
         of the fluxes within each timespan.
         Disaggregation is done for 4 accumluated timespans which generates
+        disaggregationregation is done for 4 accumluated timespans which generates
         a new, disaggregated value which is output at the central point
         of the 4 accumulation timespans. This new point is used for linear
 …
         field using a modified linear solution which conserves the integrals
         of the fluxes within each timespan.
         Disaggregation is done for 4 accumluated timespans which generates
+        disaggregationregation is done for 4 accumluated timespans which generates
         a new, disaggregated value which is output at the central point
         of the 4 accumulation timespans. This new point is used for linear
 …
     return nfield

python/get_mars_data.py

-                      r991df6a
+                      rff99eae
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#************************************************************************
-# TODO AP
-# - add function docstrings!!!!
-#************************************************************************
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
 …
+#
 #    November 2015 - Leopold Haimberger (University of Vienna):
 #        - moved the getEIdata program into a function "getMARSdata"
+#        - moved the getEIdata program into a function "get_mars_data"
 #        - moved the AgurmentParser into a seperate function
 #        - adatpted the function for the use in flex_extract
 #        - renamed file to getMARSdata
+#        - renamed file to get_mars_data
+#
 #    February 2018 - Anne Philipp (University of Vienna):
 …
 # @Program Content:
 #    - main
 #    - getMARSdata
+#    - get_mars_data
+#
 #*******************************************************************************
 …
 import inspect
 try:
     ecapi=True
+    ecapi = True
     import ecmwfapi
 except ImportError:
+    ecapi=False
+    ecapi = False
+# software specific classes and modules from flex_extract
+from tools import my_error, normal_exit, interpret_args_and_control
+from EcFlexpart import EcFlexpart
+from UioFiles import UioFiles
 # add path to pythonpath so that python finds its buddies
 localpythonpath = os.path.dirname(os.path.abspath(
+LOCAL_PYTHON_PATH = os.path.dirname(os.path.abspath(
     inspect.getfile(inspect.currentframe())))
+if localpythonpath not in sys.path:
+    sys.path.append(localpythonpath)
+# software specific classes and modules from flex_extract
+from ControlFile import ControlFile
+from Tools import myerror, normalexit, \
+                          interpret_args_and_control
+from ECFlexpart import ECFlexpart
+from UIOFiles import UIOFiles
+if LOCAL_PYTHON_PATH not in sys.path:
+    sys.path.append(LOCAL_PYTHON_PATH)
 # ------------------------------------------------------------------------------
 …
     '''
     @Description:
         If getMARSdata is called from command line, this function controls
+        If get_mars_data is called from command line, this function controls
         the program flow and calls the argumentparser function and
         the getMARSdata function for retrieving EC data.
+        the get_mars_data function for retrieving EC data.
     @Input:
 …
     '''
     args, c = interpret_args_and_control()
     getMARSdata(args, c)
     normalexit(c)
+    get_mars_data(c)
+    normal_exit(c)
     return
 def getMARSdata(args, c):
+def get_mars_data(c):
     '''
     @Description:
 …
     @Input:
-        args: instance of ArgumentParser
-            Contains the commandline arguments from script/program call.
         c: instance of class ControlFile
             Contains all the parameters of CONTROL file, which are e.g.:
 …
         os.makedirs(c.inputdir)
     print("Retrieving EC data!")
     print("start date %s " % (c.start_date))
     print("end date %s " % (c.end_date))
+    print "Retrieving EC data!"
+    print "start date %s " % (c.start_date)
+    print "end date %s " % (c.end_date)
     if ecapi:
 …
     # --------------  flux data ------------------------------------------------
     print 'removing old flux content of ' + c.inputdir
     tobecleaned = UIOFiles('*_acc_*.' + str(os.getppid()) + '.*.grb')
     tobecleaned.listFiles(c.inputdir)
     tobecleaned.deleteFiles()
+    tobecleaned = UioFiles('*_acc_*.' + str(os.getppid()) + '.*.grb')
+    tobecleaned.list_files(c.inputdir)
+    tobecleaned.delete_files()
     # if forecast for maximum one day (upto 23h) are to be retrieved,
 …
         while day < endp1:
             # retrieve MARS data for the whole period
             flexpart = ECFlexpart(c, fluxes=True)
+            flexpart = EcFlexpart(c, fluxes=True)
             tmpday = day + datechunk - datetime.timedelta(days=1)
             if tmpday < endp1:
 …
                 flexpart.retrieve(server, dates, c.inputdir)
             except IOError:
                 myerror(c, 'MARS request failed')
+                my_error(c, 'MARS request failed')
             day += datechunk
 …
         while day <= end:
             # retrieve MARS data for the whole period
             flexpart = ECFlexpart(c, fluxes=True)
+            flexpart = EcFlexpart(c, fluxes=True)
             tmpday = day + datechunk - datetime.timedelta(days=1)
             if tmpday < end:
 …
                 flexpart.retrieve(server, dates, c.inputdir)
             except IOError:
                 myerror(c, 'MARS request failed')
+                my_error(c, 'MARS request failed')
             day += datechunk
 …
     # --------------  non flux data --------------------------------------------
     print 'removing old non flux content of ' + c.inputdir
     tobecleaned = UIOFiles('*__*.' + str(os.getppid()) + '.*.grb')
     tobecleaned.listFiles(c.inputdir)
     tobecleaned.deleteFiles()
+    tobecleaned = UioFiles('*__*.' + str(os.getppid()) + '.*.grb')
+    tobecleaned.list_files(c.inputdir)
+    tobecleaned.delete_files()
     day = start
     while day <= end:
             # retrieve all non flux MARS data for the whole period
             flexpart = ECFlexpart(c, fluxes=False)
             tmpday = day + datechunk - datetime.timedelta(days=1)
             if tmpday < end:
                 dates = day.strftime("%Y%m%d") + "/to/" + \
                         tmpday.strftime("%Y%m%d")
             else:
                 dates = day.strftime("%Y%m%d") + "/to/" + \
                         end.strftime("%Y%m%d")
             print "retrieve " + dates + " in dir " + c.inputdir
             try:
                 flexpart.retrieve(server, dates, c.inputdir)
             except IOError:
                 myerror(c, 'MARS request failed')
             day += datechunk
+        # retrieve all non flux MARS data for the whole period
+        flexpart = EcFlexpart(c, fluxes=False)
+        tmpday = day + datechunk - datetime.timedelta(days=1)
+        if tmpday < end:
+            dates = day.strftime("%Y%m%d") + "/to/" + \
+                    tmpday.strftime("%Y%m%d")
+        else:
+            dates = day.strftime("%Y%m%d") + "/to/" + \
+                    end.strftime("%Y%m%d")
+        print "retrieve " + dates + " in dir " + c.inputdir
+        try:
+            flexpart.retrieve(server, dates, c.inputdir)
+        except IOError:
+            my_error(c, 'MARS request failed')
+        day += datechunk
     return
 …
 if __name__ == "__main__":
     main()

python/install.py

-                      r991df6a
+                      rff99eae
 # -*- coding: utf-8 -*-
 #************************************************************************
+# TODO AP
+# - localpythonpath should not be set in module load section!
+# ToDo AP
 # - create a class Installation and divide installation in 3 subdefs for
 #   ecgate, local and cca seperatly
 …
 #        - applied PEP8 style guide
 #        - added documentation
+#        - moved install_args_and_control in here
+#
 # @License:
 …
 # MODULES
 # ------------------------------------------------------------------------------
-import datetime
 import os
 import sys
 …
 import subprocess
 import inspect
+from argparse import ArgumentParser,ArgumentDefaultsHelpFormatter
+# add path to pythonpath so that python finds its buddies
+localpythonpath = os.path.dirname(os.path.abspath(
+    inspect.getfile(inspect.currentframe())))
+if localpythonpath not in sys.path:
+    sys.path.append(localpythonpath)
+from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
 # software specific classes and modules from flex_extract
 from ControlFile import ControlFile
+# add path to pythonpath so that python finds its buddies
+LOCAL_PYTHON_PATH = os.path.dirname(os.path.abspath(
+    inspect.getfile(inspect.currentframe())))
+if LOCAL_PYTHON_PATH not in sys.path:
+    sys.path.append(LOCAL_PYTHON_PATH)
 # ------------------------------------------------------------------------------
 …
     '''
     os.chdir(localpythonpath)
+    os.chdir(LOCAL_PYTHON_PATH)
     args, c = install_args_and_control()
 …
         install_via_gateway(c, args.install_target)
     else:
         print('Please specify installation target (local|ecgate|cca)')
         print('use -h or --help for help')
+        print 'Please specify installation target (local|ecgate|cca)'
+        print 'use -h or --help for help'
     sys.exit()
 …
     try:
         c = ControlFile(args.controlfile)
     except:
         print('Could not read CONTROL file "' + args.controlfile + '"')
         print('Either it does not exist or its syntax is wrong.')
         print('Try "' + sys.argv[0].split('/')[-1] +
               ' -h" to print usage information')
+    except IOError:
+        print 'Could not read CONTROL file "' + args.controlfile + '"'
+        print 'Either it does not exist or its syntax is wrong.'
+        print 'Try "' + sys.argv[0].split('/')[-1] + \
+              ' -h" to print usage information'
         exit(1)
     if args.install_target != 'local':
         if (args.ecgid is None or args.ecuid is None or args.gateway is None
             or args.destination is None):
             print('Please enter your ECMWF user id and group id as well as \
+        if args.ecgid is None or args.ecuid is None or args.gateway is None \
+           or args.destination is None:
+            print 'Please enter your ECMWF user id and group id as well as \
                    the \nname of the local gateway and the ectrans \
                    destination ')
             print('with command line options --ecuid --ecgid \
                    --gateway --destination')
             print('Try "' + sys.argv[0].split('/')[-1] +
                   ' -h" to print usage information')
             print('Please consult ecaccess documentation or ECMWF user support \
                    for further details')
+                   destination '
+            print 'with command line options --ecuid --ecgid \
+                   --gateway --destination'
+            print 'Try "' + sys.argv[0].split('/')[-1] + \
+                  ' -h" to print usage information'
+            print 'Please consult ecaccess documentation or ECMWF user support \
+                   for further details'
             sys.exit(1)
         else:
 …
             c.destination = args.destination
     try:
+    if args.makefile:
         c.makefile = args.makefile
-    except:
-        pass
     if args.install_target == 'local':
 …
                             c.flexpart_root_scripts
                 else:
                     data='export FLEXPART_ROOT_SCRIPTS=$HOME'
+                    data = 'export FLEXPART_ROOT_SCRIPTS=$HOME'
             if target.lower() != 'local':
                 if '--workdir' in data:
 …
         fo.close()
     if target.lower() == 'local':
         # compile CONVERT2
         if c.flexpart_root_scripts is None or c.flexpart_root_scripts == '../':
             print('Warning: FLEXPART_ROOT_SCRIPTS has not been specified')
             print('Only CONVERT2 will be compiled in ' + ecd + '/../src')
+            print 'Warning: FLEXPART_ROOT_SCRIPTS has not been specified'
+            print 'Only CONVERT2 will be compiled in ' + ecd + '/../src'
         else:
             c.flexpart_root_scripts = os.path.expandvars(os.path.expanduser(
                                         c.flexpart_root_scripts))
+                c.flexpart_root_scripts))
             if os.path.abspath(ecd) != os.path.abspath(c.flexpart_root_scripts):
                 os.chdir('/')
 …
                 try:
                     os.makedirs(c.flexpart_root_scripts + '/ECMWFDATA7.1')
                 except:
+                finally:
                     pass
                 os.chdir(c.flexpart_root_scripts + '/ECMWFDATA7.1')
 …
             p = subprocess.check_call(['rm'] + flist)
         try:
             print(('Using makefile: ' + makefile))
+            print 'Using makefile: ' + makefile
             p = subprocess.check_call(['make', '-f', makefile])
+            p = subprocess.check_call(['ls', '-l','CONVERT2'])
+        except:
+            print('compile failed - please edit ' + makefile +
+                  ' or try another Makefile in the src directory.')
+            print('most likely GRIB_API_INCLUDE_DIR, GRIB_API_LIB '
+                    'and EMOSLIB must be adapted.')
+            print('Available Makefiles:')
+            print(glob.glob('Makefile*'))
+            p = subprocess.check_call(['ls', '-l', 'CONVERT2'])
+        except subprocess.CalledProcessError as e:
+            print 'compile failed with the following error:'
+            print e.output
+            print 'please edit ' + makefile + \
+                  ' or try another Makefile in the src directory.'
+            print 'most likely GRIB_API_INCLUDE_DIR, GRIB_API_LIB  \
+                   and EMOSLIB must be adapted.'
+            print 'Available Makefiles:'
+            print glob.glob('Makefile*')
     elif target.lower() == 'ecgate':
         os.chdir('/')
 …
                                        'ecgate:/home/ms/' + c.ecgid + '/' +
                                        c.ecuid + '/ECMWFDATA7.1.tar'])
+        except:
+            print('ecaccess-file-put failed! Probably the eccert key has expired.')
+        except subprocess.CalledProcessError as e:
+            print 'ecaccess-file-put failed! \
+                   Probably the eccert key has expired.'
             exit(1)
+        p = subprocess.check_call(['ecaccess-job-submit',
+                                   '-queueName',
+                                   target,
+                                   ecd + 'python/compilejob.ksh'])
+        print('compilejob.ksh has been submitted to ecgate for '
+                'installation in ' + c.ec_flexpart_root_scripts +
+                '/ECMWFDATA7.1')
+        print('You should get an email with subject flexcompile within '
+                'the next few minutes')
+        try:
+            p = subprocess.check_call(['ecaccess-job-submit',
+                                       '-queueName',
+                                       target,
+                                       ecd + 'python/compilejob.ksh'])
+            print 'compilejob.ksh has been submitted to ecgate for  \
+                   installation in ' + c.ec_flexpart_root_scripts + \
+                   '/ECMWFDATA7.1'
+            print 'You should get an email with subject flexcompile within  \
+                   the next few minutes'
+        except subprocess.CalledProcessError as e:
+            print 'ecaccess-job-submit failed!'
+            exit(1)
     elif target.lower() == 'cca':
 …
                                        'cca:/home/ms/' + c.ecgid + '/' +
                                        c.ecuid + '/ECMWFDATA7.1.tar'])
         except:
             print('ecaccess-file-put failed! '
                     'Probably the eccert key has expired.')
+        except subprocess.CalledProcessError as e:
+            print 'ecaccess-file-put failed! \
+                   Probably the eccert key has expired.'
             exit(1)
+        p=subprocess.check_call(['ecaccess-job-submit',
+                                '-queueName',
+                                target,
+                                ecd + 'python/compilejob.ksh'])
+        print('compilejob.ksh has been submitted to cca for installation in ' +
+              c.ec_flexpart_root_scripts + '/ECMWFDATA7.1')
+        print('You should get an email with subject flexcompile '
+                'within the next few minutes')
+        try:
+            p = subprocess.check_call(['ecaccess-job-submit',
+                                       '-queueName',
+                                       target,
+                                       ecd + 'python/compilejob.ksh'])
+            print 'compilejob.ksh has been submitted to cca for installation in ' +\
+                  c.ec_flexpart_root_scripts + '/ECMWFDATA7.1'
+            print 'You should get an email with subject flexcompile \
+                   within the next few minutes'
+        except subprocess.CalledProcessError as e:
+            print 'ecaccess-job-submit failed!'
+            exit(1)
     else:
         print('ERROR: unknown installation target ', target)
         print('Valid targets: ecgate, cca, local')
+        print 'ERROR: unknown installation target ', target
+        print 'Valid targets: ecgate, cca, local'
     return

python/plot_retrieved.py

-                      rccab809
+                      rff99eae
 # -*- coding: utf-8 -*-
 #************************************************************************
 # TODO AP
+# ToDo AP
 # - documentation der Funktionen
 # - docu der progam functionality
 …
 #        - created function main and moved the two function calls for
 #          arguments and plotting into it
 #        - added function getBasics to extract the boundary conditions
+#        - added function get_basics to extract the boundary conditions
 #          of the data fields from the first grib file it gets.
+#
 …
 # @Program Content:
 #    - main
 #    - getBasics
 #    - plotRetrieved
 #    - plotTS
 #    - plotMap
 #    - getPlotArgs
+#    - get_basics
+#    - plot_retrieved
+#    - plot_timeseries
+#    - plot_map
+#    - get_plot_args
+#
 #*******************************************************************************
 …
 import inspect
 import sys
-import glob
 from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
+from matplotlib.pylab import *
+import matplotlib.patches as mpatches
+from mpl_toolkits.basemap import Basemap, addcyclic
+import matplotlib.colors as mcolors
+from matplotlib.font_manager import FontProperties
+from matplotlib.patches import Polygon
+import matplotlib.cm as cmx
+import matplotlib.colors as colors
+#from rasotools.utils import stats
+import matplotlib
+import matplotlib.pyplot as plt
+from mpl_toolkits.basemap import Basemap
+from eccodes import codes_grib_new_from_file, codes_get, codes_release, \
+                    codes_get_values
+import numpy as np
+# software specific classes and modules from flex_extract
+from ControlFile import ControlFile
+from UioFiles import UioFiles
+# add path to pythonpath so that python finds its buddies
+LOCAL_PYTHON_PATH = os.path.dirname(os.path.abspath(
+    inspect.getfile(inspect.currentframe())))
+if LOCAL_PYTHON_PATH not in sys.path:
+    sys.path.append(LOCAL_PYTHON_PATH)
 font = {'family': 'monospace', 'size': 12}
 matplotlib.rcParams['xtick.major.pad'] = '20'
 matplotlib.rc('font', **font)
-from eccodes import *
-import numpy as np
-# add path to pythonpath so that python finds its buddies
-localpythonpath = os.path.dirname(os.path.abspath(
-    inspect.getfile(inspect.currentframe())))
-if localpythonpath not in sys.path:
-    sys.path.append(localpythonpath)
-# software specific classes and modules from flex_extract
-from Tools import silentremove
-from ControlFile import ControlFile
-#from GribTools import GribTools
-from UIOFiles import UIOFiles
 # ------------------------------------------------------------------------------
 # FUNCTION
 …
     '''
     @Description:
         If plotRetrieved is called from command line, this function controls
+        If plot_retrieved is called from command line, this function controls
         the program flow and calls the argumentparser function and
         the plotRetrieved function for plotting the retrieved GRIB data.
+        the plot_retrieved function for plotting the retrieved GRIB data.
     @Input:
 …
         <nothing>
     '''
     args, c = getPlotArgs()
     plotRetrieved(args, c)
+    args, c = get_plot_args()
+    plot_retrieved(c)
     return
 def getBasics(ifile, verb=False):
+def get_basics(ifile, verb=False):
     """
     @Description:
 …
         ifile: string
             Contains the full absolute path to the ECMWF grib file.
         verb (opt): bool
             Is True if there should be extra output in verbose mode.
 …
             'iDirectionIncrementInDegrees'
     """
-    from eccodes import *
     data = {}
 …
         # information needed from grib message
+        keys = [
+                'Ni',
+        keys = ['Ni',
                 'Nj',
                 'latitudeOfFirstGridPointInDegrees',
 …
                 'longitudeOfLastGridPointInDegrees',
                 'jDirectionIncrementInDegrees',
                 'iDirectionIncrementInDegrees'
+               ]
         if verb: print('\nInformations are: ')
+                'iDirectionIncrementInDegrees']
+        if verb:
+            print '\nInformations are: '
         for key in keys:
             # Get the value of the key in a grib message.
+            data[key] = codes_get(gid,key)
+            if verb: print "%s = %s" % (key,data[key])
+        if verb: print '\n'
+            data[key] = codes_get(gid, key)
+            if verb:
+                print "%s = %s" % (key, data[key])
+        if verb:
+            print '\n'
         # Free the memory for the message referred as gribid.
 …
     return data
 def getFilesPerDate(files, datelist):
+def get_files_per_date(files, datelist):
     '''
     @Description:
 …
     @Input:
         files: instance of UIOFiles
+        files: instance of UioFiles
             For description see class documentation.
             It contains the attribute "files" which is a list of pathes
 …
     filelist = []
     for file in files:
         fdate = file[-8:]
         ddate = datetime.datetime.strptime(fdate, '%y%m%d%H')
+    for filename in files:
+        filedate = filename[-8:]
+        ddate = datetime.datetime.strptime(filedate, '%y%m%d%H')
         if ddate in datelist:
             filelist.append(file)
+            filelist.append(filename)
     return filelist
 def plotRetrieved(args, c):
+def plot_retrieved(c):
     '''
     @Description:
         Reads GRIB data from a specified time period, a list of levels
         and a specified list of parameter.
-    @Input:
-        args: instance of ArgumentParser
-            Contains the commandline arguments from script/program call.
-        c: instance of class ControlFile
-            Contains all necessary information of a CONTROL file. The parameters
-            are: DAY1, DAY2, DTIME, MAXSTEP, TYPE, TIME, STEP, CLASS, STREAM,
-            NUMBER, EXPVER, GRID, LEFT, LOWER, UPPER, RIGHT, LEVEL, LEVELIST,
-            RESOL, GAUSS, ACCURACY, OMEGA, OMEGADIFF, ETA, ETADIFF, DPDETA,
-            SMOOTH, FORMAT, ADDPAR, WRF, CWC, PREFIX, ECSTORAGE, ECTRANS,
-            ECFSDIR, MAILOPS, MAILFAIL, GRIB2FLEXPART, DEBUG, INPUTDIR,
-            OUTPUTDIR, FLEXPART_ROOT_SCRIPTS
-            For more information about format and content of the parameter see
-            documentation.
-    @Return:
-        <nothing>
-    '''
-    start = datetime.datetime.strptime(c.start_date, '%Y%m%d%H')
-    end = datetime.datetime.strptime(c.end_date, '%Y%m%d%H')
-    # create datelist between start and end date
-    datelist = [start] # initialise datelist with first date
-    run_date = start
-    while run_date < end:
-        run_date += datetime.timedelta(hours=int(c.dtime))
-        datelist.append(run_date)
-    print 'datelist: ', datelist
-    c.paramIds = asarray(c.paramIds, dtype='int')
-    c.levels = asarray(c.levels, dtype='int')
-    c.area = asarray(c.area)
-    # index_keys = ["date", "time", "step"]
-    # indexfile = c.inputdir + "/date_time_stepRange.idx"
-    # silentremove(indexfile)
-    # grib = GribTools(inputfiles.files)
-    # # creates new index file
-    # iid = grib.index(index_keys=index_keys, index_file=indexfile)
-    # # read values of index keys
-    # index_vals = []
-    # for key in index_keys:
-        # index_vals.append(grib_index_get(iid, key))
-        # print(index_vals[-1])
-        # # index_vals looks for example like:
-        # # index_vals[0]: ('20171106', '20171107', '20171108') ; date
-        # # index_vals[1]: ('0', '1200', '1800', '600') ; time
-        # # index_vals[2]: ('0', '12', '3', '6', '9') ; stepRange
-    #index_keys = ["date", "time", "step", "paramId"]
-    #indexfile = c.inputdir + "/date_time_stepRange.idx"
-    #silentremove(indexfile)
-    files = UIOFiles(c.prefix+'*')
-    files.listFiles(c.inputdir)
-    ifiles = getFilesPerDate(files.files, datelist)
-    ifiles.sort()
-    gdict = getBasics(ifiles[0], verb=False)
-    fdict = dict()
-    fmeta = dict()
-    fstamp = dict()
-    for p in c.paramIds:
-        for l in c.levels:
-            key = '{:0>3}_{:0>3}'.format(p, l)
-            fdict[key] = []
-            fmeta[key] = []
-            fstamp[key] = []
-    for file in ifiles:
-        f = open(file)
-        print( "Opening file for reading data --- %s" % file)
-        fdate = datetime.datetime.strptime(file[-8:], "%y%m%d%H")
-        # Load in memory a grib message from a file.
-        gid = codes_grib_new_from_file(f)
-        while(gid is not None):
-            gtype = codes_get(gid, 'type')
-            paramId = codes_get(gid, 'paramId')
-            parameterName = codes_get(gid, 'parameterName')
-            level = codes_get(gid, 'level')
-            if paramId in c.paramIds and level in c.levels:
-                key = '{:0>3}_{:0>3}'.format(paramId, level)
-                print 'key: ', key
-                if len(fstamp[key]) != 0 :
-                    for i in range(len(fstamp[key])):
-                        if fdate < fstamp[key][i]:
-                            fstamp[key].insert(i, fdate)
-                            fmeta[key].insert(i, [paramId, parameterName, gtype,
-                                                fdate, level])
-                            fdict[key].insert(i, flipud(reshape(
-                                            codes_get_values(gid),
-                                            [gdict['Nj'], gdict['Ni']])))
-                            break
-                        elif fdate > fstamp[key][i] and i == len(fstamp[key])-1:
-                            fstamp[key].append(fdate)
-                            fmeta[key].append([paramId, parameterName, gtype,
-                                                fdate, level])
-                            fdict[key].append(flipud(reshape(
-                                            codes_get_values(gid),
-                                            [gdict['Nj'], gdict['Ni']])))
-                            break
-                        elif fdate > fstamp[key][i] and i != len(fstamp[key])-1 \
-                             and fdate < fstamp[key][i+1]:
-                            fstamp[key].insert(i, fdate)
-                            fmeta[key].insert(i, [paramId, parameterName, gtype,
-                                                    fdate, level])
-                            fdict[key].insert(i, flipud(reshape(
-                                            codes_get_values(gid),
-                                            [gdict['Nj'], gdict['Ni']])))
-                            break
-                        else:
-                            pass
-                else:
-                    fstamp[key].append(fdate)
-                    fmeta[key].append((paramId, parameterName, gtype,
-                                       fdate, level))
-                    fdict[key].append(flipud(reshape(
-                        codes_get_values(gid), [gdict['Nj'], gdict['Ni']])))
-            codes_release(gid)
-            # Load in memory a grib message from a file.
-            gid = codes_grib_new_from_file(f)
-        f.close()
-    #print 'fstamp: ', fstamp
-    #exit()
-    for k in fdict.keys():
-        print 'fmeta: ', len(fmeta),fmeta
-        fml = fmeta[k]
-        fdl = fdict[k]
-        print 'fm1: ', len(fml), fml
-        #print 'fd1: ', fdl
-        #print zip(fdl, fml)
-        for fd, fm in zip(fdl, fml):
-            print fm
-            ftitle = fm[1] + ' {} '.format(fm[-1]) + \
-                datetime.datetime.strftime(fm[3], '%Y%m%d%H') #+ ' ' + stats(fd)
-            pname = '_'.join(fm[1].split()) + '_{}_'.format(fm[-1]) + \
-                datetime.datetime.strftime(fm[3], '%Y%m%d%H')
-            plotMap(c, fd, fm, gdict, ftitle, pname, 'png')
-    for k in fdict.keys():
-        fml = fmeta[k]
-        fdl = fdict[k]
-        fsl = fstamp[k]
-        if fdl:
-            fm = fml[0]
-            fd = fdl[0]
-            ftitle = fm[1] + ' {} '.format(fm[-1]) + \
-                datetime.datetime.strftime(fm[3], '%Y%m%d%H') #+ ' ' + stats(fd)
-            pname = '_'.join(fm[1].split()) + '_{}_'.format(fm[-1]) + \
-                datetime.datetime.strftime(fm[3], '%Y%m%d%H')
-            lat = -20
-            lon = 20
-            plotTS(c, fdl, fml, fsl, lat, lon,
-                           gdict, ftitle, pname, 'png')
-    return
-def plotTS(c, flist, fmetalist, ftimestamps, lat, lon,
-                   gdict, ftitle, filename, fending, show=False):
-    '''
-    @Description:
-    @Input:
-        c:
-        flist:
-            The actual data values to be plotted from the grib messages.
-        fmetalist: list of strings
-            Contains some meta date for the data field to be plotted:
-            parameter id, parameter Name, grid type, datetime, level
-        ftimestamps: list of datetime
-            Contains the time stamps.
-        lat:
-        lon:
-        gdict:
-        ftitle: string
-            The title of the timeseries.
-        filename: string
-            The time series is stored in a file with this name.
-        fending: string
-            Contains the type of plot, e.g. pdf or png
-        show: boolean
-            Decides if the plot is shown after plotting or hidden.
-    @Return:
-        <nothing>
-    '''
-    print 'plotting timeseries'
-    t1 = time.time()
-    llx = gdict['longitudeOfFirstGridPointInDegrees']
-    if llx > 180. :
-        llx -= 360.
-    lly = gdict['latitudeOfLastGridPointInDegrees']
-    dxout = gdict['iDirectionIncrementInDegrees']
-    dyout = gdict['jDirectionIncrementInDegrees']
-    urx = gdict['longitudeOfLastGridPointInDegrees']
-    ury = gdict['latitudeOfFirstGridPointInDegrees']
-    numxgrid = gdict['Ni']
-    numygrid = gdict['Nj']
-    farr = asarray(flist)
-    #(time, lat, lon)
-    lonindex = linspace(llx, urx, numxgrid)
-    latindex = linspace(lly, ury, numygrid)
-    #print len(lonindex), len(latindex), farr.shape
-    #latindex = (lat + 90) * 180 / (gdict['Nj'] - 1)
-    #lonindex = (lon + 179) * 360 / gdict['Ni']
-    #print latindex, lonindex
-    ts = farr[:, 0, 0]#latindex[0], lonindex[0]]
-    fig = plt.figure(figsize=(12, 6.7))
-    plt.plot(ftimestamps, ts)
-    plt.title(ftitle)
-    plt.savefig(c.outputdir+'/'+filename+'_TS.'+fending, facecolor=fig.get_facecolor(), edgecolor='none',format=fending)
-    print 'created ', c.outputdir + '/' + filename
-    if show == True:
-        plt.show()
-    fig.clf()
-    plt.close(fig)
-    print time.time() - t1, 's'
-    return
-def plotMap(c, flist, fmetalist, gdict, ftitle, filename, fending, show=False):
-    '''
-    @Description:
     @Input:
 …
             documentation.
-        flist
-        fmetalist
-        gdict: dict
-            Contains basic informations of the ECMWF grib files, e.g.
-            'Ni', 'Nj', 'latitudeOfFirstGridPointInDegrees',
-            'longitudeOfFirstGridPointInDegrees',
-            'latitudeOfLastGridPointInDegrees',
-            'longitudeOfLastGridPointInDegrees',
-            'jDirectionIncrementInDegrees',
-            'iDirectionIncrementInDegrees'
-        ftitle: string
-            The titel of the plot.
-        filename: string
-            The plot is stored in a file with this name.
-        fending: string
-            Contains the type of plot, e.g. pdf or png
-        show: boolean
-            Decides if the plot is shown after plotting or hidden.
     @Return:
         <nothing>
     '''
+    print 'plotting map'
+    t1 = time.time()
+    fig = plt.figure(figsize=(12, 6.7))
+    #mbaxes = fig.add_axes([0.05, 0.15, 0.8, 0.7])
+    llx = gdict['longitudeOfFirstGridPointInDegrees'] #- 360
+    if llx > 180. :
+        llx -= 360.
+    lly = gdict['latitudeOfLastGridPointInDegrees']
+    dxout = gdict['iDirectionIncrementInDegrees']
+    dyout = gdict['jDirectionIncrementInDegrees']
+    urx = gdict['longitudeOfLastGridPointInDegrees']
+    ury = gdict['latitudeOfFirstGridPointInDegrees']
+    numxgrid = gdict['Ni']
+    numygrid = gdict['Nj']
+    m = Basemap(projection='cyl', llcrnrlon=llx, llcrnrlat=lly,
+                urcrnrlon=urx, urcrnrlat=ury,resolution='i')
+    lw = 0.5
+    m.drawmapboundary()
+    x = linspace(llx, urx, numxgrid)
+    y = linspace(lly, ury, numygrid)
+    xx, yy = m(*meshgrid(x, y))
+    #s = m.contourf(xx, yy, flist)
+    s = plt.imshow(flist.T,
+                    extent=(llx, urx, lly, ury),
+                    alpha=1.0,
+                    interpolation='nearest'
+                    #vmin=vn,
+                    #vmax=vx,
+                    #cmap=my_cmap,
+                    #levels=levels,
+                    #cmap=my_cmap,
+                    #norm=LogNorm(vn,vx)
+                    )
+    title(ftitle, y=1.08)
+    cb = m.colorbar(s, location="right", pad="10%")
+    #cb.set_label('Contribution per cell (ng m$^{-3}$)',size=14)
+    thickline = np.arange(lly,ury+1,10.)
+    thinline  = np.arange(lly,ury+1,5.)
+    m.drawparallels(thickline,color='gray',dashes=[1,1],linewidth=0.5,labels=[1,1,1,1], xoffset=1.) # draw parallels
+    m.drawparallels(np.setdiff1d(thinline,thickline),color='lightgray',dashes=[1,1],linewidth=0.5,labels=[0,0,0,0]) # draw parallels
+    thickline = np.arange(llx,urx+1,10.)
+    thinline  = np.arange(llx,urx+1,5.)
+    m.drawmeridians(thickline,color='gray',dashes=[1,1],linewidth=0.5,labels=[1,1,1,1],yoffset=1.) # draw meridians
+    m.drawmeridians(np.setdiff1d(thinline,thickline),color='lightgray',dashes=[1,1],linewidth=0.5,labels=[0,0,0,0]) # draw meridians
+    m.drawcoastlines()
+    m.drawcountries()
+    plt.savefig(c.outputdir+'/'+filename+'_MAP.'+fending, facecolor=fig.get_facecolor(), edgecolor='none',format=fending)
+    print 'created ', c.outputdir + '/' + filename
+    if show == True:
+        plt.show()
+    fig.clf()
+    plt.close(fig)
+    print time.time() - t1, 's'
+    start = datetime.datetime.strptime(c.start_date, '%Y%m%d%H')
+    end = datetime.datetime.strptime(c.end_date, '%Y%m%d%H')
+    # create datelist between start and end date
+    datelist = [start] # initialise datelist with first date
+    run_date = start
+    while run_date < end:
+        run_date += datetime.timedelta(hours=int(c.dtime))
+        datelist.append(run_date)
+    print 'datelist: ', datelist
+    c.paramIds = np.asarray(c.paramIds, dtype='int')
+    c.levels = np.asarray(c.levels, dtype='int')
+    c.area = np.asarray(c.area)
+    files = UioFiles(c.prefix+'*')
+    files.list_files(c.inputdir)
+    ifiles = get_files_per_date(files.files, datelist)
+    ifiles.sort()
+    gdict = get_basics(ifiles[0], verb=False)
+    fdict = dict()
+    fmeta = dict()
+    fstamp = dict()
+    for p in c.paramIds:
+        for l in c.levels:
+            key = '{:0>3}_{:0>3}'.format(p, l)
+            fdict[key] = []
+            fmeta[key] = []
+            fstamp[key] = []
+    for filename in ifiles:
+        f = open(filename)
+        print "Opening file for reading data --- %s" % filename
+        fdate = datetime.datetime.strptime(filename[-8:], "%y%m%d%H")
+        # Load in memory a grib message from a file.
+        gid = codes_grib_new_from_file(f)
+        while gid is not None:
+            gtype = codes_get(gid, 'type')
+            paramId = codes_get(gid, 'paramId')
+            parameterName = codes_get(gid, 'parameterName')
+            level = codes_get(gid, 'level')
+            if paramId in c.paramIds and level in c.levels:
+                key = '{:0>3}_{:0>3}'.format(paramId, level)
+                print 'key: ', key
+                if fstamp[key]:
+                    for i in range(len(fstamp[key])):
+                        if fdate < fstamp[key][i]:
+                            fstamp[key].insert(i, fdate)
+                            fmeta[key].insert(i, [paramId, parameterName, gtype,
+                                                  fdate, level])
+                            fdict[key].insert(i, np.flipud(np.reshape(
+                                codes_get_values(gid),
+                                [gdict['Nj'], gdict['Ni']])))
+                            break
+                        elif fdate > fstamp[key][i] and i == len(fstamp[key])-1:
+                            fstamp[key].append(fdate)
+                            fmeta[key].append([paramId, parameterName, gtype,
+                                               fdate, level])
+                            fdict[key].append(np.flipud(np.reshape(
+                                codes_get_values(gid),
+                                [gdict['Nj'], gdict['Ni']])))
+                            break
+                        elif fdate > fstamp[key][i] and i != len(fstamp[key])-1 \
+                             and fdate < fstamp[key][i+1]:
+                            fstamp[key].insert(i, fdate)
+                            fmeta[key].insert(i, [paramId, parameterName, gtype,
+                                                  fdate, level])
+                            fdict[key].insert(i, np.flipud(np.reshape(
+                                codes_get_values(gid),
+                                [gdict['Nj'], gdict['Ni']])))
+                            break
+                        else:
+                            pass
+                else:
+                    fstamp[key].append(fdate)
+                    fmeta[key].append((paramId, parameterName, gtype,
+                                       fdate, level))
+                    fdict[key].append(np.flipud(np.reshape(
+                        codes_get_values(gid), [gdict['Nj'], gdict['Ni']])))
+            codes_release(gid)
+            # Load in memory a grib message from a file.
+            gid = codes_grib_new_from_file(f)
+        f.close()
+    for k in fdict.iterkeys():
+        print 'fmeta: ', len(fmeta), fmeta
+        fml = fmeta[k]
+        fdl = fdict[k]
+        print 'fm1: ', len(fml), fml
+        for fd, fm in zip(fdl, fml):
+            print fm
+            ftitle = fm[1] + ' {} '.format(fm[-1]) + \
+                datetime.datetime.strftime(fm[3], '%Y%m%d%H')
+            pname = '_'.join(fm[1].split()) + '_{}_'.format(fm[-1]) + \
+                datetime.datetime.strftime(fm[3], '%Y%m%d%H')
+            plot_map(c, fd, fm, gdict, ftitle, pname, 'png')
+    for k in fdict.iterkeys():
+        fml = fmeta[k]
+        fdl = fdict[k]
+        fsl = fstamp[k]
+        if fdl:
+            fm = fml[0]
+            fd = fdl[0]
+            ftitle = fm[1] + ' {} '.format(fm[-1]) + \
+                datetime.datetime.strftime(fm[3], '%Y%m%d%H')
+            pname = '_'.join(fm[1].split()) + '_{}_'.format(fm[-1]) + \
+                datetime.datetime.strftime(fm[3], '%Y%m%d%H')
+            lat = -20.
+            lon = 20.
+            plot_timeseries(c, fdl, fml, fsl, lat, lon, gdict,
+                            ftitle, pname, 'png')
     return
+def getPlotArgs():
+def plot_timeseries(c, flist, fmetalist, ftimestamps, lat, lon,
+                    gdict, ftitle, filename, fending, show=False):
     '''
     @Description:
+        Assigns the command line arguments and reads CONTROL file
+        content. Apply default values for non mentioned arguments.
+        Creates a timeseries plot for a given lat/lon position.
     @Input:
-        <nothing>
-    @Return:
-        args: instance of ArgumentParser
-            Contains the commandline arguments from script/program call.
         c: instance of class ControlFile
             Contains all necessary information of a CONTROL file. The parameters
 …
             For more information about format and content of the parameter see
             documentation.
+        flist: numpy array, 2d
+            The actual data values to be plotted from the grib messages.
+        fmetalist: list of strings
+            Contains some meta date for the data field to be plotted:
+            parameter id, parameter Name, grid type, datetime, level
+        ftimestamps: list of datetime
+            Contains the time stamps.
+        lat: float
+            The latitude for which the timeseries should be plotted.
+        lon: float
+            The longitude for which the timeseries should be plotted.
+        gdict: dict
+            Contains basic informations of the ECMWF grib files, e.g.
+            'Ni', 'Nj', 'latitudeOfFirstGridPointInDegrees',
+            'longitudeOfFirstGridPointInDegrees',
+            'latitudeOfLastGridPointInDegrees',
+            'longitudeOfLastGridPointInDegrees',
+            'jDirectionIncrementInDegrees',
+            'iDirectionIncrementInDegrees'
+        ftitle: string
+            The title of the timeseries.
+        filename: string
+            The time series is stored in a file with this name.
+        fending: string
+            Contains the type of plot, e.g. pdf or png
+        show: boolean
+            Decides if the plot is shown after plotting or hidden.
+    @Return:
+        <nothing>
+    '''
+    print 'plotting timeseries'
+    t1 = time.time()
+    #llx = gdict['longitudeOfFirstGridPointInDegrees']
+    #if llx > 180. :
+    #    llx -= 360.
+    #lly = gdict['latitudeOfLastGridPointInDegrees']
+    #dxout = gdict['iDirectionIncrementInDegrees']
+    #dyout = gdict['jDirectionIncrementInDegrees']
+    #urx = gdict['longitudeOfLastGridPointInDegrees']
+    #ury = gdict['latitudeOfFirstGridPointInDegrees']
+    #numxgrid = gdict['Ni']
+    #numygrid = gdict['Nj']
+    farr = np.asarray(flist)
+    #(time, lat, lon)
+    #lonindex = linspace(llx, urx, numxgrid)
+    #latindex = linspace(lly, ury, numygrid)
+    ts = farr[:, 0, 0]
+    fig = plt.figure(figsize=(12, 6.7))
+    plt.plot(ftimestamps, ts)
+    plt.title(ftitle)
+    plt.savefig(c.outputdir + '/' + filename + '_TS.' + fending,
+                facecolor=fig.get_facecolor(),
+                edgecolor='none',
+                format=fending)
+    print 'created ', c.outputdir + '/' + filename
+    if show:
+        plt.show()
+    fig.clf()
+    plt.close(fig)
+    print time.time() - t1, 's'
+    return
+def plot_map(c, flist, fmetalist, gdict, ftitle, filename, fending, show=False):
+    '''
+    @Description:
+        Creates a basemap plot with imshow for a given data field.
+    @Input:
+        c: instance of class ControlFile
+            Contains all necessary information of a CONTROL file. The parameters
+            are: DAY1, DAY2, DTIME, MAXSTEP, TYPE, TIME, STEP, CLASS, STREAM,
+            NUMBER, EXPVER, GRID, LEFT, LOWER, UPPER, RIGHT, LEVEL, LEVELIST,
+            RESOL, GAUSS, ACCURACY, OMEGA, OMEGADIFF, ETA, ETADIFF, DPDETA,
+            SMOOTH, FORMAT, ADDPAR, WRF, CWC, PREFIX, ECSTORAGE, ECTRANS,
+            ECFSDIR, MAILOPS, MAILFAIL, GRIB2FLEXPART, DEBUG, INPUTDIR,
+            OUTPUTDIR, FLEXPART_ROOT_SCRIPTS
+            For more information about format and content of the parameter see
+            documentation.
+        flist: numpy array, 2d
+            The actual data values to be plotted from the grib messages.
+        fmetalist: list of strings
+            Contains some meta date for the data field to be plotted:
+            parameter id, parameter Name, grid type, datetime, level
+        gdict: dict
+            Contains basic informations of the ECMWF grib files, e.g.
+            'Ni', 'Nj', 'latitudeOfFirstGridPointInDegrees',
+            'longitudeOfFirstGridPointInDegrees',
+            'latitudeOfLastGridPointInDegrees',
+            'longitudeOfLastGridPointInDegrees',
+            'jDirectionIncrementInDegrees',
+            'iDirectionIncrementInDegrees'
+        ftitle: string
+            The titel of the plot.
+        filename: string
+            The plot is stored in a file with this name.
+        fending: string
+            Contains the type of plot, e.g. pdf or png
+        show: boolean
+            Decides if the plot is shown after plotting or hidden.
+    @Return:
+        <nothing>
+    '''
+    print 'plotting map'
+    t1 = time.time()
+    fig = plt.figure(figsize=(12, 6.7))
+    #mbaxes = fig.add_axes([0.05, 0.15, 0.8, 0.7])
+    llx = gdict['longitudeOfFirstGridPointInDegrees'] #- 360
+    if llx > 180.:
+        llx -= 360.
+    lly = gdict['latitudeOfLastGridPointInDegrees']
+    #dxout = gdict['iDirectionIncrementInDegrees']
+    #dyout = gdict['jDirectionIncrementInDegrees']
+    urx = gdict['longitudeOfLastGridPointInDegrees']
+    ury = gdict['latitudeOfFirstGridPointInDegrees']
+    #numxgrid = gdict['Ni']
+    #numygrid = gdict['Nj']
+    m = Basemap(projection='cyl', llcrnrlon=llx, llcrnrlat=lly,
+                urcrnrlon=urx, urcrnrlat=ury, resolution='i')
+    #lw = 0.5
+    m.drawmapboundary()
+    #x = linspace(llx, urx, numxgrid)
+    #y = linspace(lly, ury, numygrid)
+    #xx, yy = m(*meshgrid(x, y))
+    #s = m.contourf(xx, yy, flist)
+    s = plt.imshow(flist.T,
+                   extent=(llx, urx, lly, ury),
+                   alpha=1.0,
+                   interpolation='nearest'
+                   #vmin=vn,
+                   #vmax=vx,
+                   #cmap=my_cmap,
+                   #levels=levels,
+                   #cmap=my_cmap,
+                   #norm=LogNorm(vn,vx)
+                  )
+    plt.title(ftitle, y=1.08)
+    cb = m.colorbar(s, location="right", pad="10%")
+    cb.set_label('label', size=14)
+    thickline = np.arange(lly, ury+1, 10.)
+    thinline = np.arange(lly, ury+1, 5.)
+    m.drawparallels(thickline,
+                    color='gray',
+                    dashes=[1, 1],
+                    linewidth=0.5,
+                    labels=[1, 1, 1, 1],
+                    xoffset=1.)
+    m.drawparallels(np.setdiff1d(thinline, thickline),
+                    color='lightgray',
+                    dashes=[1, 1],
+                    linewidth=0.5,
+                    labels=[0, 0, 0, 0])
+    thickline = np.arange(llx, urx+1, 10.)
+    thinline = np.arange(llx, urx+1, 5.)
+    m.drawmeridians(thickline,
+                    color='gray',
+                    dashes=[1, 1],
+                    linewidth=0.5,
+                    labels=[1, 1, 1, 1],
+                    yoffset=1.)
+    m.drawmeridians(np.setdiff1d(thinline, thickline),
+                    color='lightgray',
+                    dashes=[1, 1],
+                    linewidth=0.5,
+                    labels=[0, 0, 0, 0])
+    m.drawcoastlines()
+    m.drawcountries()
+    plt.savefig(c.outputdir + '/' + filename + '_MAP.' + fending,
+                facecolor=fig.get_facecolor(),
+                edgecolor='none',
+                format=fending)
+    print 'created ', c.outputdir + '/' + filename
+    if show:
+        plt.show()
+    fig.clf()
+    plt.close(fig)
+    print time.time() - t1, 's'
+    return
+def get_plot_args():
+    '''
+    @Description:
+        Assigns the command line arguments and reads CONTROL file
+        content. Apply default values for non mentioned arguments.
+    @Input:
+        <nothing>
+    @Return:
+        args: instance of ArgumentParser
+            Contains the commandline arguments from script/program call.
+        c: instance of class ControlFile
+            Contains all necessary information of a CONTROL file. The parameters
+            are: DAY1, DAY2, DTIME, MAXSTEP, TYPE, TIME, STEP, CLASS, STREAM,
+            NUMBER, EXPVER, GRID, LEFT, LOWER, UPPER, RIGHT, LEVEL, LEVELIST,
+            RESOL, GAUSS, ACCURACY, OMEGA, OMEGADIFF, ETA, ETADIFF, DPDETA,
+            SMOOTH, FORMAT, ADDPAR, WRF, CWC, PREFIX, ECSTORAGE, ECTRANS,
+            ECFSDIR, MAILOPS, MAILFAIL, GRIB2FLEXPART, DEBUG, INPUTDIR,
+            OUTPUTDIR, FLEXPART_ROOT_SCRIPTS
+            For more information about format and content of the parameter see
+            documentation.
     '''
     parser = ArgumentParser(description='Plot retrieved GRIB data from ' + \
 …
     parser.add_argument("--start_date", dest="start_date",
                         help="start date YYYYMMDD")
     parser.add_argument( "--end_date", dest="end_date",
                          help="end_date YYYYMMDD")
+    parser.add_argument("--end_date", dest="end_date",
+                        help="end_date YYYYMMDD")
     parser.add_argument("--start_step", dest="start_step",
                         help="start step in hours")
     parser.add_argument( "--end_step", dest="end_step",
                          help="end step in hours")
+    parser.add_argument("--end_step", dest="end_step",
+                        help="end step in hours")
 # some arguments that override the default in the CONTROL file
 …
     except IOError:
         try:
+            c = ControlFile(localpythonpath + args.controlfile)
+        except:
+            c = ControlFile(LOCAL_PYTHON_PATH + args.controlfile)
+        except IOError:
             print 'Could not read CONTROL file "' + args.controlfile + '"'
             print 'Either it does not exist or its syntax is wrong.'
 …
 if __name__ == "__main__":
     main()

python/prepare_flexpart.py

-                      r991df6a
+                      rff99eae
 # -*- coding: utf-8 -*-
 #************************************************************************
+# TODO AP
+# - wieso cleanup in main wenn es in prepareflexpart bereits abgefragt wurde?
+#   doppelt gemoppelt?
+# ToDo AP
 # - wieso start=startm1 wenn basetime = 0 ?  wenn die fluxes nicht mehr
 #   relevant sind? verstehe ich nicht
 …
 #        - added documentation
 #        - minor changes in programming style for consistence
 #        - BUG: removed call of cleanup-Function after call of
+#        - BUG: removed call of clean_up-Function after call of
 #               prepareFlexpart in main since it is already called in
 #               prepareFlexpart at the end!
 #        - created function main and moved the two function calls for
 #          arguments and prepareFLEXPART into it
+#          arguments and prepare_flexpart into it
+#
 # @License:
 …
 #    This program prepares the final version of the grib files which are
 #    then used by FLEXPART. It converts the bunch of grib files extracted
 #    via getMARSdata by doing for example the necessary conversion to get
+#    via get_mars_data by doing for example the necessary conversion to get
 #    consistent grids or the disaggregation of flux data. Finally, the
 #    program combines the data fields in files per available hour with the
 …
 # @Program Content:
 #    - main
 #    - prepareFLEXPART
+#    - prepare_flexpart
+#
 #*******************************************************************************
 …
 # MODULES
 # ------------------------------------------------------------------------------
-import shutil
 import datetime
-#import time
 import os
 import inspect
 import sys
 import socket
-from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
+hostname = socket.gethostname()
+ecapi = 'ecmwf' not in hostname
+# software specific classes and modules from flex_extract
+from UioFiles import UioFiles
+from tools import interpret_args_and_control, clean_up
+from EcFlexpart import EcFlexpart
+ecapi = 'ecmwf' not in socket.gethostname()
 try:
     if ecapi:
 …
 # add path to pythonpath so that python finds its buddies
 localpythonpath = os.path.dirname(os.path.abspath(
+LOCAL_PYTHON_PATH = os.path.dirname(os.path.abspath(
     inspect.getfile(inspect.currentframe())))
 if localpythonpath not in sys.path:
     sys.path.append(localpythonpath)
+if LOCAL_PYTHON_PATH not in sys.path:
+    sys.path.append(LOCAL_PYTHON_PATH)
-# software specific classes and modules from flex_extract
-from UIOFiles import UIOFiles
-from Tools import interpret_args_and_control, cleanup
-from ECFlexpart import ECFlexpart
 # ------------------------------------------------------------------------------
 # FUNCTION
 …
     '''
     @Description:
         If prepareFLEXPART is called from command line, this function controls
+        If prepare_flexpart is called from command line, this function controls
         the program flow and calls the argumentparser function and
         the prepareFLEXPART function for preparation of GRIB data for FLEXPART.
+        the prepare_flexpart function for preparation of GRIB data for FLEXPART.
     @Input:
 …
     '''
     args, c = interpret_args_and_control()
     prepareFLEXPART(args, c)
+    prepare_flexpart(args, c)
     return
 def prepareFLEXPART(args, c):
+def prepare_flexpart(args, c):
     '''
     @Description:
         Lists all grib files retrieved from MARS with getMARSdata and
+        Lists all grib files retrieved from MARS with get_mars_data and
         uses prepares data for the use in FLEXPART. Specific data fields
         are converted to a different grid and the flux data are going to be
 …
     # one day after the end date is needed
     startm1 = start - datetime.timedelta(days=1)
     endp1 = end + datetime.timedelta(days=1)
+#    endp1 = end + datetime.timedelta(days=1)
     # get all files with flux data to be deaccumulated
     inputfiles = UIOFiles('*OG_acc_SL*.' + c.ppid + '.*')
     inputfiles.listFiles(c.inputdir)
+    inputfiles = UioFiles('*OG_acc_SL*.' + c.ppid + '.*')
+    inputfiles.list_files(c.inputdir)
     # create output dir if necessary
 …
     # deaccumulate the flux data
     flexpart = ECFlexpart(c, fluxes=True)
+    flexpart = EcFlexpart(c, fluxes=True)
     flexpart.write_namelist(c, 'fort.4')
     flexpart.deacc_fluxes(inputfiles, c)
     print('Prepare ' + start.strftime("%Y%m%d") +
           "/to/" + end.strftime("%Y%m%d"))
+    print 'Prepare ' + start.strftime("%Y%m%d") + \
+          "/to/" + end.strftime("%Y%m%d")
     # get a list of all files from the root inputdir
     inputfiles = UIOFiles('????__??.*' + c.ppid + '.*')
     inputfiles.listFiles(c.inputdir)
+    inputfiles = UioFiles('????__??.*' + c.ppid + '.*')
+    inputfiles.list_files(c.inputdir)
     # produce FLEXPART-ready GRIB files and
 …
         start = startm1
     flexpart = ECFlexpart(c, fluxes=False)
+    flexpart = EcFlexpart(c, fluxes=False)
     flexpart.create(inputfiles, c)
     flexpart.process_output(c)
 …
     # otherwise delete temporary files
     if int(c.debug) != 0:
         print('Temporary files left intact')
+        print 'Temporary files left intact'
     else:
         cleanup(c)
+        clean_up(c)
     return

python/profiling.py

-                      r991df6a
+                      rff99eae
 # -*- coding: utf-8 -*-
 #************************************************************************
 # TODO AP
+# ToDo AP
 # - check of license of book content
 #************************************************************************
 …
         result = fn(*args, **kwargs)
         t2 = time.time()
         print("@timefn:" + fn.func_name + " took " + str(t2 - t1) + " seconds")
+        print "@timefn:" + fn.func_name + " took " + str(t2 - t1) + " seconds"
         return result

python/submit.py

-                      r991df6a
+                      rff99eae
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#************************************************************************
-# TODO AP
+#
-# - Change History ist nicht angepasst ans File! Original geben lassen
-# - dead code ? what to do?
-# - seperate operational and reanlysis for clarification
-# - divide in two submits , ondemand und operational
-# -
-#************************************************************************
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
 …
 #    program flow.
 #    If it is supposed to work locally then it works through the necessary
 #    functions getMARSdata and prepareFlexpart. Otherwise it prepares
+#    functions get_mars_data and prepareFlexpart. Otherwise it prepares
 #    a shell job script which will do the necessary work on the
 #    ECMWF server and is submitted via ecaccess-job-submit.
 …
 import os
 import sys
-import glob
 import subprocess
 import inspect
-# add path to pythonpath so that python finds its buddies
-localpythonpath = os.path.dirname(os.path.abspath(
-    inspect.getfile(inspect.currentframe())))
-if localpythonpath not in sys.path:
-    sys.path.append(localpythonpath)
 # software specific classes and modules from flex_extract
+from Tools import interpret_args_and_control, normalexit
+from getMARSdata import getMARSdata
+from prepareFLEXPART import prepareFLEXPART
+from tools import interpret_args_and_control, normal_exit
+from get_mars_data import get_mars_data
+from prepare_flexpart import prepare_flexpart
+# add path to pythonpath so that python finds its buddies
+LOCAL_PYTHON_PATH = os.path.dirname(os.path.abspath(
+    inspect.getfile(inspect.currentframe())))
+if LOCAL_PYTHON_PATH not in sys.path:
+    sys.path.append(LOCAL_PYTHON_PATH)
 # ------------------------------------------------------------------------------
 …
         <nothing>
     '''
+    calledfromdir = os.getcwd()
+    called_from_dir = os.getcwd()
     args, c = interpret_args_and_control()
     # on local side
     if args.queue is None:
         if c.inputdir[0] != '/':
             c.inputdir = os.path.join(calledfromdir, c.inputdir)
+            c.inputdir = os.path.join(called_from_dir, c.inputdir)
         if c.outputdir[0] != '/':
             c.outputdir = os.path.join(calledfromdir, c.outputdir)
         getMARSdata(args, c)
         prepareFLEXPART(args, c)
         normalexit(c)
+            c.outputdir = os.path.join(called_from_dir, c.outputdir)
+        get_mars_data(args, c)
+        prepare_flexpart(args, c)
+        normal_exit(c)
     # on ECMWF server
     else:
 …
     # put all parameters of ControlFile instance into a list
     clist = c.tolist()
+    clist = c.to_list() # ondemand
     colist = []  # operational
     mt = 0
-#AP wieso 2 for loops?
     for elem in clist:
         if 'maxstep' in elem:
 …
             elem = 'start_date ' + '${MSJ_YEAR}${MSJ_MONTH}${MSJ_DAY}'
         if 'end_date' in elem:
+#AP Fehler?! Muss end_date heissen
+            elem = 'start_date ' + '${MSJ_YEAR}${MSJ_MONTH}${MSJ_DAY}'
+            elem = 'end_date ' + '${MSJ_YEAR}${MSJ_MONTH}${MSJ_DAY}'
         if 'base_time' in elem:
             elem = 'base_time ' + '${MSJ_BASETIME}'
 …
         p = subprocess.check_call(['ecaccess-job-submit', '-queueName',
                                    queue, 'job.ksh'])
+    except:
+        print('ecaccess-job-submit failed, probably eccert has expired')
+    except subprocess.CalledProcessError as e:
+        print 'ecaccess-job-submit failed!'
+        print 'Error Message: '
+        print e.output
         exit(1)
     print('You should get an email with subject flex.hostname.pid')
+    print 'You should get an email with subject flex.hostname.pid'
     return

python/test_suite.py

-                      r991df6a
+                      rff99eae
 # -*- coding: utf-8 -*-
 #************************************************************************
+# TODO AP
+#
+# ToDo AP
 # - provide more tests
 # - provide more documentation
-# -
 #************************************************************************
 …
 # @Program Functionality:
 #    This script triggers the ECMWFDATA test suite. Call with
 #    testsuite.py [test group]
+#    test_suite.py [test group]
+#
 # @Program Content:
 …
 # ------------------------------------------------------------------------------
 try:
     taskfile = open('testsuite.json')
 except:
     print 'could not open suite definition file testsuite.json'
+    taskfile = open('test_suite.json')
+except IOError:
+    print 'could not open suite definition file test_suite.json'
     exit()
 …
     try:
         tk, tv = g, tasks[g]
     except:
         continue
+    finally:
+        pass
     garglist = []
     for ttk, ttv in tv.iteritems():
 …
             if ttk != 'script':
                 garglist.append('--' + ttk)
                 if '$' == ttv[0]:
+                if ttv[0] == '$':
                     garglist.append(os.path.expandvars(ttv))
                 else:
 …
             for tttk, tttv in ttv.iteritems():
                 if isinstance(tttv, basestring):
                         arglist.append('--' + tttk)
                         if '$' in tttv[0]:
                             arglist.append(os.path.expandvars(tttv))
                         else:
                             arglist.append(tttv)
+                    arglist.append('--' + tttk)
+                    if '$' in tttv[0]:
+                        arglist.append(os.path.expandvars(tttv))
+                    else:
+                        arglist.append(tttv)
             print 'Command: ', ' '.join([tv['script']] + garglist + arglist)
             o = '../test/' + tk + '_' + ttk + '_' + '_'.join(ttv.keys())
 …
                 p = subprocess.check_call([tv['script']] + garglist + arglist,
                                           stdout=f, stderr=f)
             except:
+            except subprocess.CalledProcessError as e:
                 f.write('\nFAILED\n')
                 print 'FAILED'
 …
 print str(jobcounter-jobfailed) + ' successful, ' + str(jobfailed) + ' failed'
 print 'If tasks have been submitted via ECACCESS please check emails'
-#print tasks

python/tools.py

-                      r991df6a
+                      rff99eae
 # -*- coding: utf-8 -*-
 #************************************************************************
 # TODO AP
 # - check myerror
 # - check normalexit
 # - check getListAsString
+# ToDo AP
+# - check my_error
+# - check normal_exit
+# - check get_list_as_string
 # - seperate args and control interpretation
 #************************************************************************
 …
 # @Change History:
 #    October 2014 - Anne Fouilloux (University of Oslo)
 #        - created functions silentremove and product (taken from ECMWF)
+#        - created functions silent_remove and product (taken from ECMWF)
+#
 #    November 2015 - Leopold Haimberger (University of Vienna)
 #        - created functions: interpret_args_and_control, cleanup
 #          myerror, normalexit, init128, toparamId
+#        - created functions: interpret_args_and_control, clean_up
+#          my_error, normal_exit, init128, to_param_id
+#
 #    April 2018 - Anne Philipp (University of Vienna):
 #        - applied PEP8 style guide
 #        - added documentation
 #        - moved all functions from file FlexpartTools to this file Tools
 #        - added function getListAsString
+#        - moved all functions from file Flexparttools to this file tools
+#        - added function get_list_as_string
+#
 # @License:
 …
 # @Module Content:
 #    - interpret_args_and_control
 #    - cleanup
 #    - myerror
 #    - normalexit
+#    - clean_up
+#    - my_error
+#    - normal_exit
 #    - product
 #    - silentremove
+#    - silent_remove
 #    - init128
 #    - toparamId
 #    - getListAsString
+#    - to_param_id
+#    - get_list_as_string
+#
 #*******************************************************************************
 …
 import sys
 import glob
+import inspect
+import subprocess
 import traceback
-from numpy import *
-from gribapi import *
 from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
+import numpy as np
 # software specific class from flex_extract
 …
     parser.add_argument("--flexpart_root_scripts", dest="flexpart_root_scripts",
                         help="FLEXPART root directory (to find grib2flexpart \
                         and COMMAND file)\n\ Normally ECMWFDATA resides in \
+                        and COMMAND file)\n Normally ECMWFDATA resides in \
                         the scripts directory of the FLEXPART distribution")
     # this is only used by prepareFLEXPART.py to rerun a postprocessing step
+    # this is only used by prepare_flexpart.py to rerun a postprocessing step
     parser.add_argument("--ppid", dest="ppid",
                         help="Specify parent process id for \
                         rerun of prepareFLEXPART")
+                        rerun of prepare_flexpart")
     # arguments for job submission to ECMWF, only needed by submit.py
 …
     except IOError:
         try:
+            c = ControlFile(localpythonpath + args.controlfile)
+        except:
+            print('Could not read CONTROL file "' + args.controlfile + '"')
+            print('Either it does not exist or its syntax is wrong.')
+            print('Try "' + sys.argv[0].split('/')[-1] +
+                  ' -h" to print usage information')
+            LOCAL_PYTHON_PATH = os.path.dirname(os.path.abspath(
+                inspect.getfile(inspect.currentframe())))
+            c = ControlFile(LOCAL_PYTHON_PATH + args.controlfile)
+        except IOError:
+            print 'Could not read CONTROL file "' + args.controlfile + '"'
+            print 'Either it does not exist or its syntax is wrong.'
+            print 'Try "' + sys.argv[0].split('/')[-1] + \
+                  ' -h" to print usage information'
             exit(1)
     # check for having at least a starting date
     if  args.start_date is None and getattr(c, 'start_date') is None:
         print('start_date specified neither in command line nor \
                in CONTROL file ' + args.controlfile)
         print('Try "' + sys.argv[0].split('/')[-1] +
               ' -h" to print usage information')
+        print 'start_date specified neither in command line nor \
+               in CONTROL file ' + args.controlfile
+        print 'Try "' + sys.argv[0].split('/')[-1] + \
+              ' -h" to print usage information'
         exit(1)
 …
         l = args.area.split('/')
         if afloat:
             for i in range(len(l)):
                 l[i] = str(int(float(l[i]) * 1000))
+            for i, item in enumerate(l):
+                item = str(int(float(item) * 1000))
         c.upper, c.left, c.lower, c.right = l
 …
         if 'to' in args.step.lower():
             if 'by' in args.step.lower():
                 ilist = arange(int(l[0]), int(l[2]) + 1, int(l[4]))
+                ilist = np.arange(int(l[0]), int(l[2]) + 1, int(l[4]))
                 c.step = ['{:0>3}'.format(i) for i in ilist]
             else:
                 myerror(None, args.step + ':\n' +
                         'please use "by" as well if "to" is used')
+                my_error(None, args.step + ':\n' +
+                         'please use "by" as well if "to" is used')
         else:
             c.step = l
 …
 def cleanup(c):
+def clean_up(c):
     '''
     @Description:
 …
     '''
     print("cleanup")
+    print "clean_up"
     cleanlist = glob.glob(c.inputdir + "/*")
     for cl in cleanlist:
         if c.prefix not in cl:
             silentremove(cl)
+            silent_remove(cl)
         if c.ecapi is False and (c.ectrans == '1' or c.ecstorage == '1'):
             silentremove(cl)
     print("Done")
+            silent_remove(cl)
+    print "Done"
     return
 def myerror(c, message='ERROR'):
+def my_error(c, message='ERROR'):
     '''
     @Description:
 …
         <nothing>
     '''
+    # uncomment if user wants email notification directly from python
+    #try:
+        #target = c.mailfail
+    #except AttributeError:
+        #target = os.getenv('USER')
+    #if(type(target) is not list):
+        #target = [target]
+    print(message)
+    # uncomment if user wants email notification directly from python
+    #for t in target:
+    #p = subprocess.Popen(['mail','-s ECMWFDATA v7.0 ERROR', os.path.expandvars(t)],
+    #                     stdin = subprocess.PIPE, stdout = subprocess.PIPE,
+    #                     stderr = subprocess.PIPE, bufsize = 1)
+    #tr = '\n'.join(traceback.format_stack())
+    #pout = p.communicate(input = message+'\n\n'+tr)[0]
+    #print 'Email sent to '+os.path.expandvars(t) # +' '+pout.decode()
+    print message
+    # comment if user does not want email notification directly from python
+    try:
+        target = []
+        target.extend(c.mailfail)
+    except AttributeError:
+        target = []
+        target.extend(os.getenv('USER'))
+    for t in target:
+        p = subprocess.Popen(['mail', '-s ECMWFDATA v7.0 ERROR',
+                              os.path.expandvars(t)],
+                             stdin=subprocess.PIPE,
+                             stdout=subprocess.PIPE,
+                             stderr=subprocess.PIPE,
+                             bufsize=1)
+        tr = '\n'.join(traceback.format_stack())
+        pout = p.communicate(input=message + '\n\n' + tr)[0]
+        print 'Email sent to ' + os.path.expandvars(t) + ' ' + pout.decode()
     exit(1)
 …
 def normalexit(c, message='Done!'):
+def normal_exit(c, message='Done!'):
     '''
     @Description:
 …
     '''
     # Uncomment if user wants notification directly from python
+    #try:
         #target = c.mailops
         #if(type(target) is not list):
             #target = [target]
         #for t in target:
             #p = subprocess.Popen(['mail','-s ECMWFDATA v7.0 normal exit',
             #                      os.path.expandvars(t)],
             #                      stdin = subprocess.PIPE,
             #                      stdout = subprocess.PIPE,
             #                      stderr = subprocess.PIPE, bufsize = 1)
             #pout = p.communicate(input = message+'\n\n')[0]
             #print pout.decode()
     #except:
         #pass
     print(message)
+    print message
+    # comment if user does not want notification directly from python
+    try:
+        target = []
+        target.extend(c.mailops)
+        for t in target:
+            p = subprocess.Popen(['mail', '-s ECMWFDATA v7.0 normal exit',
+                                  os.path.expandvars(t)],
+                                 stdin=subprocess.PIPE,
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.PIPE,
+                                 bufsize=1)
+            pout = p.communicate(input=message+'\n\n')[0]
+            print 'Email sent to ' + os.path.expandvars(t) + ' ' + pout.decode()
+    finally:
+        pass
     return
 …
 def silentremove(filename):
+def silent_remove(filename):
     '''
     @Description:
 …
 def init128(fn):
+def init128(filepath):
     '''
     @Description:
 …
     @Input:
         fn: string
+        filepath: string
             Path to file of ECMWF grib table number 128.
 …
     '''
     table128 = dict()
     with open(fn) as f:
+    with open(filepath) as f:
         fdata = f.read().split('\n')
     for data in fdata:
 …
 def toparamId(pars, table):
+def to_param_id(pars, table):
     '''
     @Description:
 …
     ipar = []
     for par in cpar:
-        found = False
         for k, v in table.iteritems():
             if par == k or par == v:
                 ipar.append(int(k))
-                found = True
                 break
         if found is False:
             print('Warning: par ' + par + ' not found in table 128')
+        else:
+            print 'Warning: par ' + par + ' not found in table 128'
     return ipar
 def getListAsString(listObj):
+def get_list_as_string(list_obj, concatenate_sign=', '):
     '''
     @Description:
 …
     @Input:
         listObj: list
+        list_obj: list
             A list with arbitrary content.
+    @Return:
+        strOfList: string
+        concatenate_sign: string, optional
+            A string which is used to concatenate the single
+            list elements. Default value is ", ".
+    @Return:
+        str_of_list: string
             The content of the list as a single string.
     '''
     strOfList = ", ".join( str(l) for l in listObj)
     return strOfList
+    str_of_list = concatenate_sign.join(str(l) for l in list_obj)
+    return str_of_list

Context Navigation

Changeset ff99eae in flex_extract.git

Legend:

python/ControlFile.py

python/EcFlexpart.py

python/GribTools.py

python/MarsRetrieval.py

python/UioFiles.py

python/disaggregation.py

python/get_mars_data.py

python/install.py

python/plot_retrieved.py

python/prepare_flexpart.py

python/profiling.py

python/submit.py

python/test_suite.py

python/tools.py

Download in other formats: