Changeset 179 for palm/trunk/SCRIPTS/mrun

Timestamp:

Jul 16, 2008 11:47:48 AM (16 years ago)

Author:

raasch

Message:

preliminary adjustments for HLRN-2 system

File:

• palm/trunk/SCRIPTS/mrun (modified) (4 diffs)

palm/trunk/SCRIPTS/mrun

@@ -147 +147 @@
      #                     adjustments for lcxt4 (Bergen Center for Computational
      #                     Science)
+     # 14/07/08 - Siggi  - adjustments for lcsgih
  
     # VARIABLENVEREINBARUNGEN + DEFAULTWERTE
@@ -1825 +1826 @@
  lopts="$lopts $netcdf_lib $dvrp_lib"
  ROPTS="$ropts"
- if [[ ( $(echo $host | cut -c1-3) = nec  ||  $(echo $host | cut -c1-3) = ibm  ||  $host = lctit  ||  $host = lcfimm  ||  $host = lcxt4 )  &&  -n $numprocs ]]
+ if [[ ( $(echo $host | cut -c1-3) = nec  ||  $(echo $host | cut -c1-3) = ibm  ||  $host = lcsgih  ||  $host = lcsgib  ||  $host = lctit  ||  $host = lcfimm  ||  $host = lcxt4 )  &&  -n $numprocs ]]
  then
     XOPT="-X $numprocs"
@@ -2754 +2755 @@
                 # COPY HOSTFILE FROM SOURCE DIRECTORY OR CREATE IT, IF IT
                 # DOES NOT EXIST
-             if [[ -f $hostfile ]]
-             then
-                cp  $hostfile  hostfile
-             else
-                (( ii = 1 ))
-                while (( ii <= $numprocs / $threads_per_task ))
-                do
-                   echo  $localhost_realname  >>  hostfile
-                   (( ii = ii + 1 ))
-                done
-             fi
+             if [[ $host != lcsgih  &&  $host != lcsgib ]]
+             then
+                if [[ -f $hostfile ]]
+                then
+                   cp  $hostfile  hostfile
+                else
+                   (( ii = 1 ))
+                   while (( ii <= $numprocs / $threads_per_task ))
+                   do
+                      echo  $localhost_realname  >>  hostfile
+                      (( ii = ii + 1 ))
+                   done
+                fi
+                eval zeile=\"`head -n $ii  hostfile`\"
+                printf "\n  *** running on: $zeile"
+             fi
+
              (( ii = $numprocs / $threads_per_task ))
-             eval zeile=\"`head -n $ii  hostfile`\"
-             printf "\n  *** running on: $zeile"
              export OMP_NUM_THREADS=$threads_per_task
+             echo "OMP_NUM_THREADS=$OMP_NUM_THREADS"
              if [[ $threads_per_task != 1 ]]
              then
@@ -2776 +2782 @@
              then
                 printf "\n\n"
-                if [[ $host = lcxt4 ]]
+                if [[ $host = lcsgih  ||  $host = lcsgib ]]
+                then
+                   echo "  --- Content of \$PBS_NODEFILE:"
+                   cat $PBS_NODEFILE
+                   echo "  --- end content"
+                   mpirun -machinefile $PBS_NODEFILE -np $ii  a.out  $ROPTS
+                elif [[ $host = lcxt4 ]]
                 then
                    aprun  -n $ii  -N $tasks_per_node  a.out  $ROPTS