Changeset a916e8f in flex_extract.git for Source/Python/submit.py

Timestamp:

Jun 11, 2020, 11:14:56 PM (4 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

3a54479

Parents:

0c8c068

Message:

ECMWF server output directory renamed; reformulate dapoly formula; changed template filenames; make use of config jobscript names

File:

• Source/Python/submit.py (modified) (5 diffs)

Source/Python/submit.py

@@ -21 +21 @@
 #        - splitted submit function to use genshi templates for the
 #          job script and avoid code duplication
+#    June 2020 - Anne Philipp
+#        - changed finale job_file to filename from config file
+#          instead of generating from the template filename
 #
 # @License:
@@ -72 +75 @@
 from Mods.get_mars_data import get_mars_data
 from Mods.prepare_flexpart import prepare_flexpart
-#from Classes.ControlFile import ControlFile
-
 
 # ------------------------------------------------------------------------------
@@ -151 +152 @@
 
         job_file = os.path.join(_config.PATH_JOBSCRIPTS,
-                                jtemplate[:-5] + '.ksh')
+                                _config.FILE_JOB_OD)
 
         # divide time periode into specified number of job chunks
@@ -189 +190 @@
 
         job_file = os.path.join(_config.PATH_JOBSCRIPTS,
-                                jtemplate[:-5] + 'oper.ksh')
+                                _config.FILE_JOB_OP)
 
         c.start_date = '${MSJ_YEAR}${MSJ_MONTH}${MSJ_DAY}'
@@ -214 +215 @@
     ----------
     jtemplate : str
-        Job template file from sub-directory "_templates" for
+        Job template file from sub-directory "Templates" for
         submission to ECMWF. It contains all necessary
         module and variable settings for the ECMWF environment as well as