Changeset 1080 for trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

Timestamp:

10/07/14 12:14:11 (10 years ago)

Author:

sdipsl

Message:

• When needed copy debug files in SUBMIT_DIR before pushing them on storage. In case pushing them imply a mv. See #229

File:

• trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh (modified) (8 diffs)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -1289 +1289 @@
 
             (( i_ = 0 ))
-            for file in ${list_file[@]}
-            do
+            for file in ${list_file[@]} ; do
               echo "_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ " >> ${file_out}
               echo "| " ${i_} " " ${file} >> ${file_out}
@@ -1300 +1299 @@
                   (( i_ = i_ + 1 ))
             done
+            if ( ${ExecutionFail} ) ; then
+              IGCM_sys_Cp ${file_out} ${SUBMIT_DIR}/Debug
+            fi
+
             if [ X${Pack} = Xtrue ] ; then
               eval IGCM_sys_PutBuffer_Out ${file_out} \${R_BUF_${comp}_D}/${file_out}
@@ -1305 +1308 @@
               eval IGCM_sys_Put_Out ${file_out} \${R_OUT_${comp}_D}/${file_out}
             fi
+
             eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${file_out}" > /dev/null 2>&1
-
-            if ( ${ExecutionFail} ) ; then
-              IGCM_sys_Cp ${file_out} ${SUBMIT_DIR}/Debug
-            fi
           else
-            for file in ${list_file[@]}
-            do
+            for file in ${list_file[@]} ; do
+              if ( ${ExecutionFail} ) ; then
+                IGCM_sys_Cp ${file} ${SUBMIT_DIR}/Debug/${PREFIX}_${file}
+              fi
+
               if [ X${Pack} = Xtrue ] ; then
                 eval IGCM_sys_PutBuffer_Out ${file} \${R_BUF_${comp}_D}/${PREFIX}_${file}
@@ -1318 +1321 @@
                 eval IGCM_sys_Put_Out ${file} \${R_OUT_${comp}_D}/${PREFIX}_${file}
               fi
+
               eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${file}" > /dev/null 2>&1
-
-              if ( ${ExecutionFail} ) ; then
-                IGCM_sys_Cp ${file} ${SUBMIT_DIR}/Debug/${PREFIX}_${file}
-              fi
             done
           fi
@@ -1329 +1329 @@
             eval IGCM_sys_Mv ${file_in}* ${file_in}
           fi
+
+          if ( ${ExecutionFail} ) ; then
+            IGCM_sys_Cp ${file_in} ${SUBMIT_DIR}/Debug/${file_out}
+          fi
+
           if [ X${Pack} = Xtrue ] ; then
             eval IGCM_sys_PutBuffer_Out ${file_in} \${R_BUF_${comp}_D}/${file_out}
@@ -1335 +1340 @@
           fi
           eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${file_in}" > /dev/null 2>&1
-
-          if ( ${ExecutionFail} ) ; then
-            IGCM_sys_Cp ${file_in} ${SUBMIT_DIR}/Debug/${file_out}
-          fi
         fi
       done
@@ -1473 +1474 @@
             if [ $DRYRUN -le 1 ]; then
               if [ X$( eval echo \${${compname}_${flag_post}_Patches[0]} ) !=  X${NULL_STR} ]; then
-                for Patch in $( eval echo \${${compname}_${flag_post}_Patches[*]} ); do
+                for Patch in $( eval echo \${${compname}_${flag_post}_Patches[*]} ) ; do
                   echo ". ${libIGCM_POST}/libIGCM_post/IGCM_${Patch}.ksh" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                   echo "IGCM_${Patch} ${file_in}                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
@@ -1506 +1507 @@
             #
             if [ $DRYRUN -le 1 ]; then
-              for Patch in $( eval echo \${${compname}_${flag_post}_Patches[*]} ); do
+              for Patch in $( eval echo \${${compname}_${flag_post}_Patches[*]} ) ; do
                 echo ". ${libIGCM_POST}/libIGCM_post/IGCM_${Patch}.ksh" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                 echo "IGCM_${Patch} ${file_in}                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh