Changeset e1228f3 in flex_extract.git


Ignore:
Timestamp:
Jun 2, 2018, 10:37:48 AM (17 months ago)
Author:
Anne Philipp <anne.philipp@…>
Branches:
dev
Children:
54a8a01
Parents:
ff99eae
Message:

resolved loop import between controlfile and tools

Location:
python
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • python/ControlFile.py

    rff99eae re1228f3  
    6868import inspect
    6969
    70 # software specific module from flex_extract
    71 from tools import get_list_as_string, my_error
    72 
    7370# ------------------------------------------------------------------------------
    7471# CLASS
     
    109106            <nothing>
    110107        '''
     108        from tools import my_error
    111109
    112110        # read whole CONTROL file
  • python/EcFlexpart.py

    rff99eae re1228f3  
    112112
    113113# software specific classes and modules from flex_extract
    114 from Gribtools import Gribtools
     114from GribTools import GribTools
    115115from tools import init128, to_param_id, silent_remove, product, my_error
    116116from MarsRetrieval import MarsRetrieval
     
    224224        self.glevelist = '1/to/' + c.level
    225225
    226         if c.gaussian:
     226        if hasattr(c, 'gaussian') and c.gaussian:
    227227            self.gaussian = c.gaussian
    228228        else:
    229229            self.gaussian = ''
    230230
    231         if c.expver:
     231        if hasattr(c, 'expver') and c.expver:
    232232            self.expver = c.expver
    233233        else:
    234234            self.expver = '1'
    235235
    236         if c.number:
     236        if hasattr(c, 'number') and c.number:
    237237            self.number = c.number
    238238        else:
     
    872872        indexfile = c.inputdir + "/date_time_stepRange.idx"
    873873        silent_remove(indexfile)
    874         grib = Gribtools(inputfiles.files)
     874        grib = GribTools(inputfiles.files)
    875875        # creates new index file
    876876        iid = grib.index(index_keys=index_keys, index_file=indexfile)
     
    11141114        indexfile = c.inputdir + "/date_time_stepRange.idx"
    11151115        silent_remove(indexfile)
    1116         grib = Gribtools(inputfiles.files)
     1116        grib = GribTools(inputfiles.files)
    11171117        # creates new index file
    11181118        iid = grib.index(index_keys=index_keys, index_file=indexfile)
  • python/GribTools.py

    rff99eae re1228f3  
    5252# CLASS
    5353# ------------------------------------------------------------------------------
    54 class Gribtools(object):
     54class GribTools(object):
    5555    '''
    5656    Class for GRIB utilities (new methods) based on GRIB API
     
    6262        '''
    6363        @Description:
    64             Initialise an object of Gribtools and assign a list
     64            Initialise an object of GribTools and assign a list
    6565            of filenames.
    6666
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG