Changeset 1173 for trunk

Timestamp:

02/24/15 14:41:27 (9 years ago)

Author:

aclsce

Message:

MPMD + MPI-OpenMP mode

• Modified to fit with new mpirun assignment method (method changed beacuse of activation of hyperthreading on Curie nodes).
• Use of classic method in case of 1 OMP thread.

Location:

trunk/libIGCM

Files:

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

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -850 +850 @@
               # Read OMP parameter for composante
               eval ${comp}_PROC_OMP=$( echo ${tempvar} | tr '[a-z]' '[A-Z]' | sed -e "s/OMP//" )
-              OK_PARA_OMP=true;;
+              ;;
             *[nN][oO][dD]*)
               # Read NOD (NumBer of Nodes) parameter for composante
@@ -863 +863 @@
         eval tempvarNOD=\${${comp}_PROC_NOD}
         eval tempvarOMP=\${${comp}_PROC_OMP}
+
+        # set OMP mode if more than 1 OMP thread.
+        [ ${tempvarOMP} -ge 2 ] && OK_PARA_OMP=true
 
         (( PROCESSUS_NUMBER = PROCESSUS_NUMBER + tempvarMPI * tempvarNOD * tempvarOMP ))

trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

@@ -2297 +2297 @@
 # Build rankfile : method used to assign cores and nodes for the MPI process
 # Ex :
-#rank 0=curie5296 slot=0,1,2,3
-#rank 1=curie5296 slot=4,5,6,7
+#rank 0=curie5296 slot=0,2,4,6
+#rank 1=curie5296 slot=8,10,12,14
 # Example of final command :
 # mpirun -hostfile hosts -rankfile rankfile -np 27 ./script_lmdz.x.ksh : -np 5 ./script_opa.xx.ksh
@@ -2317 +2317 @@
             string_final=""
             for index in `seq $slot $(($slot+$comp_proc_omp_loc-1))`; do
-              string=$index$virg
+              (( index_slot = index * 2 ))      
+              string=$index_slot$virg
               string_final=$string_final$string
             done