Changeset 25b14be in flex_extract.git for source/pythontest/TestInstallTar/flex_extract_v7.1_ecgate/source/python/_config.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/_config.py (moved) (moved from python/_config.py) (4 diffs)

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

@@ -32 +32 @@
 # ------------------------------------------------------------------------------
 
-FLEXEXTRACT_DIRNAME = 'flex_extract_v' + _VERSION_STR
 FILE_MARS_REQUESTS = 'mars_requests.dat'
 FORTRAN_EXECUTABLE = 'CONVERT2'
@@ -44 +43 @@
 FILE_NAMELIST = 'fort.4'
 FILE_GRIB_INDEX = 'date_time_stepRange.idx'
+FILE_GRIBTABLE = 'ecmwf_grib1_table_128'
+
+# ------------------------------------------------------------------------------
+# DIRECTORY NAMES
+# ------------------------------------------------------------------------------
+
+FLEXEXTRACT_DIRNAME = 'flex_extract_v' + _VERSION_STR
+INPUT_DIRNAME_DEFAULT = 'workspace'
 
 # ------------------------------------------------------------------------------
@@ -49 +56 @@
 # ------------------------------------------------------------------------------
 
-# path to the flex_extract directory
-PATH_FLEXEXTRACT_DIR = os.path.normpath(os.path.dirname(os.path.abspath(
-    inspect.getfile(inspect.currentframe()))) + '/../')
-
 # path to the local python source files
+# first thing to get because the submitted python script starts in here
 PATH_LOCAL_PYTHON = os.path.dirname(os.path.abspath(
     inspect.getfile(inspect.currentframe())))
-PATH_RELATIVE_PYTHON = os.path.relpath(PATH_LOCAL_PYTHON, PATH_FLEXEXTRACT_DIR)
 # add path to pythonpath
 if PATH_LOCAL_PYTHON not in sys.path:
     sys.path.append(PATH_LOCAL_PYTHON)
-
-# path to the templates
-PATH_TEMPLATES = os.path.join(PATH_FLEXEXTRACT_DIR, '_templates')
-PATH_RELATIVE_TEMPLATES = os.path.relpath(PATH_TEMPLATES, PATH_FLEXEXTRACT_DIR)
-
-# path to the environment parameter file
-PATH_ECMWF_ENV = os.path.join(PATH_LOCAL_PYTHON, FILE_USER_ENVVARS)
-PATH_RELATIVE_ECMWF_ENV = os.path.relpath(PATH_ECMWF_ENV, PATH_FLEXEXTRACT_DIR)
-
-# path to gribtable
-PATH_GRIBTABLE = os.path.join(PATH_TEMPLATES, 'ecmwf_grib1_table_128')
-
-# path to run directory
+PATH_FLEXEXTRACT_DIR = os.path.normpath(os.path.dirname(os.path.abspath(
+    inspect.getfile(inspect.currentframe()))) + '/../../')
 PATH_RUN_DIR = os.path.join(PATH_FLEXEXTRACT_DIR, 'run')
-PATH_RELATIVE_RUN_DIR = os.path.relpath(PATH_RUN_DIR, PATH_FLEXEXTRACT_DIR)
-
-# path to directory where all control files are stored
+PATH_SOURCES = os.path.join(PATH_FLEXEXTRACT_DIR, 'source')
+PATH_TEMPLATES = os.path.join(PATH_FLEXEXTRACT_DIR, 'templates')
+PATH_ECMWF_ENV = os.path.join(PATH_RUN_DIR, FILE_USER_ENVVARS)
+PATH_GRIBTABLE = os.path.join(PATH_TEMPLATES, FILE_GRIBTABLE)
+PATH_JOBSCRIPTS = os.path.join(PATH_RUN_DIR, 'jobscripts')
+PATH_FORTRAN_SRC = os.path.join(PATH_SOURCES, 'fortran')
+PATH_TEST_DIR = os.path.join(PATH_SOURCES, 'pythontest')
+PATH_INPUT_DIR = os.path.join(PATH_RUN_DIR, INPUT_DIRNAME_DEFAULT)
 if os.getenv('CONTROL') and '/' in os.getenv('CONTROL'):
     # this is only needed if remote version with job script is used!
@@ -84 +81 @@
 else:
     PATH_CONTROLFILES = os.path.join(PATH_RUN_DIR, 'control')
-    PATH_RELATIVE_CONTROLFILES = os.path.relpath(PATH_CONTROLFILES, PATH_FLEXEXTRACT_DIR)
-
-# path to directory where all job scripts are stored
-PATH_JOBSCRIPTS = os.path.join(PATH_RUN_DIR, 'jobscripts')
-PATH_RELATIVE_JOBSCRIPTS = os.path.relpath(PATH_JOBSCRIPTS, PATH_FLEXEXTRACT_DIR)
-
-# path to the fortran executable and the source code
-PATH_FORTRAN_SRC = os.path.join(PATH_FLEXEXTRACT_DIR, 'src')
-PATH_RELATIVE_FORTRAN_SRC = os.path.relpath(PATH_FORTRAN_SRC, PATH_FLEXEXTRACT_DIR)
-
-# path to the python testing directory
-PATH_TEST_DIR = os.path.join(PATH_LOCAL_PYTHON, 'pythontest')
-
+#
+# ------------------------------------------------------------------------------
+#
+# for making the installation tar ball the relative pathes to the
+# flex_extract root directory are needed
+PATH_REL_PYTHON = os.path.relpath(PATH_LOCAL_PYTHON, PATH_FLEXEXTRACT_DIR)
+PATH_REL_CONTROLFILES = os.path.relpath(PATH_CONTROLFILES, PATH_FLEXEXTRACT_DIR)
+PATH_REL_TEMPLATES = os.path.relpath(PATH_TEMPLATES, PATH_FLEXEXTRACT_DIR)
+PATH_REL_ECMWF_ENV = os.path.relpath(PATH_ECMWF_ENV, PATH_FLEXEXTRACT_DIR)
+PATH_REL_RUN_DIR = os.path.relpath(PATH_RUN_DIR, PATH_FLEXEXTRACT_DIR)
+PATH_REL_JOBSCRIPTS = os.path.relpath(PATH_JOBSCRIPTS, PATH_FLEXEXTRACT_DIR)
+PATH_REL_FORTRAN_SRC = os.path.relpath(PATH_FORTRAN_SRC, PATH_FLEXEXTRACT_DIR)