Changeset ca867de in flex_extract.git for source/python/classes/ControlFile.py

Timestamp:

Oct 5, 2018, 3:35:18 PM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

5bad6ec

Parents:

27fe969

Message:

refactored functions in EcFlexpart? and did some minor changes

File:

• source/python/classes/ControlFile.py (modified) (5 diffs)

source/python/classes/ControlFile.py

@@ -57 +57 @@
 import inspect
 
+# software specific classes and modules from flex_extract
+sys.path.append('../')
 import _config
+from mods.tools import my_error
 
 # ------------------------------------------------------------------------------
@@ -144 +147 @@
         self.ectrans = 0
         self.inputdir = _config.PATH_INPUT_DIR
-        self.outputdir = self.inputdir
+        self.outputdir = None
         self.ecmwfdatadir = _config.PATH_FLEXEXTRACT_DIR
         self.exedir = _config.PATH_FORTRAN_SRC
@@ -177 +180 @@
             <nothing>
         '''
-        from mods.tools import my_error
-
-        # read whole CONTROL file
 
         try:
@@ -355 +355 @@
             self.end_date = self.start_date
 
+        # basetime has only two possible values
+        if self.basetime:
+            if int(self.basetime) != 0 and int(self.basetime) != 12:
+                print('Basetime has an invalid value!')
+                print('Basetime = ' + str(self.basetime))
+                sys.exit(1)
+
         # assure consistency of levelist and level
         if self.levelist is None and self.level is None:
@@ -407 +414 @@
             self.flexpart_root_scripts = self.ecmwfdatadir
 
+        if not self.outputdir:
+            self.outputdir = self.inputdir
+
         if not isinstance(self.mailfail, list):
             if ',' in self.mailfail: