Changeset 617 for trunk/libIGCM/AA_pack_debug

Timestamp:

03/29/12 13:59:09 (12 years ago)

Author:

sdipsl

Message:

• Use ${date_begin_pack}_${date_end_pack} instead of ${number_pack} in text files name
• Bugfix in AA_pack_debug. Only occurs when JobName?=Job

File:

• trunk/libIGCM/AA_pack_debug (modified) (4 diffs)

trunk/libIGCM/AA_pack_debug

@@ -295 +295 @@
 
 # List renamed debug files. Exclude Job_xxx files.
-find ${RUN_DIR} -name "???_*${JobName}*" -ls | grep -v Job_ | sort -k 11 > ${RUN_DIR}/new_liste_debug_files.txt
+find ${RUN_DIR} -maxdepth 1 -mindepth 1 -name "???_*${JobName}*" -ls | sort -k 11 > ${RUN_DIR}/new_liste_debug_files.txt
 
 # ------------------------------------------------------------------
@@ -322 +322 @@
 #   echo pack n°${number_pack}  ${date_file} ${date_begin_pack} ${date_end_pack}
     if [ ${date_file} -le ${date_end_pack} ] && [ ${date_file} -ge ${date_begin_pack} ] ; then
-        echo $( basename ${file} ) >> ${RUN_DIR}/liste_pack_${number_pack}.txt
-        echo $( readlink ${file} ) >> ${RUN_DIR}/liste_remove_pack_${number_pack}.txt
+        echo $( basename ${file} ) >> ${RUN_DIR}/liste_pack_${date_begin_pack}_${date_end_pack}.txt
+        echo $( readlink ${file} ) >> ${RUN_DIR}/liste_remove_pack_${date_begin_pack}_${date_end_pack}.txt
 #    Will not work. Need to find a better ordering.
 #    elif [ ${date_file} -ge ${date_end_pack} ] ; then
@@ -332 +332 @@
   # Create tar files
   IGCM_debug_Print 1 "Tar ongoing"
-  tar -cvf ${JobName}_${date_begin_pack}_${date_end_pack}_debug.tar --dereference --files-from ${RUN_DIR}/liste_pack_${number_pack}.txt
+  tar -cvf ${JobName}_${date_begin_pack}_${date_end_pack}_debug.tar --dereference --files-from ${RUN_DIR}/liste_pack_${date_begin_pack}_${date_end_pack}.txt
   # Save it
   IGCM_sys_Put_Out ${JobName}_${date_begin_pack}_${date_end_pack}_debug.tar ${STORE_DEBUG}
@@ -338 +338 @@
   IGCM_sys_Rm ${JobName}_${date_begin_pack}_${date_end_pack}_debug.tar
   # Clean links
-  cat ${RUN_DIR}/liste_pack_${number_pack}.txt | xargs rm
+  cat ${RUN_DIR}/liste_pack_${date_begin_pack}_${date_end_pack}.txt | xargs rm
   # Clean files links pointed to
-  cat ${RUN_DIR}/liste_remove_pack_${number_pack}.txt | xargs rm
+  cat ${RUN_DIR}/liste_remove_pack_${date_begin_pack}_${date_end_pack}.txt | xargs rm
   # Save the list of files that has been pack (tar)
-  mv ${RUN_DIR}/liste_pack_${number_pack}.txt ${STORE_DEBUG}
+  mv ${RUN_DIR}/liste_pack_${date_begin_pack}_${date_end_pack}.txt ${STORE_DEBUG}
   IGCM_debug_Print 1 "Tar and cleaning done"