Changeset 696 for palm/trunk/SCRIPTS/mrun

Timestamp:

Mar 18, 2011 7:03:49 AM (14 years ago)

Author:

raasch

Message:

adjustments for openmp usage on ibmkisti (mrun, subjob); OpenMP-bugfixes: work_fftx removed from PRIVATE clauses in fftx_tr_xy and tr_yx_fftx (poisfft); Bugfix: Summation of Wicker-Skamarock scheme fluxes and variances for all threads (flow_statistics)

File:

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

palm/trunk/SCRIPTS/mrun

@@ -219 +219 @@
      # 02/02/10 - Siggi  - further adjustments on Tsubame and concerning openMP
      #                     usage
-     # 09/02/10 - Siggi  - adjustments for ibmkisti, mpt bugfix for netCDF4
+     # 09/03/10 - Siggi  - adjustments for ibmkisti, mpt bugfix for netCDF4
      #                     usage, totalview usage extended
+     # 17/03/11 - Siggi -  adjustments for openmp usage on ibmkisti
 
 
@@ -3131 +3132 @@
                 export LANG=en_US
                 export MP_SHARED_MEMORY=yes
-                export MP_SINGLE_THREAD=yes
-                export MEMORY_AFFINITY=MCM
+                if [[ $threads_per_task = 1 ]]
+                then
+                   export MP_SINGLE_THREAD=yes
+                   export MEMORY_AFFINITY=MCM
+                else
+                   export OMP_NUM_THREADS=$threads_per_task
+                fi
              fi
 
@@ -3291 +3297 @@
              (( ii = $numprocs / $threads_per_task ))
              export OMP_NUM_THREADS=$threads_per_task
-#             echo "OMP_NUM_THREADS=$OMP_NUM_THREADS"
+             # echo "*** OMP_NUM_THREADS=$OMP_NUM_THREADS"
              if [[ $threads_per_task != 1 ]]
              then