Changeset 349 for trunk/libIGCM/AA_move-and-rename

Timestamp:

09/10/10 17:02:35 (14 years ago)

Author:

mmaipsl

Message:

Correct AA_move-and-rename script. DODS calls are OK now.
Suppress sed on HEADER.html files because they are added by dods_cp command.

File:

• trunk/libIGCM/AA_move-and-rename (modified) (7 diffs)

trunk/libIGCM/AA_move-and-rename

@@ -206 +206 @@
     IGCM_debug_PushStack "MY_DODS_Cp"
 
+    typeset old_JobName old_R_DODS
     IGCM_sys_Cd ${NEW_R_SAVE}
     old_JobName=${config_UserChoices_JobName}
+    old_R_DODS=${R_DODS}
+    old_R_SAVE=${R_SAVE}
+
     config_UserChoices_JobName=${NEW_JobName}
+    R_DODS=${NEW_R_DODS}
+    R_SAVE=${NEW_R_SAVE}
+
     IGCM_sys_Dods_Cp ${1}
     IGCM_debug_Print 3 "MY_DODS_Cp : ${config_UserChoices_JobName}/${1}"
     IGCM_sys_Cd ${RUN_DIR_PATH}
+
     config_UserChoices_JobName=${old_JobName}
+    R_DODS=${old_R_DODS}
+    R_SAVE=${old_R_SAVE}
 
     IGCM_debug_PopStack "MY_DODS_Cp"
@@ -232 +242 @@
 
 if [ ! -d ${SUBMIT_DIR} ]; then
-    IGCM_debug_Print 0 "No ${SUBMIT_DIR}, we stop here"
+    IGCM_debug_Print 1 "No ${SUBMIT_DIR}, we stop here"
     exit 1
 fi
@@ -283 +293 @@
 IGCM_debug_Print 1 "Move ${R_SAVE} to ${NEW_R_SAVE}"
 if [ -d ${NEW_R_SAVE} ] ; then
-    IGCM_debug_Print 0 "ERROR : ${NEW_R_SAVE} directory already exist !"
-    IGCM_debug_Print 0 "We won't try to  We stop here."
+    IGCM_debug_Print 1 "ERROR : ${NEW_R_SAVE} directory already exist !"
+    IGCM_debug_Print 1 "We won't try to  We stop here."
     exit 1
 fi
@@ -290 +300 @@
 
 #DEFINE NEW_R_DODS
-if [ -d ${R_DODS} ] ; then
-    NEW_R_DODS=${NEW_SAVE}
-fi
+NEW_R_DODS=${NEW_SAVE}/${NEW_JobName}
 
 # Define NEW_REBUILD_DIR
@@ -330 +338 @@
 unset listfiles
 set +A listfiles -- $( find ${OutinDir} -type f -name "run.card\.[0-9]*\.[0-9]*" )
-IGCM_sys_Cp ${listfiles[*]} ${OutNEWDir}
-IGCM_sys_Rm -f ${listfiles[*]}
+if [ ${#listfiles[*]} -gt 0 ] ; then
+    IGCM_sys_Cp ${listfiles[*]} ${OutNEWDir}
+    IGCM_sys_Rm -f ${listfiles[*]}
+fi
 
 # Move and Rename OLD Script_Output
@@ -456 +466 @@
             MY_DODS_Cp ${comp}/Analyse/SE
         fi
+
+        MY_DODS_Rm ${comp}/Analyse
+        MY_DODS_Rm ${comp}
     else
         IGCM_debug_Print 2 "nothing to do without Analyse."
     fi
 
-    MY_DODS_Rm ${comp}/Analyse
-    MY_DODS_Rm ${comp}
 done
 
@@ -484 +495 @@
 if [ $? = 0 ] ; then
     IGCM_sys_MkdirArchive ${NEW_R_SAVE}/${R_MONITORING}
-    IGCM_sys_MkdirArchive ${NEW_R_SAVE}/${R_MONITORING}/html
-    IGCM_sys_MkdirArchive ${NEW_R_SAVE}/${R_MONITORING}/files
-    IGCM_sys_MkdirArchive ${NEW_R_SAVE}/${R_MONITORING}/progress
-    IGCM_sys_MkdirArchive ${NEW_R_SAVE}/${R_MONITORING}/images
     REPLACE_sed ${R_SAVE}/${R_MONITORING}/index.html ${NEW_R_SAVE}/${R_MONITORING}
-    REPLACE_sed ${R_SAVE}/${R_MONITORING}/HEADER.html ${NEW_R_SAVE}/${R_MONITORING}
-    REPLACE_sed ${R_SAVE}/${R_MONITORING}/files/HEADER.html ${NEW_R_SAVE}/${R_MONITORING}/files
-    REPLACE_sed ${R_SAVE}/${R_MONITORING}/html/HEADER.html ${NEW_R_SAVE}/${R_MONITORING}/html
-    REPLACE_sed ${R_SAVE}/${R_MONITORING}/progress/HEADER.html ${NEW_R_SAVE}/${R_MONITORING}/progress
-    REPLACE_sed ${R_SAVE}/${R_MONITORING}/images/HEADER.html ${NEW_R_SAVE}/${R_MONITORING}/images
     REPLACE_sed ${R_SAVE}/${R_MONITORING}/run.card ${NEW_R_SAVE}/${R_MONITORING}
     REPLACE_sed ${R_SAVE}/${R_MONITORING}/config.card ${NEW_R_SAVE}/${R_MONITORING}