Changeset 1092 for trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

Timestamp:

10/16/14 18:56:10 (10 years ago)

Author:

aclsce

Message:

• Added functionality to run coupled configuration with hybrid parallelisation (MPI + OpenMP) on ada supercomputer

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

@@ -2037 +2037 @@
           (( mpi_count = 1 ))
           until [ ${mpi_count} -gt ${comp_proc_mpi_loc} ] ; do
-            echo "./${ExeNameOut}" >> run_file
-            (( mpi_count = mpi_count + 1 ))
+              if ( ${OK_PARA_OMP} ) ; then
+                  # Check if the number of threads is correct
+                      case ${comp_proc_omp_loc} in
+                          1|2)
+                              IGCM_debug_Print 1 "You run ${ExeNameOut} on ${comp_proc_omp_loc} OMP threads"
+                              ;;
+                          4|8|16)
+                              IGCM_debug_Exit "ERROR with OMP parameters !"
+                              IGCM_debug_Print 2 "Beware : ${comp_proc_omp_loc} is too much for MPMD mode"
+                              IGCM_debug_Print 2 "You will use more CPU than needed"
+                              IGCM_debug_Verif_Exit
+                              ;;
+                          *) 
+                              IGCM_debug_Exit "ERROR with OMP parameters !"
+                              IGCM_debug_Print 2 "${comp_proc_omp_loc} is not possible as number of OMP threads"
+                              IGCM_debug_Print 2 "Only 2,4,8,16 as number of OMP threads are possible "
+                              IGCM_debug_Verif_Exit
+                              ;;
+                      esac
+                  echo "env OMP_NUM_THREADS=$comp_proc_omp_loc ./${ExeNameOut}" >> run_file 
+              else
+                  echo "./${ExeNameOut}" >> run_file
+              fi
+              (( mpi_count = mpi_count + 1 ))
           done
         else
             echo "./${ExeNameOut} " >> run_file
         fi
+        if ( ${OK_PARA_OMP} ) ; then
+            export KMP_STACKSIZE=200m
+        fi
       fi
     done