Changeset 1426 for trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

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).

File:

• trunk/libIGCM/libIGCM_config/libIGCM_config.ksh (modified) (2 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 ))