Changeset 558 for branches/libIGCM_MPI_OpenMP/libIGCM_config
- Timestamp:
- 02/24/12 18:16:41 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/libIGCM_MPI_OpenMP/libIGCM_config/libIGCM_config.ksh
r556 r558 607 607 *[mM][pP][iI]*) 608 608 # Read MPI parameter for composante 609 eval ${comp}_PROC_MPI=$( echo ${tempvar} | sed -e "s/MPI//" )609 eval ${comp}_PROC_MPI=$( echo ${tempvar} | tr '[a-z]' '[A-Z]' | sed -e "s/MPI//" ) 610 610 OK_PARA_MPI=true;; 611 611 *[oO][mM][pP]*) 612 612 # Read OMP parameter for composante 613 eval ${comp}_PROC_OMP=$( echo ${tempvar} | sed -e "s/OMP//" )613 eval ${comp}_PROC_OMP=$( echo ${tempvar} | tr '[a-z]' '[A-Z]' | sed -e "s/OMP//" ) 614 614 OK_PARA_OMP=true;; 615 615 *[nN][oO][dD]*) 616 616 # Read NOD (NumBer of Nodes) parameter for composante 617 eval ${comp}_PROC_NOD=$( echo ${tempvar} | sed -e "s/NOD//" )617 eval ${comp}_PROC_NOD=$( echo ${tempvar} | tr '[a-z]' '[A-Z]' | sed -e "s/NOD//" ) 618 618 OK_PARA_NOD=true 619 619 OK_PARA_MPI=true;; … … 642 642 if [ X${BATCH_NUM_PROC_TOT} != X ] ; then 643 643 # BATCH_NUM_PROC_TOT is set 644 if ( ! ${OK_PARA_MPI} ) ; then 644 if ( ${OK_PARA_MPI} ) ; then 645 IGCM_debug_Print 1 "MPI/OMP/NOD fund into config.card and BATCH_NUM_PROC_TOT = ${BATCH_NUM_PROC_TOT} " 646 else 645 647 # with previous method. 646 648 if [ ${BATCH_NUM_PROC_TOT} -gt 1 ] ; then … … 648 650 if ( ${OK_PARA_MPMD} ) ; then 649 651 # with MPMD ie CPL/oasis method 650 echo "We will use default number of MPI tasks : 5 for OCE, 1 for CPL and 26 for ATM for coupled configuration" 652 echo "We will use default number of MPI tasks for this machine : " 653 echo "${DEFAULT_NUM_PROC_OCE} for OCE; " 654 echo "${DEFAULT_NUM_PROC_CPL} for CPL; " 655 echo "${DEFAULT_NUM_PROC_ATM} for ATM; " 656 echo "${DEFAULT_NUM_PROC_TOTAL} for the total number of processors; " 651 657 OK_PARA_MPI=true 652 CPL_PROC_MPI= 1653 OCE_PROC_MPI= 5654 ATM_PROC_MPI= 26655 PROCESSUS_NUMBER= 32658 CPL_PROC_MPI=${DEFAULT_NUM_PROC_CPL} 659 OCE_PROC_MPI=${DEFAULT_NUM_PROC_OCE} 660 ATM_PROC_MPI=${DEFAULT_NUM_PROC_ATM} 661 PROCESSUS_NUMBER=${DEFAULT_NUM_PROC_TOTAL} 656 662 else 657 663 # with have only one executable
Note: See TracChangeset
for help on using the changeset viewer.