Changeset 191 for palm/trunk/SCRIPTS/subjob

Timestamp:

Aug 27, 2008 2:34:51 PM (16 years ago)

Author:

raasch

Message:

further adjustments and bugfixes for SGI system

File:

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

palm/trunk/SCRIPTS/subjob

@@ -312 +312 @@
         (ibmy)   queue=parallel; remote_addres=165.132.26.58; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
         (lcfimm) remote_addres=172.20.4.2; submcom=/opt/torque/bin/qsub;;
-        (lcsgib) remote_addres=130.73.232.102; submcom=/opt/torque/bin/qsub;;
-        (lcsgih) remote_addres=130.75.4.102; submcom=/opt/torque/bin/qsub;;
+        (lcsgib) queue=smallq; remote_addres=130.73.232.102; submcom=/opt/torque/bin/qsub;;
+        (lcsgih) queue=smallq; remote_addres=130.75.4.102; submcom=/opt/moab/bin/msub;;
         (lctit)  queue=lctit; remote_addres=172.17.75.161; submcom=/n1ge/TITECH_GRID/tools/bin/n1ge;;
         (lcxt4)  remote_addres=129.177.20.113; submcom=/opt/torque/2.3.0/bin/qsub;;
@@ -350 +350 @@
         (ibmy)   case  $ndq  in
                      (parallel)                              error=false;;
+                     (*)                                     error=true;;
+                 esac;;
+        (lcsgib|lcsgih)   case  $ndq  in
+                     (testq|smallq|bigq)                     error=false;;
                      (*)                                     error=true;;
                  esac;;
@@ -672 +676 @@
  then
 
+    if [[ $queue = testq ]]
+    then
+       queue_directive="#PBS -q $queue"
+    else
+       queue_directive=""
+    fi
+
     if [[ $numprocs != 0 ]]
     then
@@ -683 +694 @@
 #PBS -o $remote_dayfile
 #PBS -j oe
+$queue_directive
 
 . /usr/share/modules/init/bash
 # module load mvapich/mvapich-0.9.9-intel
-module load mvapich2/1.2rc1-intel
+module load mvapich2
 module load netcdf
 export LD_LIBRARY_PATH=/sw/intel/cce/10.1.015/lib:/sw/intel/fce/10.1.015/lib:/sw/dataformats/netcdf/3.6.2/lib:\$LD_LIBRARY_PATH
@@ -941 +953 @@
           echo "#PBS -l nodes=1:ppn=1"                   >>  $job_to_send
           echo "#PBS -l feature=xe"                      >>  $job_to_send
-          echo "#PBS -l naccesspolicy=shared"            >>  $job_to_send
           echo "#PBS -o \$HOME/job_queue/last_job_transfer_protocol"      >>  $job_to_send
           echo "#PBS -j oe"                        >>  $job_to_send
@@ -1102 +1113 @@
        if [[ $remote_host != lctit ]]
        then
-          if [[ $remote_host = lcsgih  ||  $remote_host = lcsgib ]]
-          then
-             ssh  $remote_addres  -l $remote_user  "cd $job_catalog; $submcom  -q workq  $job_on_remhost; rm $job_on_remhost"
-          else
-             ssh  $remote_addres  -l $remote_user  "cd $job_catalog; $submcom $job_on_remhost; rm $job_on_remhost"
-          fi
+          ssh  $remote_addres  -l $remote_user  "cd $job_catalog; $submcom $job_on_remhost; rm $job_on_remhost"
        else
              # TIT ERLAUBT NUR DIE AUSFÜHRUNG GANZ BESTIMMTER KOMMANDOS