still more on fluxus

jalessandri · Apr 27, 2020 · 61a77b7 · 61a77b7
1 parent 532e677
commit 61a77b7
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 12 deletions.
diff --git a/COMMIT b/COMMIT
@@ -1,5 +1,19 @@
 ============================================================
 
+Tue Apr 28 00:40:02 CEST 2020
+
+still more on fluxus
+
+ Rules.make                       |  5 +++++
+ fem3d/flxelab1.f                 |  1 +
+ femcheck/rules/Rules.dist        |  5 +++++
+ femcheck/servers/check_server.sh |  2 ++
+ femcheck/servers/fluxus.sh       |  2 ++
+ femcheck/test_compile.sh         | 26 ++++++++++++++++----------
+ 6 files changed, 31 insertions(+), 10 deletions(-)
+
+============================================================
+
 Mon Apr 27 18:35:21 CEST 2020
 
 more on servers (fluxus)

diff --git a/Rules.make b/Rules.make
@@ -720,6 +720,11 @@ FINTEL_OMP   =
 ifeq ($(PARALLEL_OMP),true)
   FINTEL_OMP   = -threads -qopenmp
   FINTEL_OMP   = -qopenmp
+  #$(info INTEL_SHYFEM_OMPFLAG = $(INTEL_SHYFEM_OMPFLAG) )
+  ifneq ($(INTEL_SHYFEM_OMPFLAG),)
+    FINTEL_OMP   = $(INTEL_SHYFEM_OMPFLAG)
+  endif
+  #$(info FINTEL_OMP = $(FINTEL_OMP) )
 endif
 
 ifeq ($(FORTRAN_COMPILER),INTEL)

diff --git a/VERSION b/VERSION
@@ -1,3 +1,5 @@
+version  7_5_69    06-03-2020    VERS_7_5_69   commit_2020-04-28
+
 version  7_5_69    06-03-2020    VERS_7_5_69   commit_2020-04-27
 
 version  7_5_69    06-03-2020    VERS_7_5_69   commit_2020-04-27

diff --git a/fem3d/flxelab1.f b/fem3d/flxelab1.f
@@ -48,6 +48,7 @@
 c 03.04.2018	ggu	changed VERS_7_5_43
 c 16.02.2019	ggu	changed VERS_7_5_60
 c 06.03.2020	ggu	check for time step
+c 27.04.2020	ggu&ccf	bug fix for handling time step
 c
 c**************************************************************
 

diff --git a/fem3d/subver.f b/fem3d/subver.f
@@ -380,14 +380,14 @@ module shyfem_version
 c
 c \newcommand{\VERSION}{7.5.69}
 c \newcommand{\version}{7\_5\_69}
-c \newcommand{\COMMIT}{2020-04-27}
+c \newcommand{\COMMIT}{2020-04-28}
 c
 c DOCS	END
 
         implicit none
 
         character*10, parameter :: version = '7.5.69'
-        character*10, parameter :: commit  = '2020-04-27'
+        character*10, parameter :: commit  = '2020-04-28'
         character*17, parameter :: text    = 'SHYFEM VERSION = '
 
         character*40, parameter :: string = text//version//'  '//commit

diff --git a/femcheck/rules/Rules.dist b/femcheck/rules/Rules.dist
@@ -720,6 +720,11 @@ FINTEL_OMP   =
 ifeq ($(PARALLEL_OMP),true)
   FINTEL_OMP   = -threads -qopenmp
   FINTEL_OMP   = -qopenmp
+  #$(info INTEL_SHYFEM_OMPFLAG = $(INTEL_SHYFEM_OMPFLAG) )
+  ifneq ($(INTEL_SHYFEM_OMPFLAG),)
+    FINTEL_OMP   = $(INTEL_SHYFEM_OMPFLAG)
+  endif
+  #$(info FINTEL_OMP = $(FINTEL_OMP) )
 endif
 
 ifeq ($(FORTRAN_COMPILER),INTEL)

diff --git a/femcheck/servers/check_server.sh b/femcheck/servers/check_server.sh
@@ -115,6 +115,7 @@ ShowDirs()
   echo "NETCDF_SHYFEM_LIBFDIR = $NETCDF_SHYFEM_LIBFDIR"
   echo "NETCDF_SHYFEM_INCDIR = $NETCDF_SHYFEM_INCDIR"
   echo "NETCDF_SHYFEM_MODDIR = $NETCDF_SHYFEM_MODDIR"
+  echo "INTEL_SHYFEM_OMPFLAG = $INTEL_SHYFEM_OMPFLAG"
   echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH"
 }
 
@@ -127,6 +128,7 @@ ResetDirsGeneric()
   export NETCDF_SHYFEM_LIBFDIR=
   export NETCDF_SHYFEM_INCDIR=
   export NETCDF_SHYFEM_MODDIR=
+  export INTEL_SHYFEM_OMPFLAG=
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH_ORIG
 }
 

diff --git a/femcheck/servers/fluxus.sh b/femcheck/servers/fluxus.sh
@@ -37,6 +37,8 @@ SetDirs_intel()
   export NETCDF_SHYFEM_INCDIR=$basedir
   export NETCDF_SHYFEM_MODDIR=$basedir
 
+  export INTEL_SHYFEM_OMPFLAG=-openmp
+
   AddLibrary $NETCDF_SHYFEM_LIBCDIR lib
   AddLibrary $NETCDF_SHYFEM_LIBFDIR lib
 

diff --git a/femcheck/test_compile.sh b/femcheck/test_compile.sh
@@ -14,6 +14,7 @@
 
 compilers="GNU_GFORTRAN INTEL"
 #compilers="GNU_GFORTRAN"
+#compilers="INTEL"
 
 rules_arc_dir=./arc/rules
 rules_dist_dir=./femcheck/rules
@@ -92,6 +93,13 @@ WrapUp()
 
 #--------------------------------------------------------
 
+CompTest()
+{
+  echo "running CompTest"
+  $femdir/femcheck/servers/check_server.sh -show
+  Comp "NETCDF=false PARALLEL_OMP=true"
+}
+
 CompAll()
 {
   Comp "ECOLOGICAL=NONE GOTM=true NETCDF=false SOLVER=SPARSKIT \
@@ -177,7 +185,8 @@ SetCompiler()
   local comp=$1
 
   local basedir=$femdir/femcheck/servers
-  local hostname=$( $femdir/femcheck/servers/check_server.sh -print )
+  local script=check_server.sh
+  local server=$( $basedir/$script -server )
   local compiler
 
   [ "$debug" = "YES" ] && echo "SetCompiler: $comp $hostname"
@@ -193,15 +202,9 @@ SetCompiler()
 
   [ "$debug" = "YES" ] && echo "SetCompiler: $compiler"
 
-  local prog="$basedir/${hostname}.sh"
-
-  [ "$debug" = "YES" ] && echo "SetCompiler: $prog"
-
-  if [ -x "$prog" ]; then
-    echo "executing script $prog"
-    . $prog -$compiler
-    #. $prog -show
-    #module list
+  if [ -n "$server" ]; then
+    echo "executing script $script to load settings"
+    source $basedir/$script -load $compiler
   fi
 }
 
@@ -236,6 +239,9 @@ do
     echo "compiler $comp is available..."
   fi
 
+  #CompTest
+  #continue
+
   CompAll
 done