Changeset 4692 for trunk/NEMOGCM/SETTE/sette_xios.sh

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/sette_xios.sh (modified) (10 diffs)

trunk/NEMOGCM/SETTE/sette_xios.sh

@@ -103 +103 @@
 
 CMP_NAM=${1:-$COMPILER}
+#
+#=================================================================================
 # Copy job_batch_COMPILER file for specific compiler into job_batch_template
+# Note this batch template needs to be capable of launching both SPMD and MPMD
+# tasks with internal selection depending on the value of NUM_XIOSERVERS
+# (0=SPMD; >0 = MPMD)
 #=================================================================================
-# Note this script sets up and submits a mixture of SPMD and MPMD jobs corresponding 
-# to ATTACHED and DETACHED mode, XIOS jobs. In general, the launch command for these
-# jobs is different and is accommodated here by employing two different batch-file
-# templates. This script expects to find both a BATCH_TEMPLATE/batch-${COMPILER} and
-# a BATCH_TEMPLATE/batch-mpmd-${COMPILER} template. If your test system doesn't 
-# require this distinction, simply make both files identical.
-#=================================================================================
-# Initially copy standard (SPMD) template for attached mode tests
+#
 cd ${SETTE_DIR}
 cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit
@@ -192 +190 @@
     cd ${SETTE_DIR}
 #
-# Copy MPMD job_batch_COMPILER file for specific compiler into job_batch_template
-    cp BATCH_TEMPLATE/batch-mpmd-${COMPILER} job_batch_template || exit
-#
     . ./prepare_exe_dir.sh
     JOB_FILE=${EXE_DIR}/run_job.sh
@@ -250 +245 @@
     ## Restartability tests for GYRE
 
-    NPROC=152
+    NPROC=64
+    jp_cfg=30
+    jpni=8
+    jpnj=8
     export NUM_XIOSERVERS=0
     export USING_MPMD="false"
@@ -260 +258 @@
     cd ${SETTE_DIR}
 #
-# Copy SPMD job_batch_COMPILER file for specific compiler into job_batch_template
-    cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit
-#
     . ./param.cfg
     . ./all_functions.sh
@@ -276 +271 @@
     set_namelist namelist_cfg nn_bench 1
     set_namelist namelist_cfg ln_clobber .true.
-    set_namelist namelist_cfg jp_cfg 144
-    set_namelist namelist_cfg jpni 19
-    set_namelist namelist_cfg jpnj 8
+    set_namelist namelist_cfg jp_cfg $jp_cfg
+    set_namelist namelist_cfg jpidta $(( $jp_cfg * 30 + 2 ))
+    set_namelist namelist_cfg jpjdta $(( $jp_cfg * 20 + 2 ))
+    set_namelist namelist_cfg jpiglo $(( $jp_cfg * 30 + 2 ))
+    set_namelist namelist_cfg jpjglo $(( $jp_cfg * 20 + 2 ))
+    set_namelist namelist_cfg jpni $jpni
+    set_namelist namelist_cfg jpnj $jpnj
     set_namelist namelist_cfg jpnij $NPROC
 
@@ -297 +296 @@
     cd ${SETTE_DIR}
 #
-# Copy SPMD job_batch_COMPILER file for specific compiler into job_batch_template
-    cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit
-#
     . ./prepare_exe_dir.sh
 #
@@ -311 +307 @@
     set_namelist namelist_cfg nn_bench 1
     set_namelist namelist_cfg ln_clobber .true.
-    set_namelist namelist_cfg jp_cfg 144
-    set_namelist namelist_cfg jpni 19
-    set_namelist namelist_cfg jpnj 8
+    set_namelist namelist_cfg jp_cfg $jp_cfg
+    set_namelist namelist_cfg jpidta $(( $jp_cfg * 30 + 2 ))
+    set_namelist namelist_cfg jpjdta $(( $jp_cfg * 20 + 2 ))
+    set_namelist namelist_cfg jpiglo $(( $jp_cfg * 30 + 2 ))
+    set_namelist namelist_cfg jpjglo $(( $jp_cfg * 20 + 2 ))
+    set_namelist namelist_cfg jpni $jpni
+    set_namelist namelist_cfg jpnj $jpnj
     set_namelist namelist_cfg jpnij $NPROC
 
@@ -330 +330 @@
     cd ${SETTE_DIR}
 #
-# Copy MPMD job_batch_COMPILER file for specific compiler into job_batch_template
-    cp BATCH_TEMPLATE/batch-mpmd-${COMPILER} job_batch_template || exit
-#
     . ./prepare_exe_dir.sh
 #
@@ -344 +341 @@
     set_namelist namelist_cfg nn_bench 1
     set_namelist namelist_cfg ln_clobber .true.
-    set_namelist namelist_cfg jp_cfg 144
-    set_namelist namelist_cfg jpni 19
-    set_namelist namelist_cfg jpnj 8
+    set_namelist namelist_cfg jp_cfg $jp_cfg
+    set_namelist namelist_cfg jpidta $(( $jp_cfg * 30 + 2 ))
+    set_namelist namelist_cfg jpjdta $(( $jp_cfg * 20 + 2 ))
+    set_namelist namelist_cfg jpiglo $(( $jp_cfg * 30 + 2 ))
+    set_namelist namelist_cfg jpjglo $(( $jp_cfg * 20 + 2 ))
+    set_namelist namelist_cfg jpni $jpni
+    set_namelist namelist_cfg jpnj $jpnj
     set_namelist namelist_cfg jpnij $NPROC
 
@@ -372 +373 @@
     set_namelist namelist_cfg nn_bench 1
     set_namelist namelist_cfg ln_clobber .true.
-    set_namelist namelist_cfg jp_cfg 144
-    set_namelist namelist_cfg jpni 19
-    set_namelist namelist_cfg jpnj 8
+    set_namelist namelist_cfg jp_cfg $jp_cfg
+    set_namelist namelist_cfg jpidta $(( $jp_cfg * 30 + 2 ))
+    set_namelist namelist_cfg jpjdta $(( $jp_cfg * 20 + 2 ))
+    set_namelist namelist_cfg jpiglo $(( $jp_cfg * 30 + 2 ))
+    set_namelist namelist_cfg jpjglo $(( $jp_cfg * 20 + 2 ))
+    set_namelist namelist_cfg jpni $jpni
+    set_namelist namelist_cfg jpnj $jpnj
     set_namelist namelist_cfg jpnij $NPROC