Changeset 3157

Timestamp:

2011-11-18T16:53:48+01:00 (12 years ago)

Author:

epico

Message:

dev_NEMO_MERGE_2011: architecture's batch files adapted to the last version of SETTE

Location:

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/BATCH_TEMPLATE

Files:

• batch-PW6_CALYPSO (added)
• batch-PW6_VARGAS (modified) (4 diffs)
• batch-X64_TITANE (modified) (5 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_VARGAS

@@ -14 +14 @@
 # @ queue
 
+#
+# Test specific settings. Do not hand edit these lines; the fcm_job.sh script will set these
+# (via sed operating on this template job file). 
+#
+  OCEANCORES=NPROCS
+  export SETTE_DIR=DEF_SETTE_DIR
+
 ###############################################################
 #
@@ -20 +27 @@
 # Local settings for machine IBM Power6 (VARGAS at IDRIS France)
 #
-export MPIRUN="mpiexec -n"
+export MPIRUN="mpiexec -n $OCEANCORES"
+
 #
-# Test specific settings. Do not hand edit these lines; the fcm_job.sh script will set these
-# (via sed operating on this template job file). 
+# load sette functions (only post_test_tidyup needed)
 #
-  OCEANCORES=NPROCS
-  export SETTE_DIR=DEF_SETTE_DIR
+  . ${SETTE_DIR}/all_functions.sh
+#
+
+# Don't remove neither change the following line
+# BODY
+
 #
 # These variables are needed by post_test_tidyup function in all_functions.sh
@@ -45 +56 @@
 cd ${EXE_DIR}
 
-#
-# load sette functions (only post_test_tidyup needed)
-#
-  . ${SETTE_DIR}/all_functions.sh
-#
   echo Running on host `hostname`
   echo Time is `date`
@@ -56 +62 @@
 #  Run the parallel MPI executable 
 #
-  echo "Running time ${MPIRUN} " $OCEANCORES " ./opa"
+  echo "Running time ${MPIRUN} ./opa"
 #
-  time ${MPIRUN} " $OCEANCORES" ./opa
+  if [ MPI_FLAG == "yes" ]; then
+     time ${MPIRUN} ./opa
+  else
+     time ./opa
+  fi
+
 #
   post_test_tidyup
+
+# END_BODY
+# Don't remove neither change the previous line
+
+
   exit

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_TITANE

@@ -6 +6 @@
 ##########################################################################
 #
-# set up mpp computing environment
-#
-# Local settings for machine BULL (TITANE at CCRT France)
-#
-export MPIRUN="mpirun -np"
-#
 # Test specific settings. Do not hand edit these lines; the fcm_job.sh script will set these
 # (via sed operating on this template job file). 
@@ -17 +11 @@
   OCEANCORES=NPROCS
   export SETTE_DIR=DEF_SETTE_DIR
+#
+# set up mpp computing environment
+#
+# Local settings for machine BULL (TITANE at CCRT France)
+#
+export MPIRUN="mpirun -np $OCEANCORES"
+
+#
+# load sette functions (only post_test_tidyup needed)
+#
+  . ${SETTE_DIR}/all_functions.sh
+#
+
+# modules to load
+module load netcdf
+
+# Don't remove neither change the following line
+# BODY
+
 #
 # These variables are needed by post_test_tidyup function in all_functions.sh
@@ -27 +40 @@
   export CMP_NAM=DEF_CMP_NAM
   export TEST_NAME=DEF_TEST_NAME
-# modules to load
-module load netcdf
 #
 # end of set up
@@ -37 +48 @@
 cd ${EXE_DIR}
 
-#
-# load sette functions (only post_test_tidyup needed)
-#
-  . ${SETTE_DIR}/all_functions.sh
-#
   echo Running on host `hostname`
   echo Time is `date`
@@ -48 +54 @@
 #  Run the parallel MPI executable 
 #
-  echo "Running time ${MPIRUN} " $OCEANCORES " ./opa"
+  echo "Running time ${MPIRUN} ./opa"
 #
-  time ${MPIRUN} " $OCEANCORES" ./opa
+  if [ MPI_FLAG == "yes" ]; then
+     time ${MPIRUN} ./opa
+  else
+     time ./opa
+  fi
+
 #
   post_test_tidyup
+
+# END_BODY
+# Don't remove neither change the previous line
+
+
   exit