Changeset 12426

Timestamp:

2020-02-20T18:38:28+01:00 (4 years ago)

Author:

mathiot

Message:

synchronisation of sette_top_pisces_lbc with sette

Location:

utils/CI/sette_top_pisces_lbc

Files:

• BATCH_TEMPLATE/batch-openmpi_NAVITI_MERCATOR (deleted)
• prepare_job.sh (modified) (2 diffs)

utils/CI/sette_top_pisces_lbc/prepare_job.sh

@@ -254 +254 @@
                                 export GROUP_IDRIS=`echo ${USER} |cut -c 2-4`
                                 ;;
-                        openmpi_NAVITI_MERCATOR)
-                                echo NB_PROCS ${NB_PROC}
-                                echo NB_NODES ${NB_NODES}
-                                echo  NB_PROC ${NB_PROC}
-                                if [ ${NB_PROC} -eq 1 ] ; then
-                                   NB_NODES=1
-                                   QUEUE=monoproc
-                                   NB_PROC_NODE=${NB_PROC}
-                                else
-                                   if [ ${NB_PROC} -le 16 ] ; then
-                                      NB_NODES=1
-                                      QUEUE=mono
-                                      NB_PROC_NODE=${NB_PROC}
-                                   else
-                                      NB_NODES=$( echo $NB_PROC | awk '{print $1 - $1 % 16}'  | awk '{print $1 / 16 }')
-                                      QUEUE=multi
-                                      NB_PROC_NODE=16
-                                  fi
-                                fi
-                                echo NB_PROCS     ${NB_PROC}
-                                echo NB_NODES     ${NB_NODES}
-                                echo NB_PROC_NODE ${NB_PROC_NODE}
-                                ;;
                         openmpi_KARA_MERCATOR_XIOS)
                                 NB_NODES=$( echo $NB_PROC | awk '{print $1 - $1 % 32}'  | awk '{print $1 / 32 }')
-                                NB_PROC_NODE=16
+                                NB_PROC_NODE=32
 
                                 if [ ${NB_PROC} -le 128 ] ; then
@@ -311 +288 @@
 
         case ${COMPILER} in
-              openmpi_NAVITI_MERCATOR )
-                    cat run_sette_test.job | sed -e"s/NPROC_NODE/${NB_PROC_NODE}/" \
-                                                 -e"s:QUEUE:${QUEUE}:" > run_sette_test1.job
-                    mv run_sette_test1.job run_sette_test.job
-                    ;;
               openmpi_KARA_MERCATOR_XIOS )
                     cat run_sette_test.job | sed -e"s/NPROC_NODE/${NB_PROC_NODE}/" \