Changeset 561 for branches/libIGCM_MPI_OpenMP

Timestamp:

02/27/12 15:17:15 (12 years ago)

Author:

mafoipsl

Message:

Add a stop if executables don't exist.

Location:

branches/libIGCM_MPI_OpenMP

Files:

• libIGCM_comp/libIGCM_comp.ksh (modified) (1 diff)
• libIGCM_config/libIGCM_config.ksh (modified) (2 diffs)

branches/libIGCM_MPI_OpenMP/libIGCM_comp/libIGCM_comp.ksh

@@ -770 +770 @@
         eval ExeNameOut=\${config_Executable_${comp}[1]}
 
-        # If missing executable then stop!
-        #if [ ! X${ExeNameIn} = X ] && [ ! -f ${R_EXE}/${ExeNameIn} ] ; then
-        #    IGCM_debug_Exit "IGCM_comp_Update missing executable ${ExeNameIn}"
-        #fi 
+        # If missing executable and DRYRUN is set to 0 or 1  then stop!
+        if [ ${DRYRUN} -le 1 ] && [ X${ExeNameIn} != X\"\" ] &&  [ ! -f ${R_EXE}/${ExeNameIn} ] ; then
+            IGCM_debug_Exit "IGCM_comp_Update missing executable ${ExeNameIn}"
+        fi 
 
         if [ ${Period} -eq 1 ] && [ -f ${R_EXE}/${ExeNameIn} ] ; then

branches/libIGCM_MPI_OpenMP/libIGCM_config/libIGCM_config.ksh

@@ -727 +727 @@
     IGCM_sys_Put_Out ${SUBMIT_DIR}/run.card ${R_OUT_KSH}/run.card rw
 
+if [ ${DRYRUN} -le 1 ] ; then
     IGCM_debug_Print 1 "Check components binary : size and creation date"
 
@@ -806 +807 @@
     IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Log LastExeSize "${NextExeSize}"
 
-    if [ ${DRYRUN} -le 1 ] ; then
-        tail -1500 ${Exe_Output} > ${Exe_Output}_tail.txt
-        ExeCpuLog=$( gawk -f ${libIGCM}/libIGCM_sys/IGCM_add_out.awk ${Exe_Output}_tail.txt )
-        RET=$?
-        if [ $RET -eq 0 ] ; then
+    tail -1500 ${Exe_Output} > ${Exe_Output}_tail.txt
+    ExeCpuLog=$( gawk -f ${libIGCM}/libIGCM_sys/IGCM_add_out.awk ${Exe_Output}_tail.txt )
+    RET=$?
+    if [ $RET -eq 0 ] ; then
             # ExeCpuLog variable contents 5 fields
             echo "${CumulPeriod} ${PeriodDateBegin} ${PeriodDateEnd} ${ExeCpuLog} ${ExeDate}" |   \
-             gawk '{printf("# %11d | %15s | %15s | %19s | %19s | %15.5f | %15.5f | %15.5f | %s\n", \
+            gawk '{printf("# %11d | %15s | %15s | %19s | %19s | %15.5f | %15.5f | %15.5f | %s\n", \
                               $1,$2,$3,$4,$5,$6,$7,$8,$9)}' >> ${SUBMIT_DIR}/run.card
-        fi
-        eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${Exe_Output}_tail.txt"
-    fi
+    fi
+    eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${Exe_Output}_tail.txt"
+fi
 
     # All was right ? no ? then we stop.