Changeset 1913 for TOOLS/PACK_IPSL/write_liste_pack.sh

Timestamp:

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

Author:

aclsce

Message:

• Fixed some bugs

File:

• TOOLS/PACK_IPSL/write_liste_pack.sh (modified) (3 diffs)

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