Changeset 274

Timestamp:

05/20/10 18:38:12 (14 years ago)

Author:

mafoipsl

Message:

Use CSCRATCHDIR on new front end for mercure to have better performances for rebuild and other postprocessing operations. Correct config_Finalize to avoid warning messages. Correct somme comment.

Location:

trunk/libIGCM

Files:

• libIGCM_config/libIGCM_config.ksh (modified) (2 diffs)
• libIGCM_sys/libIGCM_sys_cesium.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_mercure.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -711 +711 @@
 
         IGCM_debug_Print 1 "Submit next job"
-        # SUBMIT NEXT JOB
+        # SUBMIT NEXT JOB from SUBMIT_DIR and come back in RUN_DIR
         IGCM_sys_Cd ${SUBMIT_DIR}
         IGCM_sys_Qsub ${SUBMIT_DIR}/Job_${config_UserChoices_JobName}
+        IGCM_sys_Cd -
     fi
 
@@ -721 +722 @@
         ls -la
     fi
-
+    
     # Clean ${RUN_DIR}=${RUN_DIR_PATH}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
     # Only for production run (No clean up in DEV or DEB mode)
+    # and command sent from .. directory.
+    IGCM_sys_Cd ..
     [ X${JobType} = XRUN ] && IGCM_sys_Rm -rf ${RUN_DIR}
 

trunk/libIGCM/libIGCM_sys/libIGCM_sys_cesium.ksh

@@ -734 +734 @@
 
     if [ ${RET} -gt 0 ] ; then
-        echo "IGCM_sys_Rm : error."
+        echo "IGCM_sys_RmRunDir : error."
         cat out_rsync
-        IGCM_debug_Exit "IGCM_sys_Rm"
+        IGCM_debug_Exit "IGCM_sys_RmRunDir"
     fi
 

trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

@@ -124 +124 @@
 #====================================================
 #- RUN_DIR_PATH : Temporary working directory (=> TMP)
-typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${TMPDIR}}
+typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${CSCRATCHDIR}}
 
 #====================================================
@@ -627 +627 @@
     IGCM_debug_PushStack "IGCM_sys_RmRunDir" -- $@
     if ( $DEBUG_sys ) ; then
-        echo "IGCM_sys_RmRunDir :" $@
-        echo "Dummy call, let the scheduler do that."
-    fi
+        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"
+    fi
+
     IGCM_debug_PopStack "IGCM_sys_RmRunDir"
 }