Changeset 25b14be in flex_extract.git for source/python/install.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/python/install.py (moved) (moved from python/install.py) (11 diffs)

source/python/install.py

@@ -58 +58 @@
 # software specific classes and modules from flex_extract
 import _config
-from ControlFile import ControlFile
-from UioFiles import UioFiles
-from tools import make_dir, put_file_to_ecserver, submit_job_to_ecserver
+from classes.ControlFile import ControlFile
+from classes.UioFiles import UioFiles
+from mods.tools import make_dir, put_file_to_ecserver, submit_job_to_ecserver
 
 # ------------------------------------------------------------------------------
@@ -189 +189 @@
         mk_env_vars(c.ecuid, c.ecgid, c.gateway, c.destination)
 
-        mk_tarball(tar_file)
+        mk_tarball(tar_file, c.install_target)
 
         put_file_to_ecserver(ecd, tarball_name, c.install_target,
@@ -195 +195 @@
 
         submit_job_to_ecserver(c.install_target,
-                               os.path.join(_config.PATH_RELATIVE_JOBSCRIPTS,
+                               os.path.join(_config.PATH_REL_JOBSCRIPTS,
                                             _config.FILE_INSTALL_COMPILEJOB))
 
@@ -214 +214 @@
                                         c.flexpart_root_scripts))
             if os.path.abspath(ecd) != os.path.abspath(c.flexpart_root_scripts):
-                mk_tarball(tar_file)
+                mk_tarball(tar_file, c.install_target)
                 make_dir(os.path.join(c.flexpart_root_scripts,
                                       target_dirname))
@@ -222 +222 @@
                 os.chdir(os.path.join(c.flexpart_root_scripts,
                                       target_dirname,
-                                      _config.PATH_RELATIVE_FORTRAN_SRC))
+                                      _config.PATH_REL_FORTRAN_SRC))
 
         # Create Fortran executable - CONVERT2
@@ -238 +238 @@
     return
 
-def mk_tarball(tarball_path):
+def mk_tarball(tarball_path, target):
     '''
     @Description:
@@ -253 +253 @@
             relevant data for flex_extract.
 
+        target: string
+            The queue where the job is submitted to.
+
     @Return:
         <nothing>
@@ -267 +270 @@
 
     # get lists of the files to be added to the tar file
-    ECMWF_ENV_FILE = [_config.PATH_RELATIVE_ECMWF_ENV]
+    if target == 'local':
+        ECMWF_ENV_FILE = []
+    else:
+        ECMWF_ENV_FILE = [_config.PATH_REL_ECMWF_ENV]
+
     pyfiles = [os.path.relpath(x, ecd)
-               for x in glob(_config.PATH_LOCAL_PYTHON +
-                             os.path.sep + '*py')]
+               for x in UioFiles(_config.PATH_LOCAL_PYTHON, '*py').files]
     controlfiles = [os.path.relpath(x, ecd)
-                    for x in glob(_config.PATH_CONTROLFILES +
-                                  os.path.sep + 'CONTROL*')]
+                    for x in UioFiles(_config.PATH_CONTROLFILES,
+                                      'CONTROL*').files]
     tempfiles = [os.path.relpath(x, ecd)
-                 for x in glob(_config.PATH_TEMPLATES +
-                               os.path.sep + '*')]
+                 for x in UioFiles(_config.PATH_TEMPLATES , '*').files]
     ffiles = [os.path.relpath(x, ecd)
-              for x in glob(_config.PATH_FORTRAN_SRC +
-                            os.path.sep + '*.f*')]
+              for x in UioFiles(_config.PATH_FORTRAN_SRC, '*.f*').files]
     hfiles = [os.path.relpath(x, ecd)
-              for x in glob(_config.PATH_FORTRAN_SRC +
-                            os.path.sep + '*.h')]
+              for x in UioFiles(_config.PATH_FORTRAN_SRC, '*.h').files]
     makefiles = [os.path.relpath(x, ecd)
-                 for x in glob(_config.PATH_FORTRAN_SRC +
-                               os.path.sep + 'Makefile*')]
+                 for x in UioFiles(_config.PATH_FORTRAN_SRC, 'Makefile*').files]
 
     # concatenate single lists to one for a better looping
@@ -352 +354 @@
     '''
 
-    with open(_config.PATH_RELATIVE_ECMWF_ENV, 'w') as fo:
+    with open(_config.PATH_REL_ECMWF_ENV, 'w') as fo:
         fo.write('ECUID ' + ecuid + '\n')
         fo.write('ECGID ' + ecgid + '\n')
@@ -389 +391 @@
     '''
 
-    template = os.path.join(_config.PATH_RELATIVE_TEMPLATES,
+    template = os.path.join(_config.PATH_REL_TEMPLATES,
                             _config.TEMPFILE_INSTALL_COMPILEJOB)
     with open(template) as f:
         fdata = f.read().split('\n')
 
-    compilejob = os.path.join(_config.PATH_RELATIVE_JOBSCRIPTS,
+    compilejob = os.path.join(_config.PATH_REL_JOBSCRIPTS,
                               _config.FILE_INSTALL_COMPILEJOB)
     with open(compilejob, 'w') as fo:
@@ -450 +452 @@
     '''
     fp_root_path_to_python = os.path.join(fp_root, _config.FLEXEXTRACT_DIRNAME,
-                         _config.PATH_RELATIVE_PYTHON)
-
-    template = os.path.join(_config.PATH_RELATIVE_TEMPLATES,
+                         _config.PATH_REL_PYTHON)
+
+    template = os.path.join(_config.PATH_REL_TEMPLATES,
                             _config.TEMPFILE_INSTALL_JOB)
     with open(template) as f:
         fdata = f.read().split('\n')
 
-    jobfile_temp = os.path.join(_config.PATH_RELATIVE_TEMPLATES,
+    jobfile_temp = os.path.join(_config.PATH_REL_TEMPLATES,
                                 _config.TEMPFILE_JOB)
     with open(jobfile_temp, 'w') as fo: