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

Timestamp:

05/09/12 11:07:41 (12 years ago)

Author:

sdipsl

Message:

• Bugfix on cesium. Standalone postprocessing did not handled pack files properly
• sys_default was broken. Fix it.
• inca.dat exception known by all system library
• cosmetics

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh (modified) (5 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh

@@ -1478 +1478 @@
 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
+  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
+      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
@@ -1519 +1519 @@
 ### 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}
         
-        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
+        if ( ${OK_PARA_MPI} ) ; then 
+          echo "-p ${comp_proc_mpi_loc} -e ./${ExeNameOut}" >> run_file 
         fi
+      fi
     done
 
@@ -1538 +1538 @@
 
     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}
         
-        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
+        if ( ${OK_PARA_MPI} ) ; then 
+          echo "-p ${comp_proc_mpi_loc} -e ./${ExeNameOut}" >> run_file 
         fi
+      fi
     done
 
@@ -1562 +1562 @@
     fi
 
-else # Only one executable. launch it.
+  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}"
-
+      eval ExeNameIn=\${config_Executable_${comp}[0]}
+      eval ExeNameOut=\${config_Executable_${comp}[1]}
+
+      if ( [ "X${ExeNameOut}" != X\"\" ] && [ "X${ExeNameOut}" != "Xinca.dat" ] ) ; then
+        EXECUTION="time mpirun -np ${BATCH_NUM_PROC_TOT} ./${ExeNameOut}"
+      fi
     done
 
-fi
-
-    IGCM_debug_Print 1 "sys mercurex9 : execution command is "
-    IGCM_debug_Print 1 "$EXECUTION"
-
-    IGCM_debug_PopStack "IGCM_sys_build_execution_scripts"
+  fi
+
+  IGCM_debug_Print 1 "sys mercurex9 : execution command is "
+  IGCM_debug_Print 1 "$EXECUTION"
+
+  IGCM_debug_PopStack "IGCM_sys_build_execution_scripts"
 
 }
@@ -1592 +1593 @@
 function IGCM_sys_check_quota {
   IGCM_debug_PushStack "IGCM_sys_check_quota" 
+
   if ( $DEBUG_sys ) ; then
     echo "IGCM_sys_check_quota "