first changes for O2

MUMPS/machines/occigen-bdw/batch_charge.slurm

@@ -9,16 +9,17 @@
 #SBATCH -C BDW28
 #SBATCH --cpu-freq=2600000
 
-module purge
-module load intel/18.1 openmpi/intel/2.0.1 parmetis/4.0.3-real64
-
 set -x
+source env_bench
+
 ldir=.
-mumpstest=mumps_bench
+mumpstest=$EXE
 # set max 2GB stack
 ulimit -s 2000000
 
-#export KMP_DETERMINISTIC_REDUCTION=1
+# Run with K=1 (see documentation in mumps_bench.F)
+K=1
+envtest="in_200Nodes_K=${K}_Test1_32x6.txt"
 
 export KMP_LIBRARY=turnaround
 export KMP_BLOCKTIME=infinite
@@ -28,10 +29,6 @@ echo "RUN $envtest"
 export OMP_NUM_THREADS=2
 export MKL_NUM_THREADS=2
 
-# Run with K=1 (see documentation in mumps_bench.F)
-K=1
-envtest="in_200Nodes_K=${K}_Test1_32x6.txt"
 input=./${envtest}
-srun --cpu-freq=2600000 -m block:cyclic ./${mumpstest} < ${input}   >& $ldir/output_${envtest}.log
-
 
+srun --cpu-freq=2600000 -m block:cyclic ${mumpstest} < ${input}   >& $ldir/output_${envtest}.log

MUMPS/machines/occigen-bdw/env_bench

 module purge
 module load intel/18.1 openmpi/intel/2.0.1 parmetis/4.0.3-real64
+module load git
+
+GIT_ROOT=`git rev-parse --show-toplevel`
+MUMPS_DIR=$GIT_ROOT/MUMPS
+EXE=$MUMPS_DIR/mumps_bench