Changeset 25b14be in flex_extract.git for source/pythontest/TestInstallTar/flex_extract_v7.1_ecgate/source/python/submit.py

Timestamp:

Sep 23, 2018, 11:40:28 AM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

4971f63

Parents:

5d42acd

Message:

changed whole tree structure of flex_extract to have better overview

File:

• source/pythontest/TestInstallTar/flex_extract_v7.1_ecgate/source/python/submit.py (moved) (moved from python/pythontest/TestInstallTar/test_untar/python/submit.py) (10 diffs)

source/pythontest/TestInstallTar/flex_extract_v7.1_ecgate/source/python/submit.py

@@ -16 +16 @@
 #        - added documentation
 #        - minor changes in programming style (for consistence)
+#        - changed path names to variables from config file
+#        - added option for writing mars requests to extra file
+#          additionally,as option without submitting the mars jobs
 #
 # @License:
@@ -48 +51 @@
 # software specific classes and modules from flex_extract
 import _config
-from tools import normal_exit, get_cmdline_arguments, submit_job_to_ecserver, \
-                  read_ecenv
-from get_mars_data import get_mars_data
-from prepare_flexpart import prepare_flexpart
-from ControlFile import ControlFile
+from mods.tools import (normal_exit, get_cmdline_arguments,
+                        submit_job_to_ecserver, read_ecenv)
+from mods.get_mars_data import get_mars_data
+from mods.prepare_flexpart import prepare_flexpart
+from classes.ControlFile import ControlFile
 
 # ------------------------------------------------------------------------------
@@ -73 +76 @@
     '''
 
-    called_from_dir = os.getcwd()
-
     args = get_cmdline_arguments()
 
@@ -80 +81 @@
         c = ControlFile(args.controlfile)
     except IOError:
-        try:
-            c = ControlFile(_config.PATH_LOCAL_PYTHON + 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'
-            sys.exit(1)
-
-    env_parameter = read_ecenv(c.ecmwfdatadir + 'python/ECMWF_ENV')
+        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')
+        sys.exit(1)
+
+    env_parameter = read_ecenv(_config.PATH_ECMWF_ENV)
     c.assign_args_to_control(args)
     c.assign_envs_to_control(env_parameter)
-    c.check_conditions()
+    c.check_conditions(args.queue)
 
     # on local side
     # on ECMWF server this would also be the local side
+    called_from_dir = os.getcwd()
     if args.queue is None:
         if c.inputdir[0] != '/':
@@ -107 +106 @@
         else:
             normal_exit(c.mailfail, 'PRINTING MARS_REQUESTS DONE!')
-    # on ECMWF server
+    # send files to ECMWF server and install there
     else:
         submit(args.job_template, c, args.queue)
@@ -120 +119 @@
     @Input:
         jtemplate: string
-            Job template file for submission to ECMWF. It contains all necessary
+            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
             the job call and mail report instructions.
@@ -146 +146 @@
 
     # read template file and get index for CONTROL input
-    with open(jtemplate) as f:
+    with open(os.path.join(_config.PATH_TEMPLATES, jtemplate)) as f:
         lftext = f.read().split('\n')
     insert_point = lftext.index('EOF')
@@ -153 +153 @@
     # --------- create on demand job script ------------------------------------
         if c.maxstep > 24:
-            print '---- Pure forecast mode! ----'
+            print('---- Pure forecast mode! ----')
         else:
-            print '---- On-demand mode! ----'
-        job_file = jtemplate[:-4] + 'ksh'
+            print('---- On-demand mode! ----')
+        job_file = os.path.join(_config.PATH_JOBSCRIPTS,
+                                jtemplate[:-4] + 'ksh')
         clist = c.to_list()
 
@@ -164 +165 @@
             f.write('\n'.join(lftextondemand))
 
-        result_code = submit_job_to_ecserver(queue, job_file)
+        submit_job_to_ecserver(queue, job_file)
 
     else:
     # --------- create operational job script ----------------------------------
-        print '---- Operational mode! ----'
-        job_file = jtemplate[:-5] + 'oper.ksh'
-        #colist = []
+        print('---- Operational mode! ----')
+        job_file = os.path.join(_config.PATH_JOBSCRIPTS,
+                                jtemplate[:-5] + 'oper.ksh')
 
         if c.maxstep:
@@ -190 +191 @@
             f.write('\n'.join(lftextoper))
 
-        result_code = submit_job_to_ecserver(queue, job_file)
+        submit_job_to_ecserver(queue, job_file)
 
     # --------------------------------------------------------------------------
-    print 'You should get an email with subject flex.hostname.pid'
+    print('You should get an email with subject flex.hostname.pid')
 
     return