Changeset 467

Timestamp:

05/17/11 18:11:55 (13 years ago)

Author:

mafoipsl

Message:

On titane :

• add RUN_DIR to keep TMPDIR files like in the same directory
• keep orginal request name in ccc_msub for rebuild job
• delete temporary files
• add IGCM_sys_RMRunDir function to support rebuild job on titane itself

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh (modified) (5 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

@@ -151 +151 @@
 #- RUN_DIR_PATH : Temporary working directory (=> TMP)
 if [ ! X${LSB_QUEUE} = Xmono ] ; then
-    typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${SCRATCHDIR}}
+    typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${SCRATCHDIR}/RUN_DIR/${LSB_JOBID}}
 else
     typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${SCRATCHDIR}/TMPDIR_IGCM/tmp$$}
@@ -246 +246 @@
             IGCM_debug_Exit "IGCM_sys_RshPost"
         fi
+        # delete temporary file
+        \rm tmp_IGCM_sys_RshPost_$$
     else
         # number of tentative
@@ -264 +266 @@
         done
         # delete temporary file
-        /bin/rm tmp_IGCM_sys_RshPost_$$
+        \rm tmp_IGCM_sys_RshPost_$$
 
         if [ ${status} -gt 0 ] ; then
@@ -577 +579 @@
         echo "IGCM_sys_Qsub :" $@
     fi
-    /usr/local/bin/ccc_msub -o ${Script_Output} -e ${Script_Output} -r ${config_UserChoices_JobName}.${CumulPeriod} < $1
+
+    if [ ${config_UserChoices_JobName}.${CumulPeriod} = "." ] ; then
+        /usr/local/bin/ccc_msub -o ${Script_Output} -e ${Script_Output} < $1
+    else
+        /usr/local/bin/ccc_msub -o ${Script_Output} -e ${Script_Output} -r ${config_UserChoices_JobName}.${CumulPeriod} < $1
+    fi
+
     if [ $? -gt 0 ] ; then
         echo "IGCM_sys_Qsub : erreur " $@
@@ -803 +811 @@
     fi
     IGCM_debug_PopStack "IGCM_sys_Rm"
+}
+
+#D-#==================================================
+#D-function IGCM_sys_RmRunDir
+#D-* Purpose: rm tmpdir (dummy function most of the time batch
+#D-                      scheduler will do the job)
+#D-* Examples:
+#D-
+function IGCM_sys_RmRunDir {
+    IGCM_debug_PushStack "IGCM_sys_RmRunDir" -- $@
+    if ( $DEBUG_sys ) ; then
+        echo "IGCM_sys_RmRunDir :" $@
+    fi
+
+    typeset RET
+
+    echo rm $@ > out_rsync 2>&1
+    \rm $@ >> out_rsync 2>&1
+    RET=$?
+
+    if [ ${RET} -gt 0 ] ; then
+        echo "IGCM_sys_RmRunDir : error."
+        cat out_rsync
+        IGCM_debug_Exit "IGCM_sys_RmRunDir"
+    else
+        \rm out_rsync
+    fi
+
+    IGCM_debug_PopStack "IGCM_sys_RmRunDir"
 }