Changes in Source/Python/_config.py [75db9b0:0a75335] in flex_extract.git

File:

• Source/Python/_config.py (modified) (6 diffs)

Source/Python/_config.py

@@ -9 +9 @@
 #      June 2020 - Anne Philipp
 #         - changed template filenames to .template
-#      August 2020 - Leopold Haimberger
-#         - added another target for installation
-#         - added filename which will contain paths for system version     
-#         - checks if software runs in normal local mode or system local mode
-#           and defines paths to user directory and executable paths    
 #
 # @License:
@@ -43 +38 @@
 # ------------------------------------------------------------------------------
 
-_VERSION_STR = '7.1.2_ctbto'
+_VERSION_STR = '7.1.2'
 
 FLAG_ON_ECMWFSERVER = 'ecgb' in platform.node()
@@ -49 +44 @@
 QUEUES_LIST = ['ecgate', 'cca', 'ccb']
 
-INSTALL_TARGETS = ['local', 'syslocal', 'ecgate', 'cca', 'ccb']
+INSTALL_TARGETS = ['local', 'ecgate', 'cca', 'ccb']
 
 CDS_DATASET_ML = 'reanalysis-era5-complete'
@@ -75 +70 @@
 FILE_GRIB_INDEX = 'date_time_stepRange.idx'
 FILE_GRIBTABLE = 'ecmwf_grib1_table_128'
-FILE_SYS_CONFIG = '.setup.rc'
 
 # ------------------------------------------------------------------------------
@@ -85 +79 @@
 
 # ------------------------------------------------------------------------------
-#  LOAD ENVIRONMENT VARIABLES FOR SYS VERSION; IF NECESSARRY
+#  PATHES
 # ------------------------------------------------------------------------------
 
@@ -95 +89 @@
 if PATH_LOCAL_PYTHON not in sys.path:
     sys.path.append(PATH_LOCAL_PYTHON)
-
-# ------------------------------------------------------------------------------
-#  PATHES
-# ------------------------------------------------------------------------------
-
 PATH_FLEXEXTRACT_DIR = os.path.normpath(os.path.dirname(os.path.abspath(
     inspect.getfile(inspect.currentframe()))) + '/../../')
-if not os.path.isdir(os.path.join(PATH_FLEXEXTRACT_DIR,'Run')):
-    # if it does not exist, we have a system installation in place
-    # we need to have a sys and user path
-    # configure correct system path
-    PATH_SYSTEM_DIR = os.path.join(PATH_FLEXEXTRACT_DIR, FLEXEXTRACT_DIRNAME)
-    # configure correct user path
-    PATH_FLEXEXTRACT_DIR = os.environ.get('FLEXEXTRACT_USER_DIR')
-else:
-    PATH_SYSTEM_DIR = PATH_FLEXEXTRACT_DIR
-
 PATH_RUN_DIR = os.path.join(PATH_FLEXEXTRACT_DIR, 'Run')
-PATH_SOURCES = os.path.join(PATH_SYSTEM_DIR, 'Source')
+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')
-if os.path.isdir(os.path.join(PATH_SYSTEM_DIR,'Fortran')):
-    PATH_FORTRAN_SRC = PATH_SYSTEM_DIR
-else:
-    PATH_FORTRAN_SRC = os.path.join(PATH_SOURCES, 'Fortran')
+PATH_FORTRAN_SRC = os.path.join(PATH_SOURCES, 'Fortran')
 PATH_PYTHONTEST_SRC = os.path.join(PATH_SOURCES, 'Pythontest')
 PATH_INPUT_DIR = os.path.join(PATH_RUN_DIR, INPUT_DIRNAME_DEFAULT)