Changeset 1913 for TOOLS

Timestamp:

11/08/12 16:00:22 (11 years ago)

Author:

aclsce

Message:

• Fixed some bugs

Location:

TOOLS/PACK_IPSL

Files:

• archive_debug.sh (modified) (4 diffs)
• calcul_size_simul.sh (modified) (3 diffs)
• create_config_card.sh (modified) (3 diffs)
• showPackProgress.sh (modified) (1 diff)
• write_liste_pack.sh (modified) (3 diffs)

TOOLS/PACK_IPSL/archive_debug.sh

@@ -1 +1 @@
 #!/bin/bash
-
 
 #on veut archiver les fichiers Debug. 
@@ -28 +27 @@
 
 DEM_log -0 "Demarrage de ${SCRIPT_NAME}"
-
 
 #### 0- lecture de config.card 
@@ -62 +60 @@
 rm -rf *
 fi
-
 # On copie les fichiers de Debug sur le scratchdir en changeant le nom et conservant la date
-grep ${PATH_SIMUL_FULL} ${LISTE_DMNFS} | grep Debug | awk '{print $3}' | sed '/^.*Debug$/d' >> ${IGCM_TMP}/${$}.liste_debug_files.txt
-
+grep ${PATH_SIMUL_FULL}/ ${LISTE_DMNFS} | grep Debug | awk '{print $3}' | sed '/^.*Debug$/d' >> ${IGCM_TMP}/${$}.liste_debug_files.txt
 # Test si il y a un repertoire Debug
 listDebugNbLines=`cat ${IGCM_TMP}/${$}.liste_debug_files.txt | wc -l `
@@ -72 +68 @@
     DEM_log -0 "Pas de repertoire Debug pour cette simulation"
 else
-
 # cas particulier : les fichiers Bands sont conserves sans etre archives
     grep ${JobName}_Bands ${IGCM_TMP}/${$}.liste_debug_files.txt >> ${STORE_CP}/cp_files.list
     sed "/${JobName}_Bands/d" ${IGCM_TMP}/${$}.liste_debug_files.txt > ${IGCM_TMP}/${$}.liste_debug_files.txt_tmp
     mv ${IGCM_TMP}/${$}.liste_debug_files.txt_tmp ${IGCM_TMP}/${$}.liste_debug_files.txt
-    
     gawk -F/ '{dest_name=$(NF-2)("_") $(NF); system("ln -s " $0 " "dest_name)}' ${IGCM_TMP}/${$}.liste_debug_files.txt
 
 #on fait de meme avec les fichiers out_gcm.e stockes dans le repertoire Out/ qui seront prefixes par Out_
     rm -f ${IGCM_TMP}/${$}.liste_debug_files.txt
-    grep ${PATH_SIMUL_FULL} ${LISTE_DMNFS} | grep -w Out | awk '{print $3}' | sed '/^.*Out$/d' > ${IGCM_TMP}/${$}.liste_debug_files.txt
+    grep ${PATH_SIMUL_FULL}/ ${LISTE_DMNFS} | grep -w Out | awk '{print $3}' | sed '/^.*Out$/d' > ${IGCM_TMP}/${$}.liste_debug_files.txt
     gawk -F/ '{dest_name=$(NF-1)("_") $(NF); system("ln -s " $0 " "dest_name)}' ${IGCM_TMP}/${$}.liste_debug_files.txt
 
 
     ls -l ${STORE_DEBUG} > ${IGCM_TMP}/${$}.new_liste_debug_files.txt
-
 ### 2- creer les listes de fichiers par periode ####
     DEM_log -1 "Creation des listes de fichiers par periode"

TOOLS/PACK_IPSL/calcul_size_simul.sh

@@ -1 +1 @@
 #!/bin/bash
-
 
 #### On veut calculer si l'ensemble des fichiers d'une simulation 
@@ -37 +36 @@
 #cree la liste de l'ensemble des fichiers de la simulation
 #echo ${PATH_SIMUL_FULL} ${LISTE_DMNFS}
-grep ${PATH_SIMUL_FULL} ${LISTE_DMNFS} | grep 'f ' > ${IGCM_TMP}/$$.info_tmp.txt 
+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
 
@@ -50 +49 @@
     
 fi
-
 # gpdebug : le script n'a pas rencontre d'erreur. On l'inscrit dans le fichier de suivi
 simuMonitoring_OK "$MonitoringInfo" "$config_card"

TOOLS/PACK_IPSL/create_config_card.sh

@@ -15 +15 @@
 
 # ----
+CURRENT_DIR=${PWD}
 export JOB_DIR=${JOB_DIR:-${TMP_MIGR_DATA}}
 export IGCM_DEM=${IGCM_DEM:-${SCRATCHDIR}/IGCM_DEM}
@@ -43 +44 @@
 
 #ROOT_DIR=/dmnfs05/cont003/labetoul # soit DMFDIR, soit le tampon. a ameliorer ...
-
-
-cd ${JOB_DIR}
 
 for PATH_SIMUL_FULL in `awk  '{print $0}' ${LISTE_SIMUL}` ; do 
@@ -217 +215 @@
     DEM_log -1 "${IGCM_DEM_SIMU}/config_card_${JobName} ListToBeDone >> ${IGCM_DEM}/config_card.liste"
 
-
 #si la liste des fichiers d'output est vide on tar la simul 
 if [[ !  -s ${IGCM_DEM_SIMU}/liste_output_files_config.txt ]]; then
 DEM_log -2 "liste output vide"
+    cd ${CURRENT_DIR}
     ./write_liste_tar.sh ${IGCM_DEM_SIMU}/config_card_${JobName}
+    cd ${JOB_DIR}
 fi 
 

TOOLS/PACK_IPSL/showPackProgress.sh

@@ -492 +492 @@
     rm ${JOB_DIR}/simuPrint.txt
 done
-
 NbInodeBefore=`cat ${IGCM_DEM}/Listing.txt | grep "f " | wc -l`
 #NbInodeBefore=`cat ${IGCM_DEM}/Listing.txt  | wc -l`
+ NbInodeAfterStore=0
  if [ -d "${OUTPUT_STORE}" ]
  then
      NbInodeAfterStore=$( find $OUTPUT_STORE -type f -printf "%y %s %p \n" | wc -l )
  fi
+ NbInodeAfterWork=0
  if [ -d "${OUTPUT_WORK}" ]
  then

TOOLS/PACK_IPSL/write_liste_pack.sh

@@ -1 +1 @@
 #!/bin/bash
-
 
 # Script permettant de creer les listes de fichiers pour ncrcat
@@ -235 +234 @@
         # On change le fichier ncrcat pour chaque date manquante en fichier tar
         if [[ -f ${IGCM_DEM_SIMU}/${type_file}_manquant.list && -s ${IGCM_DEM_SIMU}/${type_file}_manquant.list ]]; then 
-            for date in `awk '{print $0}' ${IGCM_DEM_SIMU}/${type_file}_manquant.list` ; do 
-                ls -l ${OUTPUT_NCRCAT}/${JobName}_*_${type_file}.list > ${IGCM_TMP}/${$}.liste_ncrcat
-                for pack in $( awk '{print $9}' ${IGCM_TMP}/${$}.liste_ncrcat ) ; do 
-                    extract_date_file=$( echo ${pack}       | sed -e "s%.*${JobName}_%%" )
-                    date_debut=$( echo ${extract_date_file} | sed 's%\([0-9]\{8\}\)_.*$%\1%g'     | cut -c 1-6  )
-                    date_fin=$(   echo ${extract_date_file} | sed 's%.*_\([0-9]\{8\}\)_.*$%\1%g' | cut -c 1-6  )
-                    if [[ ${date} -ge ${date_debut} && ${date} -lt ${date_fin} ]]; then
-                        mv ${pack} ${OUTPUT_TAR}/.
-                        break 
-                    else
-                        rm -f ${IGCM_DEM_SIMU}/${type_file}_manquant.list
-                    fi
-                    
-                done
+            for date in `awk '{print $0}' ${IGCM_DEM_SIMU}/${type_file}_manquant.list` ; do
+### AC : test si le fichier de list existe dans output_ncrcat (si non ca veut dire qu'il deja ete move dans output_tar) 
+                nb_files=$(ls ${OUTPUT_NCRCAT} | grep ${JobName} | grep "${type_file}.list" | wc -l )
+                if [ "x$nb_files" != "x0" ] ; then
+                    ls -l ${OUTPUT_NCRCAT}/${JobName}_*_${type_file}.list > ${IGCM_TMP}/${$}.liste_ncrcat
+                    for pack in $( awk '{print $9}' ${IGCM_TMP}/${$}.liste_ncrcat ) ; do 
+                        extract_date_file=$( echo ${pack}       | sed -e "s%.*${JobName}_%%" )
+                        date_debut=$( echo ${extract_date_file} | sed 's%\([0-9]\{8\}\)_.*$%\1%g'     | cut -c 1-6  )
+                        date_fin=$(   echo ${extract_date_file} | sed 's%.*_\([0-9]\{8\}\)_.*$%\1%g' | cut -c 1-6  )
+                        if [[ ${date} -ge ${date_debut} && ${date} -lt ${date_fin} ]]; then
+                            mv ${pack} ${OUTPUT_TAR}/.
+                            break 
+                        else
+                            rm -f ${IGCM_DEM_SIMU}/${type_file}_manquant.list
+                        fi
+                    done
+                fi
                 [[ "${clean_tmp}" = "yes" ]] && rm -f ${IGCM_TMP}/${$}.liste_ncrcat
             done
@@ -255 +257 @@
         fi
     fi
+    rm -f ${IGCM_DEM_SIMU}/${type_file}_manquant.list
 done