Changeset 377 for palm/trunk/SCRIPTS

Timestamp:

Sep 4, 2009 11:09:00 AM (15 years ago)

Author:

raasch

Message:

adjustments for openmp usage on sgi-ice

Location:

palm/trunk/SCRIPTS

Files:

• mrun (modified) (3 diffs)
• subjob (modified) (1 diff)

palm/trunk/SCRIPTS/mrun

@@ -293 +293 @@
  transfer_problems=false
  usern=$LOGNAME
+ use_openmp=false
  working_directory=`pwd`
  TOPT=""
@@ -1136 +1137 @@
        tasks_per_node=1
     fi
+
+       # SETTINGS FOR SUBJOB-COMMAND
+    if [[ $(echo $host | cut -c1-5) = lcsgi ]]
+    then
+       (( tp1 = tasks_per_node * threads_per_task ))
+       TOPT="-T $tp1"
+    else
+       TOPT="-T $tasks_per_node"
+    fi
     OOPT="-O $threads_per_task"
-    TOPT="-T $tasks_per_node"
 
        # GESAMTZAHL DER KNOTEN BESTIMMEN
@@ -3168 +3177 @@
                           # export MPI_DSM_DISTRIBUTE=1
                           # MPI_DSM_CPULIST: pin MPI processes to cores
-                      export MPI_DSM_CPULIST="0,1,4,5,2,3,6,7:allhosts"
+                      if [[ $use_openmp = false ]]
+                      then
+                         export MPI_DSM_CPULIST="0,1,4,5,2,3,6,7:allhosts"
+                      fi
                           # MPI_IB_RAILS: use both IB rails on ICE2
                       export MPI_BUFS_PER_HOST=512

palm/trunk/SCRIPTS/subjob

@@ -498 +498 @@
  if (( tasks_per_node != 0 ))
  then
-    (( nodes = numprocs / ( tasks_per_node * threads_per_task ) ))
+    if [[ $(echo $remote_host | cut -c1-5) = lcsgi ]]
+    then
+       (( nodes = numprocs / tasks_per_node ))
+    else
+       (( nodes = numprocs / ( tasks_per_node * threads_per_task ) ))
+    fi
  fi