Changeset 9612

Timestamp:

2018-05-18T17:00:53+02:00 (6 years ago)

Author:

clem

Message:

put mpirun by default (instead of poe) to force the use of intel2017 otherwise agrif does not work and they are issues with repro/restart

Location:

utils/CI/sette/BATCH_TEMPLATE

Files:

• batch-X64_ADA (modified) (2 diffs)
• batch-X64_ADA_DEBUG (modified) (2 diffs)
• batch-X64_ADA_O0 (modified) (2 diffs)

utils/CI/sette/BATCH_TEMPLATE/batch-X64_ADA

@@ -27 +27 @@
 # Local settings for machine IBM Power6 (VARGAS at IDRIS France)
 #
-export MPIRUN="poe"
+export MPIRUN="mpirun"
 
 #
@@ -66 +66 @@
 #
   if [ MPI_FLAG == "yes" ]; then
-     echo "Running time ${MPIRUN} ./nemo -procs $OCEANCORES"
-     time ${MPIRUN} ./nemo -procs $OCEANCORES
+     echo "Running time ${MPIRUN} -np $OCEANCORES ./nemo"
+     time ${MPIRUN} -np $OCEANCORES ./nemo
   else
      echo "Running time ./nemo"

utils/CI/sette/BATCH_TEMPLATE/batch-X64_ADA_DEBUG

@@ -27 +27 @@
 # Local settings for machine IBM Power6 (VARGAS at IDRIS France)
 #
-export MPIRUN="poe"
+export MPIRUN="mpirun"
 
 #
@@ -66 +66 @@
 #
   if [ MPI_FLAG == "yes" ]; then
-     echo "Running time ${MPIRUN} ./nemo -procs $OCEANCORES"
-     time ${MPIRUN} ./nemo -procs $OCEANCORES
+     echo "Running time ${MPIRUN} -np $OCEANCORES ./nemo"
+     time ${MPIRUN} -np $OCEANCORES ./nemo
   else
      echo "Running time ./nemo"

utils/CI/sette/BATCH_TEMPLATE/batch-X64_ADA_O0

@@ -28 +28 @@
 #
 #export MPIRUN="poe -procs $OCEANCORES"
-export MPIRUN="poe"
+export MPIRUN="mpirun"
 
 #
@@ -67 +67 @@
 #
   if [ MPI_FLAG == "yes" ]; then
-     echo "Running time ${MPIRUN} ./nemo -procs $OCEANCORES"
-     time ${MPIRUN} ./nemo  -procs $OCEANCORES
+     echo "Running time ${MPIRUN} -np $OCEANCORES ./nemo"
+     time ${MPIRUN} -np $OCEANCORES ./nemo
   else
      echo "Running time ./nemo"