Changeset 187

Timestamp:

10/19/09 17:42:30 (15 years ago)

Author:

aclsce

Message:

Use of TMPDIR_IGCM as TMPDIR.
Remove RUN_DIR at the end on RUN mode.
Removed Master variable declared as read-only variable.
Removed echo in count_archive function.
Coherence in filename used by mail function.

Location:

trunk/libIGCM

Files:

• libIGCM_config/libIGCM_config.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_platine.ksh (modified) (5 diffs)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -707 +707 @@
     # Clean ${RUN_DIR}=${RUN_DIR_PATH}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
     # Only for production run (No clean up in DEV or DEB mode)
-    [ X${JobType} = X${RUN} ] && IGCM_sys_Rm -rf ${RUN_DIR}
+    [ X${JobType} = XRUN ] && IGCM_sys_Rm -rf ${RUN_DIR}
 
     IGCM_debug_PopStack "IGCM_config_Finalize"

trunk/libIGCM/libIGCM_sys/libIGCM_sys_platine.ksh

@@ -70 +70 @@
 typeset -r LOGIN=$( whoami )
 # $hostname of the MASTER job
-typeset -r MASTER=platine
+typeset MASTER=platine
 
 #D-
@@ -136 +136 @@
 typeset RUN_DIR_PATH=${RUN_DIR_PATH:=${SCRATCHDIR}}
 if [ $LSB_QUEUE == post ] ; then
-    typeset -r RUN_DIR_PATH=${SCRATCHDIR}/tmp$$
+    typeset -r RUN_DIR_PATH=${SCRATCHDIR}/TMPDIR_IGCM/tmp$$
     if [ ! -d ${RUN_DIR_PATH} ]; then 
         \mkdir -p ${RUN_DIR_PATH}
@@ -226 +226 @@
     IGCM_debug_PushStack "IGCM_sys_SendMailPost" $@
     if ( $DEBUG_sys ) ; then
-        echo "IGCM_sys_SendMail :" $@
-    fi
-
-    cat  << END_MAIL > job_atlas.mail
+       echo "IGCM_sys_SendMail :" $@
+    fi
+    cat  << END_MAIL > job_end.mail
 Dear ${LOGIN},
 
@@ -239 +238 @@
 
     if [ ! -z ${config_UserChoices_MailName} ] ; then
-        mailx -s "${config_UserChoices_JobName} completed" ${config_UserChoices_MailName} <  job_end.mail
+        mailx -s "${config_UserChoices_JobName} completed" ${config_UserChoices_MailName} < job_end.mail
     elif [ -f ~/.forward ] ; then
         mailx -s "${config_UserChoices_JobName} completed" $( cat ~/.forward ) < job_end.mail
@@ -443 +442 @@
 function IGCM_sys_CountFileArchive {
     IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@
-    if ( $DEBUG_sys ) ; then
-        echo "IGCM_sys_CountFileArchive :" $@
-    fi
     ls ${@} 2>/dev/null | wc -l
     if [ $? -gt 0 ] ; then