Changeset 1714

Timestamp:

05/11/12 10:08:39 (12 years ago)

Author:

acosce

Message:

If a simulation has a size less than 1Go we tar it

Location:

TOOLS/PACK_IPSL

Files:

• calcul_size_simul.sh (modified) (2 diffs)
• launch_ipsl_pack.sh (modified) (1 diff)
• write_liste_tar.sh (added)

TOOLS/PACK_IPSL/calcul_size_simul.sh

@@ -14 +14 @@
 mkdir -p ${IGCM_TMP}
 
+EXE_DIR=$(dirname ${0})
+SCRIPT_NAME=$(basename ${0} )
+source ${EXE_DIR}/DEM_utilities.sh
+DEM_log -0 "Demarrage de ${SCRIPT_NAME}"
+
 eval $(grep JobName ${config_card}) 
 eval $(grep PATH_SIMUL_FULL ${config_card}) 
@@ -26 +31 @@
 
 #cree la liste de l'ensemble des fichiers de la simulation
-grep ${PATH_SIMUL_FULL} ${LISTE_DMNFS} | grep 'R ' > ${IGCM_TMP}/$$.info_tmp.txt 
-awk '{print $(NF-2) " " $(NF-1)}' ${IGCM_TMP}/$$.info_tmp.txt > ${IGCM_DEM_SIMU}/All_files_simul.txt
+#echo ${PATH_SIMUL_FULL} ${LISTE_DMNFS}
+grep ${PATH_SIMUL_FULL} ${LISTE_DMNFS} | grep 'f ' > ${IGCM_TMP}/$$.info_tmp.txt 
+awk '{print $(NF-1) " " $(NF)}' ${IGCM_TMP}/$$.info_tmp.txt > ${IGCM_DEM_SIMU}/All_files_simul.txt
 
 size=`awk 'BEGIN {y = 0} {x = $1 ; y = y + x } END{print y}'  ${IGCM_DEM_SIMU}/All_files_simul.txt`
-echo $size
+DEM_log -3 "la taille de la simulation est  $size"
 if [  ${size} -lt ${limitmin} ]
 then
 
-    echo "trop petit on archive cette simulation avec tar"
-    PATH_SIMUL_SHORT=$(echo ${PATH_SIMUL_FULL} | sed 's%/[^/]*/[^/]*/[^/]*/%%' )
-    echo  ${PATH_SIMUL_FULL} > ${IGCM_DEM_SIMU}/tar_full_simul.txt
-
+    DEM_log -0  "Simulation < 1Go -  on l'archive avec tar"
+    ./write_liste_tar.sh ${config_card}
 
 fi
+DEM_log -0 "Fin de ${SCRIPT_NAME}"

TOOLS/PACK_IPSL/launch_ipsl_pack.sh

@@ -68 +68 @@
 for CONFIG in $( awk '{print $1}' ${IGCM_DEM}/config_card.liste ) ; do 
     
-    DEM_log ${CONFIG}
+    DEM_log -2 ${CONFIG}
 
     eval $(grep IGCM_DEM_SIMU ${CONFIG})
     ${EXE_DIR}/calcul_size_simul.sh ${CONFIG} ${LISTE_DMNFS}
 
-    if [ ! -f ${IGCM_DEM_SIMU}/tar_full_simul.txt ]
-    then 
-        echo "la simulation est superieur a 1Go alors on pack"
+    DEM_state=$( DEM_read_state ${IGCM_DEM}/config_card.liste ${CONFIG} )
+    if [[ "${DEM_state}" != "WriteListTarDone" ]] ; then
+
+        DEM_log -3  "la simulation est superieur a 1Go alors on pack"
         ${EXE_DIR}/find_size_pack.sh   ${CONFIG} ${LISTE_DMNFS}
         ${EXE_DIR}/write_liste_pack.sh ${CONFIG} ${LISTE_DMNFS}
 #       ${EXE_DIR}/archive_restart.sh ${CONFIG} ${LISTE_DMNFS}
+
     fi
 done