Changeset 2027

Timestamp:

03/11/13 15:13:11 (11 years ago)

Author:

aclsce

Message:

Fixed some bugs (very small bugs).

Location:

TOOLS/PACK_IPSL

Files:

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

TOOLS/PACK_IPSL/archive_debug.sh

@@ -120 +120 @@
 
         DEM_log -1 "On calcule la date de fin du pack "
-
         month_end_pack=${month_begin_pack}
         year_end_pack=`expr ${year_begin_pack} + ${period_pack}`
@@ -130 +129 @@
                 extract_date_file=`echo ${file}  | sed -e "s/.*\${JobName}_//"`
                 date_file=`echo ${extract_date_file}| sed 's/\([0-9]\{8\}\)_.*$/\1/g'`
-                if [[ ! -n ${date_file//[0-9]/} ]]; then
+                if [[  "x${date_file}" != "x" && ! -n ${date_file//[0-9]/} ]]; then
                     if [  ${date_file} -lt ${date_end_pack} ]
                     then 
@@ -144 +143 @@
                 extract_date_file=`echo ${file}  | sed -e "s/.*\${JobName}_//"`
                 date_file=`echo ${extract_date_file}| sed 's/\([0-9]\{8\}\)_.*$/\1/g'`
-                if [[ ! -n ${date_file//[0-9]/} ]]; then 
+        if [[  "x${date_file}" != "x" && ! -n ${date_file//[0-9]/} ]]; then
                     if [ ${date_file} -lt ${date_end_pack} ]
                     then 

TOOLS/PACK_IPSL/find_size_pack.sh

@@ -54 +54 @@
 
 DEM_write_state ${IGCM_DEM}/config_card.liste ${config_card} FindSizePackRunning
-
 # Periodicite du pack (20 ans par defaut) 
 period_pack=20Y
@@ -119 +118 @@
 # taille qu'aurait le pack de {periodpackinyear}ans
 DEM_log -1 "Debut recherche taille de pack"
-
 # Recherche des dates du premier pack
 
@@ -136 +134 @@
 
 # on ne fait le calcul que pour les dix premiers pack (donc 20 * 10 =  200 ans) 
-# cela doit donner un echantillon suffisant 
+# cela doit donner un echantillon suffisant
+date_begin_pack=`echo $date_begin_pack|sed 's/^0*//'` 
+date_end_simulation=`echo $date_end_simulation|sed 's/^0*//'` 
 while [[ ${date_begin_pack} -le ${date_end_simulation}  && ${number_pack} -le 10 ]]
 do 
     
     month_end_pack=${month_begin_pack}
-    year_end_pack=$(( ${year_begin_pack} + ${periodpackinyear} ))
-    
+    year_end_pack=$(( 10#${year_begin_pack} + ${periodpackinyear} ))
     date_end_pack=${year_end_pack}${month_end_pack}01 
 
@@ -202 +201 @@
 new_period=999999
 newpackinyear=0
-
-for type_file in `awk '{print $0}' ${IGCM_DEM_SIMU}/info_name_file.txt`
-do 
-    nb_line=$(cat ${IGCM_TMP}/${$}.size_pack_${type_file}.txt | wc -l )
-    if [ ${nb_line} -gt 1 ] 
-    then 
-        for taille in `head -n -1  ${IGCM_TMP}/${$}.size_pack_${type_file}.txt`
-        do 
-            [[ ${taille} -lt ${size_pack_min} ]] && period_tmp=$(( ${size_pack_min} * ${periodpackinyear} / ${taille} ))
-            [[ ${taille} -gt ${size_pack_max} ]] && period_tmp=$(( ${size_pack_min} * ${periodpackinyear} / ${taille} ))
-            [[ ${taille} -ge ${size_pack_min} && ${taille} -le ${size_pack_max} ]] && period_tmp=${periodpackinyear}
-            [[ ${period_tmp} -lt ${new_period} ]] && new_period=${period_tmp}
-        done
-    else
+if [[ -f ${IGCM_TMP}/${$}.size_pack_${type_file}.txt ]]; then 
+    for type_file in `awk '{print $0}' ${IGCM_DEM_SIMU}/info_name_file.txt`
+    do
+        nb_line=$(cat ${IGCM_TMP}/${$}.size_pack_${type_file}.txt | wc -l )
+        if [ ${nb_line} -gt 1 ] 
+        then 
+            for taille in `head -n -1  ${IGCM_TMP}/${$}.size_pack_${type_file}.txt`
+            do 
+                [[ ${taille} -lt ${size_pack_min} ]] && period_tmp=$(( ${size_pack_min} * ${periodpackinyear} / ${taille} ))
+                [[ ${taille} -gt ${size_pack_max} ]] && period_tmp=$(( ${size_pack_min} * ${periodpackinyear} / ${taille} ))
+                [[ ${taille} -ge ${size_pack_min} && ${taille} -le ${size_pack_max} ]] && period_tmp=${periodpackinyear}
+                [[ ${period_tmp} -lt ${new_period} ]] && new_period=${period_tmp}
+            done
+        else
         # Dans ce cas la il n'y avait pas assez de fichiers pour remplir une periode complete #
         # il faut donc commencer par calculer la taille du pack que l'on a fait #
-        newpackinyear=$((    ${year_end}  - ${year_begin}        ))
-        newpackinyear=$(( $newpackinyear + 1 ))
-        [[ ${newpackinyear} -lt 1 ]] && newpackinyear=1
-        
-        for taille in `head  ${IGCM_TMP}/${$}.size_pack_${type_file}.txt`
-        do 
-            [[ ${taille} -lt ${size_pack_min} ]] && period_tmp=${newpackinyear}
-            [[ ${taille} -gt ${size_pack_max} ]] && period_tmp=$(( ${size_pack_min} * ${newpackinyear} / ${taille} ))
-            [[ ${taille} -ge ${size_pack_min} && ${taille} -le ${size_pack_max} ]] && period_tmp=${newpackinyear}
-            [[ ${period_tmp} -lt ${new_period} ]] && new_period=${period_tmp}
-        done
-        
-    fi 
-done
-
+            newpackinyear=$((    ${year_end}  - ${year_begin}        ))
+            newpackinyear=$(( $newpackinyear + 1 ))
+            [[ ${newpackinyear} -lt 1 ]] && newpackinyear=1
+            for taille in `head  ${IGCM_TMP}/${$}.size_pack_${type_file}.txt`
+            do 
+                [[ ${taille} -lt ${size_pack_min} ]] && period_tmp=${newpackinyear}
+                [[ ${taille} -gt ${size_pack_max} ]] && period_tmp=$(( ${size_pack_min} * ${newpackinyear} / ${taille} ))
+                [[ ${taille} -ge ${size_pack_min} && ${taille} -le ${size_pack_max} ]] && period_tmp=${newpackinyear}
+                [[ ${period_tmp} -lt ${new_period} ]] && new_period=${period_tmp}
+            done
+        fi 
+    done
+fi
 DEM_log -1 "taille=${taille}"
 DEM_log -1 "new_period=${new_period}"

TOOLS/PACK_IPSL/load_ipslPack_env.sh

@@ -1 +1 @@
 #!/bin/bash
 
+export TMP_MIGR_DATA="/ccc/dmfbuf/ipsl_logs/dsm/bacasable/ARNAUD_ter" 
+export INPUT_DMF_DATA="/ccc/dmfbuf/import_data.3/ccrt/dmnfs10/cont003/p25alka"
+export OUTPUT_STORE="/ccc/dmfbuf/import_data.2/ccrt/dmnfs12/cont003/bacasable/ARNAUD_ter/PSEUDO_DMNFS_STORE"
+export OUTPUT_WORK="/ccc/dmfbuf/import_data.2/ccrt/dmnfs12/cont003/bacasable/ARNAUD_ter/PSEUDO_DMNFS_WORK"
+
+export IGCM_DEM=${TMP_MIGR_DATA}"/IGCM_DEM_ter"
+export OUTPUT_CHECK=${TMP_MIGR_DATA}"/PSEUDO_DMNFS_CHECK_ter"
+export OUTPUT_PROGRESS=${TMP_MIGR_DATA}"/PSEUDO_DMNFS_PROGRESS_ter"
+
 # Variables d'environnement
-export TMP_MIGR_DATA="/ccc/dmfbuf/ipsl_logs/dsm/bacasable/ARNAUD" 
-export INPUT_DMF_DATA="/ccc/dmfbuf/import_data.2/ccrt/dmnfs12/cont003/bacasable"
-export OUTPUT_STORE="/ccc/dmfbuf/import_data.2/ccrt/dmnfs12/cont003/bacasable/ARNAUD/PSEUDO_DMNFS_STORE"
-export OUTPUT_WORK="/ccc/dmfbuf/import_data.2/ccrt/dmnfs12/cont003/bacasable/ARNAUD/PSEUDO_DMNFS_WORK"
-
-export IGCM_DEM=${TMP_MIGR_DATA}"/IGCM_DEM"
-export OUTPUT_CHECK=${TMP_MIGR_DATA}"/PSEUDO_DMNFS_CHECK"
-export OUTPUT_PROGRESS=${TMP_MIGR_DATA}"/PSEUDO_DMNFS_PROGRESS"
-
 
 # Sur curie en sequentiel

TOOLS/PACK_IPSL/write_liste_pack.sh

@@ -103 +103 @@
 
 #
+date_begin_pack=`echo $date_begin_pack|sed 's/^0*//'`
+date_end_simulation=`echo $date_end_simulation|sed 's/^0*//'`
+
 while [[ ${date_begin_pack} -le ${date_end_simulation}  ]]
 do