Changeset 1962

Timestamp:

12/14/12 14:00:56 (11 years ago)

Author:

aclsce

Message:

Fixed some bugs.

Location:

TOOLS/PACK_IPSL

Files:

• archive_debug.sh (modified) (3 diffs)
• archive_restart.sh (modified) (1 diff)
• find_size_pack.sh (modified) (4 diffs)

TOOLS/PACK_IPSL/archive_debug.sh

@@ -125 +125 @@
 
         date_end_pack=${year_end_pack}${month_end_pack}01   
-
         if [ "x${ON_IDRIS}" == "xno" ]
         then
@@ -131 +130 @@
                 extract_date_file=`echo ${file}  | sed -e "s/.*\${JobName}_//"`
                 date_file=`echo ${extract_date_file}| sed 's/\([0-9]\{8\}\)_.*$/\1/g'`
-                if [  ${date_file} -lt ${date_end_pack} ]
-                then 
-                    if [ ${date_file} -ge ${date_begin_pack} ]
+                if [[ ! -n ${date_file//[0-9]/} ]]; then
+                    if [  ${date_file} -lt ${date_end_pack} ]
                     then 
-                        echo ${file} >> ${IGCM_TMP}/${$}.liste_pack_debug_${number_pack}.txt
-                    fi
-                fi 
+                        if [ ${date_file} -ge ${date_begin_pack} ]
+                        then 
+                            echo ${file} >> ${IGCM_TMP}/${$}.liste_pack_debug_${number_pack}.txt
+                        fi
+                    fi 
+                fi
             done
         else
@@ -143 +144 @@
                 extract_date_file=`echo ${file}  | sed -e "s/.*\${JobName}_//"`
                 date_file=`echo ${extract_date_file}| sed 's/\([0-9]\{8\}\)_.*$/\1/g'`
-
-                if [ ${date_file} -lt ${date_end_pack} ]
-                then 
-                    if [ ${date_file} -ge ${date_begin_pack} ]
+                if [[ ! -n ${date_file//[0-9]/} ]]; then 
+                    if [ ${date_file} -lt ${date_end_pack} ]
                     then 
-                        echo ${file} >> ${IGCM_TMP}/${$}.liste_pack_debug_${number_pack}.txt
-                    fi
-                fi 
+                        if [ ${date_file} -ge ${date_begin_pack} ]
+                        then 
+                            echo ${file} >> ${IGCM_TMP}/${$}.liste_pack_debug_${number_pack}.txt
+                        fi
+                    fi 
+                fi
             done  
         fi
-
 #on archive les debug - le nom de l'archive contiendra ${yearbegin}${monthbegin}_${yearend}${monthend} 
 # end etant la date du dernier fichier contenu et non pas la premiere date suivant 

TOOLS/PACK_IPSL/archive_restart.sh

@@ -175 +175 @@
 
 
-DEM_log -1 "On defini le datebegin de la  prochaine periode pack"
-#on defini la periode pack suivante
+DEM_log -1 "On definit le datebegin de la  prochaine periode pack"
+#on definit la periode pack suivante
    month_begin_pack=${month_end_pack}
    year_begin_pack=${year_end_pack}

TOOLS/PACK_IPSL/find_size_pack.sh

@@ -1 +1 @@
 #!/bin/bash
-
 # But : trouver la taille ideale de pack pour une simulation donnee
 # on part sur une base de 10 ans et on augmente par 0.5 ou on divise 
@@ -225 +224 @@
         for taille in `head  ${IGCM_TMP}/${$}.size_pack_${type_file}.txt`
         do 
-#         echo ${taille} ${type_file}
             [[ ${taille} -lt ${size_pack_min} ]] && period_tmp=${newpackinyear}
             [[ ${taille} -gt ${size_pack_max} ]] && period_tmp=$(( ${size_pack_min} * ${newpackinyear} / ${taille} ))
@@ -253 +251 @@
 [[ ${new_period} -gt 100 ]] && new_period=100
 
+[[ ${new_period} -eq 0 ]] && new_period=1
+
 [[ "${clean_tmp}" = "yes" ]] && rm -f  ${IGCM_TMP}/${$}.*
 
@@ -262 +262 @@
 # gpdebug : le script n'a pas rencontre d'erreur. On l'inscrit dans le fichier de suivi
 simuMonitoring_OK "$MonitoringInfo" "$config_card"
-
 DEM_log -0 "Fin de ${SCRIPT_NAME}"