Changeset 325 for palm/trunk

Timestamp:

May 20, 2009 5:52:40 AM (16 years ago)

Author:

raasch

Message:

adjustments for lcsgih and ibmh

Location:

palm/trunk/SCRIPTS

Files:

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

palm/trunk/SCRIPTS/mrun

@@ -2408 +2408 @@
        elif [[ $localhost = ibmh ]]
        then
-          printf "      compiler is called via ssh on \"blizzard\" \n"
-          ssh  136.172.40.15  -l $usern  "cd $TEMPDIR; make -f Makefile PROG=a.out  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$fopts\"  LDFLAGS=\"$lopts\" "
+          printf "      compiler is called via ssh on \"plogin1\" \n"
+          ssh  plogin1  -l $usern  "export PATH=/sw/ibm/xlf/12.1.0.3/usr/bin:$PATH; cd $TEMPDIR; make -f Makefile PROG=a.out  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$fopts\"  LDFLAGS=\"$lopts\" "
           [[ ! -f a.out ]]  &&  compile_error=true
           continue   # ANDERENFALLS IST STATUS=1, FALLS A.OUT VORHANDEN
@@ -3126 +3126 @@
 #                      export MV2_NUM_PORTS=2
 #                      export MV2_CPU_MAPPING=0:1:2:3
-                      mpiexec    ./a.out  $ROPTS  < runfile_atmos
+                      mpiexec -np $ii  ./a.out  $ROPTS  < runfile_atmos
                    fi
                 elif [[ $host = lcxt4 ]]
@@ -3403 +3403 @@
                    cst="/"
                 fi
-                if [[ $localhost = ibmh  ||  $localhost = ibmb  ||  $localhost = nech ]]
+                if [[ $localhost = ibmb  ||  $localhost = nech ]]
                 then
 

palm/trunk/SCRIPTS/subjob

@@ -98 +98 @@
      # 16/04/09 - Marcus- Adjustments for lcsgib and lcsgih
      # 21/04/09 - Siggi - adjustments for new IBM at DKRZ, which is now ibmh
+     # 18/05/09 - Siggi - Settings for serial jobs on lcsgi changed
 
 
@@ -363 +364 @@
                  esac;;
         (lcsgib|lcsgih)   case  $ndq  in
-                     (testq|smallq|bigq)                     error=false;;
+                     (testq|serialq|smallq|bigq)             error=false;;
                      (*)                                     error=true;;
                  esac;;
@@ -909 +910 @@
        then
           return_queue=serial
+       elif [[ $remote_host = lcsgih  ||  $remote_host = lcsgib ]]
+       then
+          return_queue = serialq
        elif [[ $remote_host = lctit ]]
        then
@@ -974 +978 @@
           echo "#!/bin/bash"                             >>  $job_to_send
           echo "#PBS -N job_protocol_transfer"           >>  $job_to_send
-          echo "#PBS -l walltime=00:02:00"               >>  $job_to_send
+          echo "#PBS -l walltime=00:30:00"               >>  $job_to_send
           echo "#PBS -l nodes=1:ppn=1"                   >>  $job_to_send
           echo "#PBS -l feature=xe"                      >>  $job_to_send