Changeset 545 for trunk/libIGCM/AA_clean_month

Timestamp:

02/07/12 14:43:43 (12 years ago)

Author:

sdipsl

Message:

• clean_month.job adapted to R_BUFR
• R_IN points to CCCWORKDIR /ccc/work/cont003/dsm/p86ipsl/IGCM
• bugfixes, simplification, refactoring, cosmetics

File:

• trunk/libIGCM/AA_clean_month (modified) (6 diffs)

trunk/libIGCM/AA_clean_month

@@ -77 +77 @@
 #====================================================
 #R_SAVE : Job output directory
+#R_BUFR : Job output buffered directory
 if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then
     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' )
     R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
+    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
 else
     R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
+    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
 fi
 IGCM_sys_TestDirArchive ${R_SAVE}
@@ -88 +91 @@
 if [ ! -f ${SUBMIT_DIR}/run.card ]; then 
     echo "You seem NOT to have a run.card in this directory !!"
-    echo "This script will fail because it doesn't know what to do without run.card avaible."
+    echo "This script will fail because it doesn't know what to do without run.card available."
     exit 1
 else
@@ -104 +107 @@
     set +A ListFiles -- $( IGCM_sys_RshArchive "find ${R_SAVE} -name \"*${PeriodDateEnd}*\" " )
     CountListFiles=${#ListFiles[@]}
+
+    echo "Search files with ${PeriodDateEnd} in ${R_BUFR}"
+    set +A ListFilesBuf -- $( IGCM_sys_RshMaster "find ${R_BUFR} -name \"*${PeriodDateEnd}*\" " )
+    CountListFilesBuf=${#ListFilesBuf[@]}
 
     # If exist, erase REBUILD DIR
@@ -124 +131 @@
             IGCM_debug_Print 2 -e "\033[1;31m ${file}\033[m"
         done
+        for file in ${ListFilesBuf[@]} ; do
+            IGCM_debug_Print 2 -e "\033[1;31m ${file}\033[m"
+        done
 
-        echo "\033[1;32mDo you REALLY want to erase all those files ?"
-        echo -n " Your answer (y/n) : \033[m"
+        echo -e "\033[1;32mDo you REALLY want to erase all those files ?"
+        echo -n -e " Your answer (y/n) : \033[m"
         read reponse
         case ${reponse} in
@@ -133 +143 @@
                 echo "OK. It will be erased."
                 IGCM_sys_RshArchive "find ${R_SAVE} -name \"*${PeriodDateEnd}*\" -exec rm -f '{}' \;"
+                IGCM_sys_RshMaster  "find ${R_BUFR} -name \"*${PeriodDateEnd}*\" -exec rm -f '{}' \;"
                 echo "done."
                 ;;
@@ -147 +158 @@
         done
 
-        echo "\033[1;32mDo you REALLY want to erase all those Directories ?"
-        echo -n " Your answer (y/n) : \033[m"
+        echo -e "\033[1;32mDo you REALLY want to erase all those Directories ?"
+        echo -n -e " Your answer (y/n) : \033[m"
         read reponse
         case ${reponse} in