Changeset 530 for trunk/libIGCM/AA_SaveSourceModifications

Timestamp:

12/12/11 09:01:04 (12 years ago)

Author:

mmaipsl

Message:

correct SaveSourceModification?.job : OK for titane.

File:

• trunk/libIGCM/AA_SaveSourceModifications (modified) (3 diffs)

trunk/libIGCM/AA_SaveSourceModifications

@@ -66 +66 @@
 #-Q- titane ######################
 #-Q- titane #MSUB -r SaveSource     # Nom du job                
-#-Q- titane #MSUB -N 1              # Reservation du noeud
 #-Q- titane #MSUB -n 1              # Reservation du processus
 #-Q- titane #MSUB -T 1800           # Limite de temps elapsed du job
-#-Q- titane #MSUB -E "-j o"
-#-Q- titane #MSUB -E "-S /bin/ksh"
+#-Q- titane #MSUB -E "-eo"
+#-Q- titane #MSUB -E "-L /bin/ksh"
+#-Q- titane #MSUB -E "-Ep "${ExeOutDateMax}
+#-Q- titane #MSUB -E "-Ep "${R_OUT_EXE}
+#-Q- titane #MSUB -E "-Ep "${PREFIX}
+#-Q- titane #MSUB -E "-Ep "${SUBMIT_DIR}
+#-Q- titane #MSUB -q testext
 #-Q- lxiv8 ###################### ???
 #-Q- lxiv8 ## OBELIX      LSCE ##
@@ -104 +108 @@
 #-Q- aix6 export OMP_NUM_THREADS=1
 
+MODIPSL=::modipsl::
+
 #D- Low level debug : to bypass lib test checks and stack construction
 #D- Default : value from AA_job if any
@@ -118 +124 @@
 . ${libIGCM}/libIGCM_config/libIGCM_config.ksh
 
-#set -vx
+IGCM_sys_MkdirWork ${RUN_DIR_PATH}
+IGCM_sys_Cd ${RUN_DIR_PATH}
 
+ExeOutDateMax=${ExeOutDateMax:=$1}
+R_OUT_EXE=${R_OUT_EXE:=$2}
+PREFIX=${PREFIX:=$3}
+SUBMIT_DIR=${SUBMIT_DIR:=$4}
 
-cd ${MODIPSL}
-#    set > set_before_script_diff_model 2>&1
-. ${MODIPSL}/util/script_diff_model ${SUBMIT_DIR}
-#    set > set_after_script_diff_model 2>&1
+IGCM_sys_RshMaster "cd ${MODIPSL};\
+                    . ${MODIPSL}/util/script_diff_model ${SUBMIT_DIR};\
+                    echo 'script_diff_model return ' \$?" > out_script_diff_model 2>&1
+
+ERR_script_diff_model=$( cat out_script_diff_model | grep "script_diff_model return [0-9]*" | sed -e "s&script_diff_model return *\([0-9]*\)&\1&" )
+
+if [ ! X${ERR_script_diff_model} = X0 ] ; then 
+    echo 'Error in script_diff_model :' ${ERR_script_diff_model}
+    exit ${ERR_script_diff_model}
+fi
+
+MODIPSL_SAVE_NAME=$( cat out_script_diff_model | grep "SAVE directory in" | sed -e "s&SAVE directory in  &&" )
+MODIPSL_SAVE=${MODIPSL}/tmp/${MODIPSL_SAVE_NAME}
+if ( [ X${MODIPSL_SAVE_NAME} = X ] || [ ! -d ${MODIPSL_SAVE} ] ) ; then 
+    echo 'Error in SaveSourceModifications: no MODIPSL_SAVE_NAME avaible. We STOP'
+    exit 1
+fi
+
 MaxModifiedDate=$( tail -1 ${MODIPSL_SAVE}/Last_log )
 
-tar cf ${MODIPSL_SAVE_NAME}.tar ${MODIPSL_SAVE_NAME}
-if ( [ -d ${MODIPSL_SAVE_NAME} ] && [ X"${MODIPSL_SAVE_NAME}" != X${MODIPSL} ] ) ; then 
-    IGCM_sys_Rm -rf ${MODIPSL_SAVE_NAME}
+cd ${MODIPSL}/tmp
+tar cf ${RUN_DIR_PATH}/${MODIPSL_SAVE_NAME}.tar ${MODIPSL_SAVE_NAME}
+cd -
+if ( ! ${DEBUG_debug} ) ; then
+    IGCM_sys_Rm -rf ${MODIPSL_SAVE}
 fi
 
 if [ ${MaxModifiedDate} -lt ${ExeOutDateMax} ] ; then
-    eval IGCM_sys_Put_Out ${MODIPSL_SAVE}.tar ${R_OUT_EXE}/${PREFIX}_${MODIPSL_SAVE_NAME}_certified.tar
+    IGCM_sys_Put_Out ${MODIPSL_SAVE_NAME}.tar ${R_OUT_EXE}/${PREFIX}_${MODIPSL_SAVE_NAME}_certified.tar
 else
-    eval IGCM_sys_Put_Out ${MODIPSL_SAVE}.tar ${R_OUT_EXE}/${PREFIX}_${MODIPSL_SAVE_NAME}_NOTcertified.tar
+    IGCM_sys_Put_Out ${MODIPSL_SAVE_NAME}.tar ${R_OUT_EXE}/${PREFIX}_${MODIPSL_SAVE_NAME}_NOTcertified.tar
 fi
-IGCM_sys_Rm ${MODIPSL_SAVE}.tar
+if ( ! ${DEBUG_debug} ) ; then
+    IGCM_sys_Rm ${MODIPSL_SAVE_NAME}.tar
+fi
+
+# Clean RUN_DIR_PATH (necessary for cesium)
+if ( ! ${DEBUG_debug} ) ; then
+    IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH}
+fi