Changeset 1426 for trunk

Timestamp:

03/07/18 16:10:33 (6 years ago)

Author:

aclsce

Message:

• Added the use of NOD parameter in config.card. This functionality is only available on Curie and for XIOS component (in order to assign XIOS servers on different nodes).

Example :
IOS= (xios_server.exe, xios.x, 4MPI, 2NOD)
means 4 XIOS servers use 2 computing nodes (i.e 2 XIOS servers per node).

Location:

trunk/libIGCM

Files:

• libIGCM_config/libIGCM_config.ksh (modified) (2 diffs)
• libIGCM_sys/libIGCM_sys_curie.ksh (modified) (4 diffs)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -705 +705 @@
         exit
       fi
+      if [ ${comp}_PROC_NOD -gt 1 ] ; then
+            if ( [ ${comp}_PROC_MPI -gt 1 ] && [ ${comp}_PROC_OMP -gt 1 ] ) ; then 
+              IGCM_debug_Print 2 "Error using MPI/OMP/NOD parameters !!!"
+              IGCM_debug_Exit "It is not allowed to use MPI and OMP and NOD parameters for the same component"
+              IGCM_debug_Exit "Check your config.card. Exit now"
+              IGCM_debug_Verif_Exit
+            fi
+            if [ "${comp}" != "IOS" ] ; then
+              IGCM_debug_Print 2 "Error using NOD parameter !!!"
+              IGCM_debug_Exit "NOD parameter is only available for IOS component "
+              IGCM_debug_Exit "Check your config.card. Exit now"
+              IGCM_debug_Verif_Exit
+            fi
+      fi
+
       eval tempvarMPI=\${${comp}_PROC_MPI}
       eval tempvarNOD=\${${comp}_PROC_NOD}
@@ -716 +731 @@
 
       # SUM UP NUMBER OF CORES
-      (( coreNumber = coreNumber + tempvarMPI * tempvarNOD * tempvarOMP ))
-
+      if [ ${comp}_PROC_NOD -gt 1 ] ; then 
+          (( coreNumber = coreNumber + tempvarNOD * NB_CORE_PER_NODE ))
+      else
+          (( coreNumber = coreNumber + tempvarMPI * tempvarNOD * tempvarOMP ))
+      fi
       # SUM UP NUMBER OF MPI TASKS
       (( mpiTasks = mpiTasks + tempvarMPI * tempvarNOD ))

trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

@@ -193 +193 @@
 DEFAULT_NUM_PROC_CPL=1
 (( DEFAULT_NUM_PROC_ATM = BATCH_NUM_PROC_TOT - DEFAULT_NUM_PROC_OCE - DEFAULT_NUM_PROC_CPL ))
+
+#====================================================
+#- Number of computing cores per node 
+#-
+NB_CORE_PER_NODE=16
 
 #D-#==================================================
@@ -1298 +1303 @@
       rank=0
       current_core=0
-      core_per_node=16
       init_exec=n
 
@@ -1319 +1323 @@
           eval comp_proc_mpi_loc=\${${comp}_PROC_MPI}
           eval comp_proc_omp_loc=\${${comp}_PROC_OMP}
+          eval comp_proc_nod_loc=\${${comp}_PROC_NOD}
 
           echo "#!/bin/ksh" > script_${ExeNameOut}.ksh
@@ -1368 +1373 @@
           #OMP_NUM_THREADS=4
           #./lmdz.x
-
+          if [ ${comp_proc_nod_loc} -gt 1 ] ; then
+              (( offset_comp_proc_loc =  NB_CORE_PER_NODE / comp_proc_mpi_loc * comp_proc_nod_loc ))
+          else
+              (( offset_comp_proc_loc =  comp_proc_omp_loc ))
+          fi
           for nb_proc_mpi in `seq 0 $(($comp_proc_mpi_loc-1))`; do
-            (( index_host = current_core / core_per_node ))
-            host_value=${host[${index_host}]}
-            (( slot =  current_core % core_per_node ))
-            virg=","
-            string_final=""
-            for index in `seq $slot $(($slot+$comp_proc_omp_loc-1))`; do
-              string=$index$virg
-              string_final=$string_final$string
-            done
-            string_final=$( echo $string_final | sed "s/.$//" )
-            echo "rank $rank=$host_value slot=$string_final" >> rankfile
-            (( rank = rank + 1 ))
-            (( current_core = current_core + comp_proc_omp_loc ))
+             (( index_host = current_core / NB_CORE_PER_NODE ))
+             host_value=${host[${index_host}]}
+             (( slot =  current_core % NB_CORE_PER_NODE ))
+             virg=","
+             string_final=""
+             for index in `seq $slot $(($slot+$comp_proc_omp_loc-1))`; do
+                 string=$index$virg
+                 string_final=$string_final$string
+             done
+             string_final=$( echo $string_final | sed "s/.$//" )
+             echo "rank $rank=$host_value slot=$string_final" >> rankfile
+             (( rank = rank + 1 ))
+             (( current_core = current_core + offset_comp_proc_loc ))
           done
         fi