Changes in / [652286a:14d9618] in flex_extract.git

Files:

• .gitignore (modified) (2 diffs)
• Run/run.sh (modified) (1 diff)
• Run/run_local.sh (deleted)
• Source/Python/_config.py (modified) (1 diff)
• Templates/installscript.template (modified) (2 diffs)
• Templates/jobscript.template (modified) (1 diff)
• setup_local.sh (deleted)

.gitignore

@@ -10 +10 @@
 #
 # @Licence:
-#    (C) Copyright 2014-2020.
+#    (C) Copyright 2014-2019.
 #
 #    SPDX-License-Identifier: CC-BY-4.0
@@ -30 +30 @@
 Run/Workspace/*
 Run/Jobscripts/*sh
-Testing/Installation/Calc_etadot/VERTICAL.EC
-Testing/Installation/Calc_etadot/fort.15
+Test/Installation/Convert/VERTICAL.EC
+Test/Installation/Convert/fort.15
 For_developers/Sphinx/build_temp
 
 # Temporary ignorance of files!!!!
-*anne.sh
-Run/*anne.sh
+Source/Fortran/Makefile.ecgate
+Source/Fortran/Makefile.local.gfortran.gw74
+Run/Control/Testgrid/
+Run/Control/notPublic/
+setup_local.sh
+Run/run.sh
+Run/run_local.sh
+setup.sh
 Source/Fortran/pycallgraph.png
 Source/Python/pylint_report_7.1.txt
 Source/.metrics
+For_developers/sphinx-fortran/
+
+
+For_developers/GUIDE.odt
+For_developers/COMMANDS
+For_developers/class_diagram
+For_developers/classes.dot
+For_developers/classes.png
+For_developers/gen_docu.sh
+For_developers/mk_pdf2png.sh
+For_developers/packages.dot
+For_developers/packages.png
+For_developers/Testcases.txt
+For_developers/Metriken.txt
+For_developers/FE_testing.txt
+For_developers/Liste_FE_Functions_Testcoverage.xlsx
+
+
+
+
 
 Emoslib

Run/run.sh

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

Source/Python/_config.py

@@ -38 +38 @@
 # ------------------------------------------------------------------------------
 
-_VERSION_STR = '7.1.2'
+_VERSION_STR = '7.1.1'
 
 FLAG_ON_ECMWFSERVER = 'ecgb' in platform.node()

Templates/installscript.template

@@ -29 +29 @@
   *ecg*)
   module unload grib_api
+  module unload eccodes
+  module unload python
   module unload emos
-  module load python3
-  module load eccodes
+  module load python3/3.6.8-01
+  module load eccodes/2.13.0
   module load emos/455-r64
   export FLEXPART_ROOT_SCRIPTS=$fp_root_scripts
@@ -37 +39 @@
   ;;
   *cca*)
+  module unload python
   module switch PrgEnv-cray PrgEnv-intel
   module load python3
-  module load eccodes
+  module load eccodes/2.13.0
   module load emos/455-r64
   echo $${GROUP}

Templates/jobscript.template

@@ -29 +29 @@
   *ecg*)
   module unload grib_api
+  module unload eccodes
+  module unload python
   module unload emos
-  module load python3
-  module load eccodes
+  module load python3/3.6.8-01
+  module load eccodes/2.13.0
   module load emos/455-r64
   export PATH=$$$${PATH}:$fp_root_path
   ;;
   *cca*)
+  module unload python
   module switch PrgEnv-cray PrgEnv-intel
   module load python3
-  module load eccodes
+  module load eccodes/2.13.0
   module load emos/455-r64
   export SCRATCH=$$$${TMPDIR}