Changeset 4692 for trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_MOBILIS

Timestamp:

2014-06-25T19:08:29+02:00 (10 years ago)

Author:

acc

Message:

Merge SPMD and MPMD batch templates for use with sette_xios.sh. Only one batch template file now required for all SETTE jobs. Also fix namelist parameter settings for GYRE_XIOS_HR tests so that domain scales correctly with jp_cfg

File:

• trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_MOBILIS (modified) (2 diffs)

trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_MOBILIS

@@ -13 +13 @@
   export OMP_NUM_THREADS=1
   export OCORES=NPROCS
-  export XCORES=NOT_USED
+  export XCORES=NXIOPROCS
   export SETTE_DIR=DEF_SETTE_DIR
+  export XIO_HOME=/home/acc/XIOS
 #
 # load sette functions (only post_test_tidyup needed)
@@ -54 +55 @@
   cd $EXE_DIR
   echo Directory is `pwd`
+  if [ $XCORES -eq 0 ]; then
 #
+# Run SPMD case
 #
-#  Run the parallel MPI executable 
+       echo time `which mpirun` --report-bindings -x MALLOC_MMAP_MAX_=-1                 \
+                                -x MALLOC_TRIM_THRESHOLD_=33554432 -np $OCORES --bynode  \
+                                --mca mpi_paffinity_alone 1 ./opa 
+            time `which mpirun` --report-bindings -x MALLOC_MMAP_MAX_=-1                 \
+                                -x MALLOC_TRIM_THRESHOLD_=33554432 -np $OCORES --bynode  \
+                                --mca mpi_paffinity_alone 1 ./opa 
+  else
+       if [ ! -f ./xios_server.exe ] && [ -f ${XIO_HOME}/bin/xios_server.exe ]; then
+          cp ${XIO_HOME}/bin/xios_server.exe .
+       fi
+       if [ ! -f ./xios_server.exe ]; then
+          echo "./xios_server.exe not found"
+          echo "run aborted"
+          exit
+       fi
 #
-echo time `which mpirun` --report-bindings -x MALLOC_MMAP_MAX_=-1 \
-                         -x MALLOC_TRIM_THRESHOLD_=33554432 -np $OCORES --bynode  \
-                         --mca mpi_paffinity_alone 1 ./opa 
+#  Run MPMD case
 #
-     time `which mpirun` --report-bindings -x MALLOC_MMAP_MAX_=-1 \
-                         -x MALLOC_TRIM_THRESHOLD_=33554432 -np $OCORES --bynode  \
-                         --mca mpi_paffinity_alone 1 ./opa 
+       echo time `which mpirun` --report-bindings -x MALLOC_MMAP_MAX_=-1 \
+                                -x MALLOC_TRIM_THRESHOLD_=33554432       \
+                                -np $XCORES ./xios_server.exe            \
+                              : -np $OCORES --bynode  --mca mpi_paffinity_alone 1 ./opa 
 #
+            time `which mpirun` --report-bindings -x MALLOC_MMAP_MAX_=-1 \
+                                -x MALLOC_TRIM_THRESHOLD_=33554432       \
+                                -np $XCORES ./xios_server.exe            \
+                              : -np $OCORES --bynode  --mca mpi_paffinity_alone 1 ./opa 
+#
+  fi
 #
   post_test_tidyup