Changeset 509 for branches/libIGCM_MPI_OpenMP

Timestamp:

10/19/11 14:33:14 (13 years ago)

Author:

mmaipsl

Message:

Correct side effect when NEW_JobName and substring in Submit_dir PATH are very close. Protect some deletes. Add out_execution file.

File:

• branches/libIGCM_MPI_OpenMP/AA_move-and-rename (modified) (8 diffs)

branches/libIGCM_MPI_OpenMP/AA_move-and-rename

@@ -61 +61 @@
 {
     IGCM_debug_PushStack "REPLACE_sed"
+    typeset RET
     
     FILEIN=${1}
@@ -85 +86 @@
     IGCM_debug_PushStack "MOVE_and_RENAME_files"
 
-    typeset VAR_files FILE_OUT
+    typeset VAR_files FILE_OUT file i RET
 
     VAR_files=${1}
     eval VAR1=\${${VAR_files[0]}}
 
-    set +A FILE_OUT -- $( eval echo \${${VAR_files}[*]} | sed -e "s&${R_SAVE}&${NEW_R_SAVE}&g" -e "s/${config_UserChoices_JobName}/${NEW_JobName}/g" )
+    if [ X$( echo ${NEW_R_SAVE} | grep ${config_UserChoices_JobName} ) != X ]; then
+        set +A FILE_OUT -- $( eval echo \${${VAR_files}[*]} | sed -e "s&${R_SAVE}&${NEW_R_SAVE}&g" )
+        ((i=0))
+        for file in ${FILE_OUT[@]} ; do
+            FILE_OUT[$i]=$( dirname $file )/$( echo $( basename $file ) | sed -e "s/${config_UserChoices_JobName}/${NEW_JobName}/g" )
+            (( i = i + 1 ))
+        done
+    else
+        set +A FILE_OUT -- $( eval echo \${${VAR_files}[*]} | sed -e "s&${R_SAVE}&${NEW_R_SAVE}&g" -e "s/${config_UserChoices_JobName}/${NEW_JobName}/g" )
+    fi
     IGCM_debug_Print 3 "MOVE_and_RENAME_files all : ${VAR1}"
     IGCM_debug_Print 3 "    to     ${FILE_OUT}." 
@@ -97 +107 @@
     for file_o in ${FILE_OUT[@]} ; do
         eval IGCM_sys_Mv \${${VAR_files}[${ifile}]} ${file_o}
+        RET=$?
         (( ifile = ifile + 1 ))
     done    
-    RET=$?
 
     IGCM_debug_PopStack "MOVE_and_RENAME_files"
@@ -242 +252 @@
 # Change JobName and copy run.card
 if [ -f ${OutinDir}/run.card ] ; then
-    REPLACE_sed ${OutinDir}/run.card ${OutNEWDir}
+    sed -e "s/OldPrefix=\ *${config_UserChoices_JobName}/OldPrefix= ${NEW_JobName}/g" \
+        ${OutinDir}/run.card > ${RUN_DIR_PATH}/run.card
+    RET=$?
+    if [ ${RET} = 0 ] ; then
+        IGCM_sys_Mv -f ${RUN_DIR_PATH}/run.card ${OutNEWDir}
+        IGCM_sys_Rm -f ${OutinDir}/run.card
+    fi
 fi
 
@@ -250 +266 @@
 if [ ${#listfiles[*]} -gt 0 ] ; then
     IGCM_sys_Cp ${listfiles[*]} ${OutNEWDir}
-    IGCM_sys_Rm -f ${listfiles[*]}
+    RET=$?
+    if [ ${RET} = 0 ] ; then
+        IGCM_sys_Rm -f ${listfiles[*]}
+    fi
 fi
 
@@ -261 +280 @@
 unset listfiles
 set +A listfiles -- $( find ${OutinDir} -type f -name "*_out_${config_Executable_Name}" )
+MOVE_and_RENAME_files "listfiles"
+unset listfiles
+set +A listfiles -- $( find ${OutinDir} -type f -name "*_out_execution" )
 MOVE_and_RENAME_files "listfiles"
 
@@ -415 +437 @@
     IGCM_sys_MkdirArchive ${NEW_R_SAVE}/${R_MONITORING}
     REPLACE_sed ${R_SAVE}/${R_MONITORING}/index.html ${NEW_R_SAVE}/${R_MONITORING}
-    REPLACE_sed ${R_SAVE}/${R_MONITORING}/run.card ${NEW_R_SAVE}/${R_MONITORING}
+    sed -e "s/OldPrefix=\ *${config_UserChoices_JobName}/OldPrefix= ${NEW_JobName}/g" \
+        ${R_SAVE}/${R_MONITORING}/run.card > ${RUN_DIR_PATH}/run.card
+    IGCM_sys_Mv -f ${RUN_DIR_PATH}/run.card ${NEW_R_SAVE}/${R_MONITORING}
+    RET=$?
+    if [ ${RET} = 0 ] ; then
+        IGCM_sys_Rm -f ${R_SAVE}/${R_MONITORING}/run.card
+    fi
     REPLACE_sed ${R_SAVE}/${R_MONITORING}/config.card ${NEW_R_SAVE}/${R_MONITORING}
     IGCM_sys_Cp -rp ${R_SAVE}/${R_MONITORING} ${NEW_R_SAVE}
@@ -487 +515 @@
 if [ -f ${SUBMIT_DIR}/run.card ] ; then
     IGCM_debug_Print 1 "edit run.card"
-    sed -e "s&${R_SAVE}&${NEW_R_SAVE}&g" -e "s/${config_UserChoices_JobName}/${NEW_JobName}/g" \
+    sed -e "s/OldPrefix=\ *${config_UserChoices_JobName}/OldPrefix= ${NEW_JobName}/g" \
         ${SUBMIT_DIR}/run.card > ${RUN_DIR_PATH}/run.card
     IGCM_sys_Mv -f ${RUN_DIR_PATH}/run.card ${SUBMIT_DIR}/run.card