Changeset 1601 for trunk/libIGCM/libIGCM_sys

Timestamp:

10/02/23 18:11:44 (8 months ago)

Author:

jgipsl

Message:

Update for obelix:

• always create run directory in /home/scratch01/LOGIN/RUN_DIR. This is necessary when running on more than 1 node.
• Update function IGCM_sys_RmRunDir to be identic with the one at irene, jean-zay and mesoipsl.

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh

@@ -149 +149 @@
 #====================================================
 #- RUN_DIR_PATH : Temporary working directory (=> TMP)
-if [ ${DRYRUN_DEBUG} = 4 ] ; then
-    typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=/home/scratch01/$LOGIN/RUN_DIR}
+if [ X${PBS_JOBID} != X ] ; then
+    typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=/home/scratch01/$LOGIN/RUN_DIR/$PBS_O_LOGNAME.$PBS_JOBID}
 else
-    if [ X${PBS_JOBID} != X ] ; then
-        typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=/scratch/$PBS_O_LOGNAME.$PBS_JOBID}
-    else
-        typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=/tmp/tmp$$}
-    fi
+    typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=/home/scratch01/$LOGIN/RUN_DIR/tmp$$}
 fi
+
 
 #====================================================
@@ -440 +437 @@
   if ( $DEBUG_sys ) ; then
     echo "IGCM_sys_RmRunDir :" $@
-    echo "Dummy call, let the scheduler do that."
+  fi
+
+  typeset status
+
+  echo rm $@ > ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$ 2>&1
+  \rm $@ >> ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$ 2>&1
+  status=$?
+
+  if [ ${status} -gt 0 ] ; then
+    IGCM_debug_Print 1 "IGCM_sys_RmRunDir : rm error code is ${status}."
+    cat ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$
+    IGCM_debug_Exit "IGCM_sys_RmRunDir"
+  else
+    \rm ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$
   fi
   IGCM_debug_PopStack "IGCM_sys_RmRunDir"