Changeset 4245 for branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/SETTE/prepare_job.sh

Timestamp:

2013-11-19T12:19:21+01:00 (10 years ago)

Author:

cetlod

Message:

dev_locean_cmcc_ingv_ukmo_merc : merge in the MERC_UKMO dev branch with trunk rev 4119

File:

• branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/SETTE/prepare_job.sh (modified) (5 diffs)

branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/SETTE/prepare_job.sh

@@ -68 +68 @@
 #
 
-usage=" Usage : ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG JOB_FILE"
-usage=" example : ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg 8 SHORT no/yes $JOB_FILE"
-
-
-minargcount=5
+usage=" Usage : ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG JOB_FILE NUM_XIO_SERVERS"
+usage=" example : ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg 8 SHORT no/yes $JOB_FILE 0"
+
+
+minargcount=6
         if [ ${#} -lt ${minargcount} ]
         then
@@ -93 +93 @@
 MPI_FLAG=$4
 JOB_FILE=$5
+NXIO_PROC=$6
 
 # export EXE_DIR. This directory is used to execute model 
@@ -186 +187 @@
       case ${COMPILER} in 
          ALTIX_NAUTILUS_MPT)
-                                NB_REM=$( echo $NB_PROC | awk '{print $1 % 4}')
+                                NB_REM=$( echo $NB_PROC $NXIO_PROC | awk '{print ( $1 + $2 ) % 4}')
                if [ ${NB_REM} == 0 ] ; then
                # number of processes required is an integer multiple of 4
                #
-               NB_NODES=$( echo $NB_PROC | awk '{print $1 / 4}')
+               NB_NODES=$( echo $NB_PROC $NXIO_PROC | awk '{print ($1 + $2 ) / 4}')
             else
                #
@@ -196 +197 @@
                # round up the number of nodes required.
                #
-               NB_NODES=$( echo $NB_PROC | awk '{printf("%d",$1 / 4 + 1 )}')
+               NB_NODES=$( echo $NB_PROC $NXIO_PROC | awk '{printf("%d",($1 + $2 ) / 4 + 1 )}')
                   fi
             ;;
@@ -230 +231 @@
 # Pass settings into job file by using sed to edit predefined strings
 #
-        cat ${SETTE_DIR}/job_batch_template | sed -e"s/NODES/${NB_NODES}/" -e"s/NPROCS/${NB_PROC}/" \
+        cat ${SETTE_DIR}/job_batch_template | sed -e"s/NODES/${NB_NODES}/" \
+             -e"s/NPROCS/${NB_PROC}/" \
+             -e"s/NXIOPROCS/${NXIO_PROC}/" \
              -e"s:DEF_SETTE_DIR:${SETTE_DIR}:" -e"s:DEF_INPUT_DIR:${INPUT_DIR}:" \
              -e"s:DEF_EXE_DIR:${EXE_DIR}:" \