Changeset 1274 for palm/trunk/SCRIPTS/subjob

Timestamp:

Jan 9, 2014 1:14:54 PM (11 years ago)

Author:

heinze

Message:

Adjustments for lccrayh

File:

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

palm/trunk/SCRIPTS/subjob

@@ -23 +23 @@
 # Current revisions:
 # ------------------
-# further adjustments for lccrayb (use msub instead of qsub)
+# adjustments for lccrayh
 #
 # Former revisions:
@@ -158 +158 @@
      (blizzard1)             local_addres=136.172.40.15;  local_host=ibmh;;
      (blogin*|bxc*)          local_addres=130.73.233.1;   local_host=lccrayb;;
+     (hlogin*|hxc*)          local_addres=130.75.4.1;     local_host=lccrayh;;
      (breva)                 local_addres=130.75.105.98;  local_host=lcmuk;;
      (buran)                 local_addres=130.75.105.58;  local_host=lcmuk;;
@@ -346 +347 @@
         (ibmy)    queue=parallel; remote_addres=165.132.26.58; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
         (lccrayb) queue=testq; remote_addres=130.73.233.1; submcom=/opt/moab/7.2.6/bin/msub;;
+        (lccrayh) queue=mpp1testq; remote_addres=130.75.4.1; submcom=/opt/moab/7.2.6/bin/msub;;
         (lccrayf) queue=small; remote_addres=86.50.166.21; submcom=/opt/slurm/default/bin/sbatch;;
         (lcfimm)  remote_addres=172.20.4.2; submcom=/opt/torque/bin/qsub;;
@@ -403 +405 @@
                  esac;;
         (lccrayb) case  $ndq  in
-                     (mpp1q|mpp1testq|testq)                 error=false;;
+                     (mpp1q|testq|specialm1q)                error=false;;
+                     (*)                                     error=true;;
+                 esac;;
+        (lccrayh) case  $ndq  in
+                     (mpp1q|mpp1testq|specialm1q|dataq)      error=false;;
                      (*)                                     error=true;;
                  esac;;
@@ -793 +799 @@
 %%END%%
 
- elif [[ $remote_host = lccrayb ]]
+ elif [[ $remote_host = lccrayb || $remote_host = lccrayh ]]
  then
 
@@ -1354 +1360 @@
     echo "trap '"                               >>  $job_to_send
     echo "set +vx"                              >>  $job_to_send
-    if [[ $(echo $remote_host | cut -c1-3) = ibm  ||  $remote_host = lccrayb  ||  $(echo $remote_host | cut -c1-5) = lcsgi  ||  $(echo $remote_host | cut -c1-3) = nec  ||  $remote_host = lcflow  ||  $remote_host = lckiaps  ||  $remote_host = lckyu* ]]
+    if [[ $(echo $remote_host | cut -c1-3) = ibm  ||  $remote_host = lccrayb  ||  $remote_host = lccrayh  ||  $(echo $remote_host | cut -c1-5) = lcsgi  ||  $(echo $remote_host | cut -c1-3) = nec  ||  $remote_host = lcflow  ||  $remote_host = lckiaps  ||  $remote_host = lckyu* ]]
     then
        if [[ $remote_host = ibmh ]]
@@ -1377 +1383 @@
        then
           return_queue=SP
-       elif [[ $remote_host = lccrayb ]]
+       elif [[ $remote_host = lccrayb || $remote_host = lccrayh ]]
        then
           return_queue=dataq
@@ -1504 +1510 @@
           echo "%%END%%"                           >>  $job_to_send
 
-       elif [[ $remote_host = lccrayb ]]
+       elif [[ $remote_host = lccrayb || $remote_host = lccrayh ]]
        then
           echo "cat > scpjob.$kennung << %%END%%"        >>  $job_to_send
@@ -1572 +1578 @@
        then
           echo "llsubmit  scpjob.$kennung"      >>  $job_to_send
-       elif [[ $remote_host = lccrayb ]]
+       elif [[ $remote_host = lccrayb || $remote_host = lccrayh ]]
        then
           echo "msub -q $return_queue  scpjob.$kennung"               >>  $job_to_send