Changeset 621 for trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh

Timestamp:

03/30/12 15:42:12 (12 years ago)

Author:

sdipsl

Message:

• I messed up the merge (episode 2 : it will be at least a trilogy) mercure sx9 and titane

File:

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

trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh

@@ -1478 +1478 @@
 
 ############################################################
-# Build run file
+# Build MPI/OMP scripts
+function IGCM_sys_build_execution_scripts 
+{
+    IGCM_debug_PushStack "IGCM_sys_build_execution_scripts" $@
+    if ( $DEBUG_sys ) ; then
+        echo "IGCM_sys_build_execution_scripts " $@
+    fi
+
+    typeset NbNodes_Job NbProc_Job comp_proc_mpi_loc comp_proc_omp_loc mpi_count
+    
+    if [ ! -f ${SUBMIT_DIR}/Job_${config_UserChoices_JobName} ]  ; then
+        IGCM_debug_Exit "IGCM_sys_mercurex9 build_execution_scripts : Job_${config_UserChoices_JobName} don't exist in SUBMIT_DIR : ${SUBMIT_DIR} "
+    fi
+
+    if ( ${OK_PARA_MPMD} ) ; then
+
+        if [ -f run_file ] ; then
+            IGCM_sys_Rm -f run_file
+        fi
+        touch run_file
+
+        if ( ${OK_PARA_OMP} ) ; then
+                IGCM_debug_Print 2 "Error in config.card on SX9 : OpenMP not available"
+                exit 1
+        else
+# OLD :
+#PBS -v BATCH_NUM_PROC_TOT=4
+#PBS -l cpunum_job=${BATCH_NUM_PROC_TOT}
+            echo "Job_${config_UserChoices_JobName} includes BATCH_NUM_PROC_TOT = \c"
+            cat ${SUBMIT_DIR}/Job_${config_UserChoices_JobName} | grep -- "-v *BATCH_NUM_PROC_TOT" | sed -e "s/.*BATCH_NUM_PROC_TOT *= *//" 
+            NbProc_Job=$( cat ${SUBMIT_DIR}/Job_${config_UserChoices_JobName} | grep -- "-v *BATCH_NUM_PROC_TOT" | sed -e "s/.*BATCH_NUM_PROC_TOT *= *//" )
+            NbProc_Job=${NbProc_Job:=0}
+            if [ ${NbProc_Job} -eq 0 ] ; then
+                IGCM_debug_Print 2 "Error in Job_${config_UserChoices_JobName} ressources : no BATCH_NUM_PROC_TOT defined with MPI only run."
+                exit 1
+            fi
+        fi
+
+# run_file construction
+
+# Then first loop on the components for the coupler ie oasis
+
+### the coupler ie oasis must be the first one
+    for comp in ${config_ListOfComponents[*]} ; do
+        
+        eval ExeNameIn=\${config_Executable_${comp}[0]}
+        eval ExeNameOut=\${config_Executable_${comp}[1]}
+            
+        # for CPL component only
+        if [ "X${comp}" = "XCPL" ] ; then
+
+            eval comp_proc_mpi_loc=\${${comp}_PROC_MPI}
+            eval comp_proc_omp_loc=\${${comp}_PROC_OMP}
+            
+            if ( ${OK_PARA_MPI} ) ; then 
+                echo "-p ${comp_proc_mpi_loc} -e ./${ExeNameOut}" >> run_file 
+            fi
+        fi
+    done
+
+# Then second loop on the components
+
+    for comp in ${config_ListOfComponents[*]} ; do
+        
+        eval ExeNameIn=\${config_Executable_${comp}[0]}
+        eval ExeNameOut=\${config_Executable_${comp}[1]}
+            
+        # Only if we really have an executable for the component and not the coupler ie oasis:
+        if ( [ "X${ExeNameOut}" != X\"\" ] && [ "X${comp}" != "XCPL" ] ) ; then
+
+            eval comp_proc_mpi_loc=\${${comp}_PROC_MPI}
+            eval comp_proc_omp_loc=\${${comp}_PROC_OMP}
+            
+            if ( ${OK_PARA_MPI} ) ; then 
+                    echo "-p ${comp_proc_mpi_loc} -e ./${ExeNameOut}" >> run_file 
+            fi
+        fi
+    done
+
+    EXECUTION="${HOST_MPIRUN_COMMAND} -f ./run_file"
+
+    IGCM_sys_Chmod u+x run_file
+    if ( $DEBUG_sys ) ; then
+      echo "run_file contains : "
+      cat run_file
+    fi
+
+else # Only one executable. launch it.
+
+    for comp in ${config_ListOfComponents[*]} ; do
+
+        eval ExeNameIn=\${config_Executable_${comp}[0]}
+        eval ExeNameOut=\${config_Executable_${comp}[1]}
+
+        [ "X${ExeNameOut}" != X\"\" ] &&  EXECUTION="time mpirun -np ${BATCH_NUM_PROC_TOT} ./${ExeNameOut}"
+
+    done
+
+fi
+
+    IGCM_debug_Print 1 "sys mercurex9 : execution command is "
+    IGCM_debug_Print 1 "$EXECUTION"
+
+    IGCM_debug_PopStack "IGCM_sys_build_execution_scripts"
+
+}
 
 function IGCM_sys_build_run_file {
-  IGCM_debug_PushStack "IGCM_sys_build_run_file" $@
-  if ( $DEBUG_sys ) ; then
-    echo "IGCM_sys_build_run_file " $@
-  fi
-  (( NUM_PROC_ATM = BATCH_NUM_PROC_TOT - 1 ))
-  (( NUM_PROC_OASIS = BATCH_NUM_PROC_TOT - NUM_PROC_ATM ))
-  (( NUM_PROC_OCE = BATCH_NUM_PROC_TOT - NUM_PROC_ATM ))
-  
-  if [ $1 = MPI2 ]; then
-    cat <<EOF > run_file
--p 1 -np 1 -e ./oasis
-EOF
-    (( NUM_PROCESS = BATCH_NUM_PROC_TOT + 1 ))
-    config_UserChoices_JobRunOptions='"-max_np ${NUM_PROCESS} -f"'
-
-  elif [ $1 = MPI1 ]; then
-    cat <<EOF > run_file
--p $NUM_PROC_OASIS -e ./oasis
--p $NUM_PROC_ATM -e ./lmdz.x
--p $NUM_PROC_OCE -e ./opa.xx
-EOF
-  fi
-  IGCM_debug_PopStack "IGCM_sys_build_run_file"
-}
+
+IGCM_debug_Print 3 " dummy function : IGCM_sys_build_run_file "
+
+}