Changeset 154

Timestamp:

08/14/09 13:08:56 (15 years ago)

Author:

sdipsl

Message:

• Use generic function IGCM_sys_SendMail
• BigCleanUp? at the end of the simulation if in production mode
• Do the CleanUp? After the resubmission ...
• ${RunDir?} depends on PID because of the BigCleanUp?

Location:

trunk/libIGCM

Files:

• AA_job (modified) (2 diffs)
• libIGCM_config/libIGCM_config.ksh (modified) (4 diffs)

trunk/libIGCM/AA_job

@@ -126 +126 @@
 #D- Define running directory
 #D- Default=${TMPDIR} ie temporary batch directory
-#RUN_DIR_PATH=/workdir/of/this/machine
+#RUN_DIR_PATH=/workdir/or/scratchdir/of/this/machine
 
 #D- Define submit directory
@@ -205 +205 @@
 #D-  
 # --------------------------------------------------------------------==
-RUN_DIR=${RUN_DIR_PATH}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
+RUN_DIR=${RUN_DIR_PATH}/${config_UserChoices_TagName}/${config_UserChoices_JobName}.${$}
 IGCM_sys_MkdirWork ${RUN_DIR}
 IGCM_sys_Cd ${RUN_DIR}

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -652 +652 @@
     echo
 
-    # Supress Non Deleted Boundary files
-    if [ ${DRYRUN} -le 2 ] ; then
-        IGCM_comp_DelFixeBoundaryFiles
-        ls -la
-    fi
-
     if [ ${SimulationLengthInDays} -ge ${ExperienceLengthInDays} ] ; then
 
@@ -664 +658 @@
         #==========================#
 
-        cat  << END_MAIL > job_atlas.mail
-Dear ${LOGIN},
-
-  Simulation ${config_UserChoices_JobName} is finished on supercomputer `hostname`.
-  Job started : ${DateBegin}
-  Job ended   : ${DateEnd}
-  Ouput files are available in ${R_SAVE}
-END_MAIL
-
-        mailx -s "${config_UserChoices_JobName} completed" ${USER} < job_atlas.mail
+        # Mail notification
+        IGCM_sys_SendMail
+
+        #
         IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodState "Completed"
         IGCM_debug_Print 1 "Normal End of computation."
@@ -681 +669 @@
             IGCM_sys_Tree ${R_SAVE}
         fi
+    
     else
 
@@ -693 +682 @@
 
         IGCM_debug_Print 1 "Submit next job"
-        # SUBMITTED NEXT JOB
+        # SUBMIT NEXT JOB
         IGCM_sys_Cd ${SUBMIT_DIR}
         IGCM_sys_Qsub ${SUBMIT_DIR}/Job_${config_UserChoices_JobName}
     fi
 
+    # Supress Non Deleted Boundary files
+    if [ ${DRYRUN} -le 2 ] ; then
+        IGCM_comp_DelFixeBoundaryFiles
+        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)
+    [ X${JobType} = X${RUN} ] && IGCM_sys_Rm -rf ${RUN_DIR}
+
     IGCM_debug_PopStack "IGCM_config_Finalize"
 }