Changeset 352

Timestamp:

Jul 8, 2009 4:26:02 PM (15 years ago)

Author:

raasch

Message:

+option -e in subjob

Location:

palm/trunk/SCRIPTS

Files:

• mrun (modified) (4 diffs)
• subjob (modified) (5 diffs)

palm/trunk/SCRIPTS/mrun

@@ -183 +183 @@
      # 21/04/09 - Siggi  - adjustments for new IBM at DKRZ, which is now ibmh
      # 24/06/09 - BjornM - adjustments for coupled/precursor runs on ibmy
+     # 08/07/09 - Siggi  - default value for email_notification is none,
+     #                     option -e added to subjob
 
  
@@ -214 +216 @@
  do_stageout=true
  do_trace=false
- email_notification=""
+ email_notification="none"
  exclude=""
  executable=""
@@ -4081 +4083 @@
     
        # EVTL. EMAIL-BENACHRICHTIGUNG UEBER ABGESCHLOSSENEN LAUF
-    if [[ "$email_notification" != "" ]]
+    if [[ "$email_notification" != "none" ]]
     then
 
@@ -4321 +4323 @@
     fi
 
-    subjob  $job_on_file  -h $host  -u $remote_username -g $group_number -q $queue  -m $memory  -N $node_usage -t $cpumax  $XOPT  $TOPT  $OOPT  -n $fname  -v  -c $job_catalog  $jobfile
+    subjob  $job_on_file  -h $host  -u $remote_username -g $group_number -q $queue  -m $memory  -N $node_usage -t $cpumax  $XOPT  $TOPT  $OOPT  -n $fname  -v  -c $job_catalog  -e $email_notification  $jobfile
     rm -rf  $jobfile
 

palm/trunk/SCRIPTS/subjob

@@ -100 +100 @@
      # 18/05/09 - Siggi - Settings for serial jobs on lcsgi changed
      # 24/06/09 - BjornM- adjustments for lcxt4 (loading modules manually)
+     # 08/07/09 - Siggi - option -e added (email notification on lcsgih/b)
 
 
     # VARIABLENVEREINBARUNGEN + DEFAULTWERTE
- delete_dayfile=false 
+ delete_dayfile=false
+ email_notification=none 
  group_number=none
  locat=normal
@@ -214 +216 @@
 
     # PROZEDUROPTIONEN EINLESEN
- while  getopts  :c:dDg:h:m:n:N:O:q:t:T:u:vX:  option
+ while  getopts  :c:dDe:g:h:m:n:N:O:q:t:T:u:vX:  option
  do
    case  $option  in
@@ -220 +222 @@
        (d)   delete_dayfile=true;;
        (D)   no_submit=true;;
+       (e)   email_notification=$OPTARG;;
        (g)   group_number=$OPTARG;;
        (h)   remote_host=$OPTARG;;
@@ -710 +713 @@
     fi
 
+    if [[ $email_notification = none ]]
+    then
+       email_directive=""
+    else
+       email_directive="#PBS -M $email_notification"
+    fi
+
     if [[ $numprocs != 0 ]]
     then
@@ -722 +732 @@
 #PBS -j oe
 $queue_directive
+$email_directive
 
 . /usr/share/modules/init/bash