Changeset 1480 for palm

Timestamp:

Oct 17, 2014 2:41:49 PM (10 years ago)

Author:

raasch

Message:

adjustments for 2nd stage of HLRNIII

File:

• palm/trunk/SCRIPTS/subjob (modified) (5 diffs)

palm/trunk/SCRIPTS/subjob

@@ -23 +23 @@
 # Current revisions:
 # ------------------
-# 
+# adjustments for 2nd stage of HLRNIII
 # 
 # Former revisions:
@@ -355 +355 @@
         (ibmku)   queue=s4; remote_address=133.5.4.129; submcom=/usr/local/bin/llsubmit;;
         (ibms)    queue=p_normal; remote_address=150.183.5.101; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
-        (lccrayb) queue=mpp1testq; remote_address=130.73.233.1; submcom=/opt/moab/7.2.6/bin/msub;;
-        (lccrayh) queue=mpp1testq; remote_address=130.75.4.1; submcom=/opt/moab/7.2.6/bin/msub;;
+        (lccrayb) queue=mpp1testq; remote_address=130.73.233.1; submcom=/opt/moab/default/bin/msub;;
+        (lccrayh) queue=mpp1testq; remote_address=130.75.4.1; submcom=/opt/moab/default/bin/msub;;
         (lccrayf) queue=small; remote_address=86.50.166.21; submcom=/opt/slurm/default/bin/sbatch;;
         (lcflow)  remote_address=10.140.1.71; submcom=/cm/shared/apps/sge/6.2u5p2/bin/lx26-amd64/qsub;;
@@ -404 +404 @@
                  esac;;
         (lccrayb) case  $ndq  in
-                     (dataq|mpp1q|mpp1testq|smp1q|smp1testq|specialm1q)   error=false;;
+                     (dataq|mpp1q|mpp1testq|mpp2q|mpp2testq|smp1q|smp1testq|specialm1q)   error=false;;
                      (*)                                     error=true;;
                  esac;;
@@ -771 +771 @@
  then
 
+    if [[ "$feature" != "" ]]
+    then
+       featuredir="#PBS -l feature=$feature"
+    fi
+
     if [[ $numprocs != 0 ]]
     then
@@ -781 +786 @@
 #PBS -j oe
 #PBS -q $queue
+$featuredir
 
 $module_calls