Changeset 558 for branches/libIGCM_MPI_OpenMP/libIGCM_config/libIGCM_config.ksh

Timestamp:

02/24/12 18:16:41 (12 years ago)

Author:

mafoipsl

Message:

Add default number of processors in libIGCM_sys library. Adapted and tested on vargas and SX9.

File:

• branches/libIGCM_MPI_OpenMP/libIGCM_config/libIGCM_config.ksh (modified) (3 diffs)

branches/libIGCM_MPI_OpenMP/libIGCM_config/libIGCM_config.ksh

@@ -607 +607 @@
                         *[mM][pP][iI]*)
                             # Read MPI parameter for composante
-                            eval ${comp}_PROC_MPI=$( echo ${tempvar} | sed -e "s/MPI//" )
+                            eval ${comp}_PROC_MPI=$( echo ${tempvar} | tr '[a-z]' '[A-Z]' | sed -e "s/MPI//" )
                             OK_PARA_MPI=true;;
                         *[oO][mM][pP]*)
                             # Read OMP parameter for composante
-                            eval ${comp}_PROC_OMP=$( echo ${tempvar} | sed -e "s/OMP//" )
+                            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
-                            eval ${comp}_PROC_NOD=$( echo ${tempvar} | sed -e "s/NOD//" )
+                            eval ${comp}_PROC_NOD=$( echo ${tempvar} | tr '[a-z]' '[A-Z]' | sed -e "s/NOD//" )
                             OK_PARA_NOD=true
                             OK_PARA_MPI=true;;
@@ -642 +642 @@
     if [ X${BATCH_NUM_PROC_TOT} != X ] ; then
         # BATCH_NUM_PROC_TOT is set
-        if ( ! ${OK_PARA_MPI} ) ; then
+        if ( ${OK_PARA_MPI} ) ; then
+            IGCM_debug_Print 1 "MPI/OMP/NOD fund into config.card and BATCH_NUM_PROC_TOT = ${BATCH_NUM_PROC_TOT} "
+        else
             # with previous method.
             if [ ${BATCH_NUM_PROC_TOT} -gt 1 ] ; then
@@ -648 +650 @@
                 if ( ${OK_PARA_MPMD} ) ; then
                      # with MPMD ie CPL/oasis method
-                     echo "We will use default number of MPI tasks : 5 for OCE, 1 for CPL and 26 for ATM for coupled configuration"
+                     echo "We will use default number of MPI tasks for this machine : "
+                     echo "${DEFAULT_NUM_PROC_OCE} for OCE; "
+                     echo "${DEFAULT_NUM_PROC_CPL} for CPL; "
+                     echo "${DEFAULT_NUM_PROC_ATM} for ATM; "
+                     echo "${DEFAULT_NUM_PROC_TOTAL} for the total number of processors; "
                      OK_PARA_MPI=true
-                     CPL_PROC_MPI=1
-                     OCE_PROC_MPI=5
-                     ATM_PROC_MPI=26
-                     PROCESSUS_NUMBER=32
+                     CPL_PROC_MPI=${DEFAULT_NUM_PROC_CPL}
+                     OCE_PROC_MPI=${DEFAULT_NUM_PROC_OCE}
+                     ATM_PROC_MPI=${DEFAULT_NUM_PROC_ATM}
+                     PROCESSUS_NUMBER=${DEFAULT_NUM_PROC_TOTAL}
                 else
                      # with have only one executable