Changeset 1822 for TOOLS/PACK_IPSL/write_liste_pack.sh

Timestamp:

07/19/12 16:02:21 (12 years ago)

Author:

aclsce

Message:

Modifications done by Guillaume P :

• error handling for the whole script
• check of nco version
• restart tool for list script
• progress visualization for both scripts
• "force" option -f added for both scripts
• timing information added for pack script

File:

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

TOOLS/PACK_IPSL/write_liste_pack.sh

@@ -28 +28 @@
 SCRIPT_NAME=$(basename ${0} )
 source ${EXE_DIR}/DEM_utilities.sh
+
+# gpdebug : verif si le present script a ete execute jusqu'au bout #########
+MonitoringInfo="${SCRIPT_NAME}-->OK"
+simuMonitoring_check "$MonitoringInfo" "$config_card"
+
+# gpdebug : Execute la function errorReceive() si reception d'un signal TERM
+trap 'DEM_errorReceive' TERM ########
+
+# gpdebug : on augmente la liste des proc à détruire en cas d'erreur bloquante du présent proc
+export listPID="$$ ${listPID}" #########
+
 DEM_log -0 "Demmarrage de ${SCRIPT_NAME}"
 cd ${JOB_DIR}
@@ -43 +54 @@
 SIMUL=${PATH_SIMUL_FULL}/${JobName}
 
+
 DEM_state=$( DEM_read_state ${IGCM_DEM}/config_card.liste ${config_card} )
-if [[ "${DEM_state}" != "FindSizePackDone" ]] ; then
-    DEM_log -0 "Attention : Etat incorrect dans ${IGCM_DEM}/config_card.liste"
-    exit -1
+# gpdebug : si c'est une premiere exec (pas une reprise)
+if [[ "x${execEveryStep}" == "1" ]] && [[ "${DEM_state}" != "FindSizePackDone" ]] ; then
+    DEM_errorSend "${SCRIPT_NAME}:${LINENO}:Etat incorrect dans ${IGCM_DEM}/config_card.liste"
 fi
+
 
 DEM_write_state ${IGCM_DEM}/config_card.liste ${config_card} WriteListPackRunning
@@ -244 +257 @@
 DEM_write_state ${IGCM_DEM}/config_card.liste ${config_card} WriteListPackDone
 
+# 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}"