Changeset 5f67883 in flex_extract.git

Timestamp:

Jun 11, 2020, 12:51:12 PM (4 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

f5e40d8

Parents:

026b359

Message:

changed makefile defaults; changed template filenames

Files:

• Source/Fortran/makefile_fast (modified) (1 diff)
• Source/Python/Classes/ControlFile.py (modified) (3 diffs)
• Source/Python/_config.py (modified) (1 diff)
• Source/Python/install.py (modified) (8 diffs)
• Source/Python/submit.py (modified) (2 diffs)
• Templates/calc_etadot_nml.template (moved) (moved from Templates/convert.nl)
• Templates/installscript.template (moved) (moved from Templates/compilejob.template)
• Templates/jobscript.template (moved) (moved from Templates/job.template)
• Templates/submitscript.template (moved) (moved from Templates/job.temp) (3 diffs)
• setup.sh (modified) (1 diff)

Source/Fortran/makefile_fast

@@ -19 +19 @@
 LIB =  $(ECCODES_LIB) $(EMOSLIB)
 
-ECCODES_INCLUDE_DIR=/usr/lib/x86_64-linux-gnu/fortran/gfortran-mod-15
+ECCODES_INCLUDE_DIR=/usr/local/include/
+#/usr/lib/x86_64-linux-gnu/fortran/gfortran-mod-15
 INC = -I. -I$(ECCODES_INCLUDE_DIR)
 

Source/Python/Classes/ControlFile.py

@@ -19 +19 @@
 #        - divided assignment of attributes and the check of conditions
 #        - outsourced the commandline argument assignments to control attributes
-#   June 202 - Petra Seibert (Univ of Vienna / BOKU)
-#        - update default makefile name
+#   June 2020 - Anne Philipp
+#        - update default makefile to None
 #
 # @License:
@@ -269 +269 @@
     makefile : str
         Name of the makefile to be used for the Fortran program.
-        Default value is 'makefile_local_gfortran'.
+        Default value is None.
 
     destination : str
@@ -404 +404 @@
         self.exedir = _config.PATH_FORTRAN_SRC
         self.installdir = None
-        self.makefile = 'makefile_local_gfortran'
+        self.makefile = None
         self.destination = None
         self.gateway = None

Source/Python/_config.py

@@ -57 +57 @@
 TEMPFILE_USER_ENVVARS = 'ECMWF_ENV.template'
 FILE_USER_ENVVARS = 'ECMWF_ENV'
-TEMPFILE_INSTALL_COMPILEJOB = 'compilejob.template'
+TEMPFILE_INSTALL_COMPILEJOB = 'installscript.template'
 FILE_INSTALL_COMPILEJOB = 'compilejob.ksh'
-TEMPFILE_INSTALL_JOB = 'job.template'
-TEMPFILE_JOB = 'job.temp'
+TEMPFILE_INSTALL_JOB = 'jobscript.template'
+TEMPFILE_JOB = 'submitscript.template'
 FILE_JOB_OD = 'job.ksh'
 FILE_JOB_OP = 'jopoper.ksh'
-TEMPFILE_NAMELIST = 'convert.nl'
+TEMPFILE_NAMELIST = 'calc_etadot_nml.template'
 FILE_NAMELIST = 'fort.4'
 FILE_GRIB_INDEX = 'date_time_stepRange.idx'

Source/Python/install.py

@@ -13 +13 @@
 #        - moved install_args_and_control in here
 #        - splitted code in smaller functions
-#        - delete convert build files in here instead of compile job script
+#        - delete fortran build files in here instead of compile job script
 #        - changed static path names to variables from config file
 #        - splitted install function into several smaller pieces
@@ -39 +39 @@
 #    mk_compilejob
 #    mk_job_template
-#    del_convert_build
-#    mk_convert_build
+#    del_fortran_build
+#    mk_fortran_build
 #
 #*******************************************************************************
@@ -243 +243 @@
                                   _config.PATH_REL_FORTRAN_SRC))
 
-    # Create Fortran executable - CONVERT2
+    # Create Fortran executable
     print('Install ' +  _config.FLEXEXTRACT_DIRNAME + ' software at ' +
           c.install_target + ' in directory ' +
           os.path.abspath(c.installdir) + '\n')
 
-    del_convert_build('.')
-    mk_convert_build('.', c.makefile)
+    del_fortran_build('.')
+    mk_fortran_build('.', c.makefile)
 
     os.chdir(_config.PATH_FLEXEXTRACT_DIR)
@@ -304 +304 @@
             c.installdir = _config.PATH_FLEXEXTRACT_DIR
 
+    if not c.makefile:
+        print('WARNING: no makefile was specified.')
+        if c.install_target == 'local':
+            c.makefile = 'makefile_local_gfortran'
+            print('WARNING: default makefile selected: makefile_local_gfortan')
+        elif c.install_target == 'ecgate':
+            c.makefile = 'makefile_ecgate'
+            print('WARNING: default makefile selected: makefile_ecgate')
+        elif c.install_target == 'cca' or \
+             c.install_target == 'ccb':
+            c.makefile = 'makefile_cray'
+            print('WARNING: default makefile selected: makefile_cray')
+        else:
+            pass
+        
     return
 
@@ -498 +513 @@
     makefile : str
         Name of the makefile which should be used to compile FORTRAN
-        CONVERT2 program.
+        program.
 
     ecuid : str
@@ -633 +648 @@
     return
 
-def del_convert_build(src_path):
+def del_fortran_build(src_path):
     '''Clean up the Fortran source directory and remove all
-    build files (e.g. \*.o, \*.mod and CONVERT2)
+    build files (e.g. \*.o, \*.mod and FORTRAN EXECUTABLE)
 
     Parameters
@@ -657 +672 @@
     return
 
-def mk_convert_build(src_path, makefile):
+def mk_fortran_build(src_path, makefile):
     '''Compiles the Fortran code and generates the executable.
 
@@ -686 +701 @@
             print(perr.decode())
             print('Please edit ' + makefile +
-                  ' or try another Makefile in the src directory.')
-            print('Most likely GRIB_API_INCLUDE_DIR, GRIB_API_LIB '
+                  ' or try another makefile in the src directory.')
+            print('Most likely ECCODES_INCLUDE_DIR, ECCODES_LIB '
                   'and EMOSLIB must be adapted.')
-            print('Available Makefiles:')
-            print(UioFiles(src_path, 'Makefile*'))
+            print('Available makefiles:')
+            print(UioFiles(src_path, 'makefile*'))
             sys.exit('Compilation failed!')
     except ValueError as e:
-        print('ERROR: Makefile call failed:')
+        print('ERROR: makefile call failed:')
         print(e)
     else:

Source/Python/submit.py

@@ -129 +129 @@
         module and variable settings for the ECMWF environment as well as
         the job call and mail report instructions.
-        Default is "job.temp".
+        Default is _config.TEMPFILE_JOB.
 
     c : ControlFile
@@ -218 +218 @@
         module and variable settings for the ECMWF environment as well as
         the job call and mail report instructions.
-        Default is "job.temp".
+        Default is _config.TEMPFILE_JOB.
 
     job_file : str

Templates/submitscript.template

@@ -25 +25 @@
 
 set -x
-export VERSION=7.1
+export VERSION=7.1.1
 case $${HOST} in
   *ecg*)
@@ -35 +35 @@
   module load eccodes/2.13.0
   module load emos/455-r64
-  export PATH=$${PATH}:$${HOME}/flex_extract_v7.1/Source/Python
+  export PATH=$${PATH}:$${HOME}/flex_extract_v7.1.1/Source/Python
   ;;
   *cca*)
@@ -44 +44 @@
   module load emos/455-r64
   export SCRATCH=$${TMPDIR}
-  export PATH=$${PATH}:$${HOME}/flex_extract_v7.1/Source/Python
+  export PATH=$${PATH}:$${HOME}/flex_extract_v7.1.1/Source/Python
   ;;
 esac

setup.sh

@@ -12 +12 @@
 #
 # @Licence:
-#    (C) Copyright 2014-2019.
+#    (C) Copyright 2014-2020.
 #
 #    SPDX-License-Identifier: CC-BY-4.0