Changeset 312 for palm/trunk/SCRIPTS/subjob

Timestamp:

May 12, 2009 10:54:28 AM (16 years ago)

Author:

raasch

Message:

adjustments for IBM at DKRZ (ibmh)

File:

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

palm/trunk/SCRIPTS/subjob

@@ -97 +97 @@
      # 02/03/09 - Siggi - Adjustments for new NEC-SX9 at RIAM
      # 16/04/09 - Marcus- Adjustments for lcsgib and lcsgih
+     # 21/04/09 - Siggi - adjustments for new IBM at DKRZ, which is now ibmh
 
 
@@ -181 +182 @@
      (h01*|hicegate1)        local_addres=130.75.4.102;   local_host=lcsgih;;
      (hicegate2)             local_addres=130.75.4.103;   local_host=lcsgih;;
-     (hreg*-en0|hanni*-en0)  local_addres=130.75.4.10;    local_host=ibmh;;
+     (blizzard1)             local_addres=136.172.40.15;  local_host=ibmh;;
      (irifi)                 local_addres=130.75.105.104; local_host=lcmuk;;
      (levanto)               local_addres=130.75.105.45;  local_host=lcmuk;;
@@ -317 +318 @@
         (ibm)     queue=p690_standard; remote_addres=134.76.99.81; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
         (ibmb)    queue=cpar; remote_addres=130.73.230.10; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
-        (ibmh)    queue=cpar; remote_addres=130.75.4.10; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
+        (ibmh)    queue=no_class; remote_addres=136.172.40.15; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
         (ibms)    queue=p_normal; remote_addres=150.183.5.101; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
         (ibmy)    queue=parallel; remote_addres=165.132.26.58; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
@@ -350 +351 @@
                  esac;;
         (ibmh)   case  $ndq  in
-                     (cdata|cdev|cexp|channi|cxxl|c1|cshare|csolo|csoloh3h|csoloh6h|csoloh12h|csoloh1d|csoloh2d|cspec)  error=false;;
+                     (no_class)  error=false;;
                      (*)                                     error=true;;
                  esac;;
@@ -557 +558 @@
        consumable_memory="ConsumableMemory($memory mb)"
     fi
-    if [[ $queue = cdev ]]
-    then
-       data_limit="# @ data_limit = 1.76gb"
-       network_to_use="# @ network.mpi = sn_all,shared,ip"
-    else
-       if [[ $remote_host = ibms ]]
-       then
-          network_to_use="# @ network.mpi = csss,shared,us"
-       elif [[ $remote_host = ibmy ]]
-       then
-          network_to_use=""
+
+    if [[ $remote_host = ibmh ]]
+    then
+       data_limit=""
+       network_to_use=""
+       class=""
+       environment=""
+    else
+       class="# @ class = $queue"
+       environment="# @ environment = OMP_NUM_THREADS=$threads_per_task; MP_SHARED_MEMORY=yes"
+       if [[ $queue = cdev ]]
+       then
+          data_limit="# @ data_limit = 1.76gb"
+          network_to_use="# @ network.mpi = sn_all,shared,ip"
        else
-          network_to_use="# @ network.mpi = sn_all,shared,us"
-          data_limit="# @ data_limit = 1.76gb"
+          if [[ $remote_host = ibms ]]
+          then
+             network_to_use="# @ network.mpi = csss,shared,us"
+          elif [[ $remote_host = ibmy ]]
+          then
+             network_to_use=""
+          else
+             network_to_use="# @ network.mpi = sn_all,shared,us"
+             data_limit="# @ data_limit = 1.76gb"
+          fi
        fi
     fi
@@ -576 +588 @@
     cat > $job_to_send << %%END%%
 #!/bin/ksh
+# @ shell = /bin/ksh
 
 # @ job_type = parallel
@@ -584 +597 @@
 # @ error = $remote_dayfile
 # @ image_size = 50
-# @ class = $queue
-# @ environment = OMP_NUM_THREADS=$threads_per_task; MP_SHARED_MEMORY=yes
+$class
+$environment
 $network_to_use
 $data_limit
@@ -642 +655 @@
 # @ output = $remote_dayfile
 # @ error = $remote_dayfile
-# @ class = $queue
+$class
 $notification
 
@@ -916 +929 @@
           echo "echo \"# @ output = job_queue/last_job_transfer_protocol\" >> scpjob.$kennung"  >>  $job_to_send
           echo "echo \"# @ error = job_queue/last_job_transfer_protocol\" >> scpjob.$kennung"  >>  $job_to_send
-          echo "echo \"# @ class = $return_queue\" >> scpjob.$kennung"  >>  $job_to_send
+          if [[ $host != "ibmh" ]]
+          then
+             echo "echo \"# @ class = $return_queue\" >> scpjob.$kennung"  >>  $job_to_send
+          fi
           echo "echo \"# @ image_size = 10\" >> scpjob.$kennung"      >>  $job_to_send
           echo "echo \"# @ notification = never\" >> scpjob.$kennung" >>  $job_to_send