Changeset 2fb99de in flex_extract.git for python/prepare_flexpart.py

Timestamp:

Sep 20, 2018, 11:56:37 AM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

5d42acd

Parents:

3232589

Message:

introduced config with path definitions and changed py files accordingly; Installation works; some tests were added for tarball making; Problems in submission to ecgate

File:

• python/prepare_flexpart.py (modified) (6 diffs)

python/prepare_flexpart.py

@@ -57 +57 @@
 import sys
 import socket
-import _config
 
 # software specific classes and modules from flex_extract
+import _config
 from UioFiles import UioFiles
 from tools import clean_up, get_cmdline_arguments, read_ecenv
@@ -70 +70 @@
 except ImportError:
     ecapi = False
-
-# add path to pythonpath so that python finds its buddies
-LOCAL_PYTHON_PATH = os.path.dirname(os.path.abspath(
-    inspect.getfile(inspect.currentframe())))
-if LOCAL_PYTHON_PATH not in sys.path:
-    sys.path.append(LOCAL_PYTHON_PATH)
-
 
 # ------------------------------------------------------------------------------
@@ -100 +93 @@
         c = ControlFile(args.controlfile)
     except IOError:
-        try:
-            c = ControlFile(LOCAL_PYTHON_PATH + 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)
+        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')
+    env_parameter = read_ecenv(_config.PATH_ECMWF_ENV)
     c.assign_args_to_control(args, env_parameter)
     c.assign_envs_to_control(env_parameter)
-    c.check_conditions()
+    c.check_conditions(args.queue)
     prepare_flexpart(args.ppid, c)
 
@@ -170 +160 @@
         start = start - datetime.timedelta(days=1)
 
-    print 'Prepare ' + start.strftime("%Y%m%d") + \
-           "/to/" + end.strftime("%Y%m%d")
+    print('Prepare ' + start.strftime("%Y%m%d") +
+           "/to/" + end.strftime("%Y%m%d"))
 
     # create output dir if necessary
@@ -182 +172 @@
     # deaccumulate the flux data
     flexpart = EcFlexpart(c, fluxes=True)
-    flexpart.write_namelist(c, 'fort.4')
+    flexpart.write_namelist(c, _config.FILE_NAMELIST)
     flexpart.deacc_fluxes(inputfiles, c)
 
@@ -197 +187 @@
     # otherwise delete temporary files
     if int(c.debug) != 0:
-        print '\nTemporary files left intact'
+        print('\nTemporary files left intact')
     else:
         clean_up(c)