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

Timestamp:

Jan 18, 2019, 10:50:19 PM (5 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

4c1d7de

Parents:

6f951ca

Message:

bugfix retrievement with basetime parameter

File:

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

source/python/classes/ControlFile.py

@@ -93 +93 @@
         The time step in hours. Default value is None.
 
-    basetime : str
+    basetime : int
         The time for a half day retrieval. The 12 hours upfront are to be
         retrieved. Default value is None.
@@ -301 +301 @@
         Switch to keep temporary files at the end of postprocessing (1) or
         to delete all temporary files except the final output files (0).
+        Default value is 0.
+
+    oper : int
+        Switch to prepare the operational job script. Start date, end date and
+        basetime will be prepared with environment variables.
         Default value is 0.
 
@@ -409 +414 @@
         self.install_target = None
         self.debug = 0
+        self.oper = 0
         self.request = 0
         self.public = 0
@@ -417 +423 @@
         self.logicals = ['gauss', 'omega', 'omegadiff', 'eta', 'etadiff',
                          'dpdeta', 'cwc', 'wrf', 'grib2flexpart', 'ecstorage',
-                         'ectrans', 'debug', 'request', 'public', 'purefc',
-                         'rrint']
+                         'ectrans', 'debug', 'oper', 'request', 'public',
+                         'purefc', 'rrint']
 
         self._read_controlfile()
@@ -599 +605 @@
                                                      self.end_date)
 
-        check_basetime(self.basetime)
+        self.basetime = check_basetime(self.basetime)
 
         self.levelist, self.level = check_levels(self.levelist, self.level)
@@ -624 +630 @@
         self.acctype = check_acctype(self.acctype, self.type)
 
-        self.acctime = check_acctime(self.acctime, self.acctype, self.purefc)
-
-        self.accmaxstep = check_accmaxstep(self.accmaxstep, self.acctype,
+        self.acctime = check_acctime(self.acctime, self.marsclass, self.purefc)
+
+        self.accmaxstep = check_accmaxstep(self.accmaxstep, self.marsclass,
                                            self.purefc, self.maxstep)