Changeset 910

Timestamp:

08/08/13 19:01:03 (11 years ago)

Author:

sdipsl

Message:

In some case Script_output was not saved. See #132

File:

• trunk/libIGCM/libIGCM_config/libIGCM_config.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -615 +615 @@
 
     if [ ${Period} = 1 ]; then
-      # save last Job output
-      typeset LastPeriod iLastPeriod Last_Script_Output_Name
-      (( LastPeriod=CumulPeriod-PeriodNb ))
-      iLastPeriod=$( printf "%06d" ${LastPeriod} )
-      Last_Script_Output_Name="${Script_Output_Prefix}_${config_UserChoices_JobName}.${iLastPeriod}"
-      Last_run_card="run.card.${iLastPeriod}"
-      #eval ls -l ${SUBMIT_DIR}/${Last_Script_Output_Name}
-      #eval IGCM_sys_Put_Out ${SUBMIT_DIR}/${Last_Script_Output_Name} ${R_BUF_KSH}/${Last_Script_Output_Name} > /dev/null 2>&1
-      IGCM_debug_Print 2 "Try to save previous ksh job output"
-      IGCM_sys_Cd ${SUBMIT_DIR}/
-      if [ X${Pack} = Xtrue ] ; then
-        IGCM_sys_PutBuffer_Out ${Last_Script_Output_Name} ${R_BUF_KSH}/${Last_Script_Output_Name}.$$ rw
-      else
-        IGCM_sys_Put_Out ${Last_Script_Output_Name} ${R_OUT_KSH}/${Last_Script_Output_Name}.$$ rw
-      fi
-
+      # save last Job output and current run.card
+      typeset Potential
+      IGCM_sys_Cd ${SUBMIT_DIR}
+      #
+      IGCM_debug_Print 2 "Save previous ksh job output"
+      for Potential in $( ls ${Script_Output_Prefix}_${config_UserChoices_JobName}.[0-9][0-9][0-9][0-9][0-9][0-9] ) ; do
+        if [ X${Pack} = Xtrue ] ; then
+          [ ! -f ${R_BUF_KSH}/${Potential} ] && IGCM_sys_PutBuffer_Out ${Potential} ${R_BUF_KSH}/${Potential}.$$ rw
+        else
+          [ ! -f ${R_OUT_KSH}/${Potential} ] && IGCM_sys_Put_Out ${Potential} ${R_OUT_KSH}/${Potential}.$$ rw
+        fi
+      done
+      #
+      IGCM_debug_Print 2 "Save current run.card"
       IGCM_card_CheckConflict run.card
       if [ X${Pack} = Xtrue ] ; then
-        IGCM_sys_PutBuffer_Out ${SUBMIT_DIR}/run.card ${R_BUF_KSH}/${Last_run_card}.$$ rw
+        IGCM_sys_PutBuffer_Out ${SUBMIT_DIR}/run.card ${R_BUF_KSH}/run.card rw
       else
-        IGCM_sys_Put_Out ${SUBMIT_DIR}/run.card ${R_OUT_KSH}/${Last_run_card}.$$ rw
+        IGCM_sys_Put_Out ${SUBMIT_DIR}/run.card ${R_OUT_KSH}/run.card rw
       fi
+      #
       IGCM_sys_Cd ${RUN_DIR}
     else
@@ -986 +985 @@
   eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${Exe_Output}"
 
-  IGCM_card_CheckConflict run.card
-  if [ X${Pack} = Xtrue ] ; then
-    IGCM_sys_PutBuffer_Out ${SUBMIT_DIR}/run.card ${R_BUF_KSH}/run.card rw
-  else
-    IGCM_sys_Put_Out ${SUBMIT_DIR}/run.card ${R_OUT_KSH}/run.card rw
-  fi
-
   if [ ${DRYRUN} -le 1 ] ; then