Changeset 12798 for utils/CI

Timestamp:

2020-04-22T18:59:18+02:00 (4 years ago)

Author:

gsamson

Message:

add corresponding Mercator SETTE batch templates (arch files added at r12797) and update prepare_job.sh script accordingly

Location:

utils/CI/sette

Files:

• BATCH_TEMPLATE/batch-ifort_beaufix_sette (added)
• BATCH_TEMPLATE/batch-mpmd-ifort_beaufix_sette (added)
• prepare_job.sh (modified) (2 diffs)

utils/CI/sette/prepare_job.sh

@@ -254 +254 @@
                                 export GROUP_IDRIS=`echo ${USER} |cut -c 2-4`
                                 ;;
-                        openmpi_KARA_MERCATOR_XIOS)
-                                NB_NODES=$( echo $NB_PROC | awk '{print $1 - $1 % 32}'  | awk '{print $1 / 32 }')
+                        openmpi_KARA_MERCATOR*)
                                 NB_PROC_NODE=32
-
+                                NB_NODES=$( echo $NB_PROC | awk '{print $1 - $1 % $NB_PROC_NODE }' | awk '{print $1 / $NB_PROC_NODE }' )
                                 if [ ${NB_PROC} -le 128 ] ; then
                                       QUEUE=multi
-                                      NB_PROC_NODE=32
-                                fi
-                                echo NB_PROCS     ${NB_PROC}
-                                echo NB_NODES     ${NB_NODES}
-                                echo NB_PROC_NODE ${NB_PROC_NODE}
+                                fi
+                                ;;
+                        ifort_beaufix_sette*)
+                                NB_PROC_NODE=40
+                                NB_NODES=$( echo $NB_PROC | awk '{print $1 - $1 % $NB_PROC_NODE }' | awk '{print $1 / $NB_PROC_NODE }' )
                                 ;;
          *)
             NB_NODES=${NB_PROC}
             ;;
-
       esac
 #
@@ -275 +273 @@
 #
         TOTAL_NPROCS=$(( $NB_PROC + $NXIO_PROC ))
-        cat ${SETTE_DIR}/job_batch_template | sed -e"s/NODES/${NB_NODES}/" \
+        cat ${SETTE_DIR}/job_batch_template | sed -e"s/\(=\| \)NODES/\1${NB_NODES}/" \
              -e"s/TOTAL_NPROCS/${TOTAL_NPROCS}/" \
              -e"s/NPROCS/${NB_PROC}/" \