Changeset 1920

Timestamp:

11/13/12 19:24:54 (12 years ago)

Author:

aclsce

Message:

• Fixed some bugs

Location:

TOOLS/PACK_IPSL

Files:

• DEM_utilities.sh (modified) (2 diffs)
• find_size_pack.sh (modified) (2 diffs)

TOOLS/PACK_IPSL/DEM_utilities.sh

@@ -81 +81 @@
 # Calcul du minimum d'un nombre quelconque d'entiers
     local l_min=${1} l_xx
-  
+
     for l_xx in ${*:2:${#}}
     do
-        [[ ${l_xx} -lt ${l_min} ]] && l_min=${l_xx}
+        l_xx_tmp=`echo $l_xx|sed 's/^0*//'`
+        l_min_tmp=`echo $l_min|sed 's/^0*//'`
+        [[ ${l_xx_tmp} -lt ${l_min_tmp} ]] && l_min=${l_xx}
     done
     echo ${l_min}
@@ -95 +97 @@
     for l_xx in ${*:2:${#}}
     do
-        [[ ${l_xx} -gt ${l_max} ]] && l_max=${l_xx}
+        l_xx_tmp=`echo $l_xx|sed 's/^0*//'`
+        l_max_tmp=`echo $l_max|sed 's/^0*//'`
+        [[ ${l_xx_tmp} -gt ${l_max_tmp} ]] && l_max=${l_xx}
     done
     echo ${l_max}

TOOLS/PACK_IPSL/find_size_pack.sh

@@ -147 +147 @@
 
     DEM_log -2 "Entree boucle : year_begin_pack month_begin_pack year_end_pack month_end_pack : ${year_begin_pack} ${month_begin_pack} ${year_end_pack} ${month_end_pack}"
-
     # on travaille pour chaque type de fichiers 
     for type_file in `awk '{print $0}' ${IGCM_DEM_SIMU}/info_name_file.txt`
@@ -178 +177 @@
         done
        # on fait la somme par periodpack et par type de fichier de la taille qu'aurait le pack
-        awk 'BEGIN {y = 0} {x = $1 ; y = y + x } END{print y}'  ${IGCM_TMP}/${$}.info_${type_file}_${number_pack}.txt >> ${IGCM_TMP}/${$}.size_pack_${type_file}.txt
-        [[ "${clean_tmp}" = "yes" ]] && rm -f  ${IGCM_TMP}/${$}.info_${type_file}_${number_pack}.txt
+        if [ -f ${IGCM_TMP}/${$}.info_${type_file}_${number_pack}.txt ] 
+        then
+            awk 'BEGIN {y = 0} {x = $1 ; y = y + x } END{print y}'  ${IGCM_TMP}/${$}.info_${type_file}_${number_pack}.txt >> ${IGCM_TMP}/${$}.size_pack_${type_file}.txt
+            [[ "${clean_tmp}" = "yes" ]] && rm -f  ${IGCM_TMP}/${$}.info_${type_file}_${number_pack}.txt
+        fi
     done