Changeset 1304

Timestamp:

Mar 12, 2014 10:29:42 AM (11 years ago)

Author:

raasch

Message:

openmp bugfix + bugfix for single core MPI runs
ulimit option in mrun changed from -Ss to -s

Location:

palm/trunk

Files:

• SCRIPTS/mrun (modified) (3 diffs)
• SOURCE/fft_xy.f90 (modified) (5 diffs)
• SOURCE/init_pegrid.f90 (modified) (5 diffs)

palm/trunk/SCRIPTS/mrun

@@ -22 +22 @@
 # Current revisions:
 # ------------------
+# ulimit option changed from -Ss to -s
 # bugfix: missing "fi" in r1289
 #
@@ -438 +439 @@
     printf "\n        -n    node usage (shared/not_shared)           depending on -h"
     printf "\n        -o    OUTPUT control list                      \"\" "
-    printf "\n        -O    use OpenMP                               ---"
+    printf "\n        -O    threads per openMP task                  ---"
     printf "\n        -p    software package list                    \"\" "
     printf "\n        -q    queue                                    \"$queue\" "
@@ -3433 +3434 @@
                    # INCREASE STACK SIZE TO UNLIMITED, BECAUSE OTHERWISE LARGE RUNS
                    # MAY ABORT
-                ulimit -Ss unlimited
+                ulimit -s unlimited
                 printf "\n      threads per task: $threads_per_task  stacksize: unlimited"
              fi

palm/trunk/SOURCE/fft_xy.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-!
+! openmp bugfix: work1 used in Temperton algorithm must be private
 !
 ! Former revisions:
@@ -412 +412 @@
           IF ( forward_fft )  THEN
 
-             !$OMP PARALLEL PRIVATE ( work, i, j, k )
+             !$OMP PARALLEL PRIVATE ( work, work1, i, j, k )
              !$OMP DO
              DO  k = nzb_x, nzt_x
@@ -433 +433 @@
           ELSE
 
-             !$OMP PARALLEL PRIVATE ( work, i, j, k )
+             !$OMP PARALLEL PRIVATE ( work, work1, i, j, k )
              !$OMP DO
              DO  k = nzb_x, nzt_x
@@ -1036 +1036 @@
           IF ( forward_fft )  THEN
 
-             !$OMP PARALLEL PRIVATE ( work, i, j, k )
+             !$OMP PARALLEL PRIVATE ( work, work1, i, j, k )
              !$OMP DO
              DO  k = nzb_y, nzt_y
@@ -1057 +1057 @@
           ELSE
 
-             !$OMP PARALLEL PRIVATE ( work, i, j, k )
+             !$OMP PARALLEL PRIVATE ( work, work1, i, j, k )
              !$OMP DO
              DO  k = nzb_y, nzt_y

palm/trunk/SOURCE/init_pegrid.f90

@@ -356 +356 @@
 !-- 1. transposition  z --> x
 !-- This transposition is not neccessary in case of a 1d-decomposition along x
+    nys_x = nys
+    nyn_x = nyn
+    nny_x = nny
+    nnz_x = nz / pdims(1)
+    nzb_x = 1 + myidx * nnz_x
+    nzt_x = ( myidx + 1 ) * nnz_x
+    sendrecvcount_zx = nnx * nny * nnz_x
+
     IF ( pdims(2) /= 1 )  THEN
-
-       nys_x = nys
-       nyn_x = nyn
-       nny_x = nny
        IF ( MOD( nz , pdims(1) ) /= 0 )  THEN
           WRITE( message_string, * ) 'transposition z --> x:',                &
@@ -367 +371 @@
           CALL message( 'init_pegrid', 'PA0230', 1, 2, 0, 6, 0 )
        ENDIF
-       nnz_x = nz / pdims(1)
-       nzb_x = 1 + myidx * nnz_x
-       nzt_x = ( myidx + 1 ) * nnz_x
-       sendrecvcount_zx = nnx * nny * nnz_x
-
-    ELSE
-!
-!---   Setting of dummy values because otherwise variables are undefined in
-!---   the next step  x --> y
-!---   WARNING: This case has still to be clarified!!!!!!!!!!!!
-       nnz_x = 1
-       nzb_x = 1
-       nzt_x = 1
-       nny_x = nny
-
     ENDIF
 
@@ -403 +392 @@
 !-- 3. transposition  y --> z  (ELSE:  x --> y  in case of 1D-decomposition
 !-- along x)
+    nnx_z = nnx_y
+    nxl_z = nxl_y
+    nxr_z = nxr_y
+    nny_z = (ny+1) / pdims(1)
+    nys_z = myidx * nny_z
+    nyn_z = ( myidx + 1 ) * nny_z - 1
+    sendrecvcount_yz = nnx_y * nny_z * nnz_y
+
     IF ( pdims(2) /= 1 )  THEN
 !
@@ -408 +405 @@
 !--    This transposition is not neccessary in case of a 1d-decomposition
 !--    along x, except that the uptream-spline method is switched on
-       nnx_z = nnx_y
-       nxl_z = nxl_y
-       nxr_z = nxr_y
        IF ( MOD( ny+1 , pdims(1) ) /= 0 )  THEN
           WRITE( message_string, * ) 'transposition y --> z:',            &
@@ -417 +411 @@
           CALL message( 'init_pegrid', 'PA0232', 1, 2, 0, 6, 0 )
        ENDIF
-       nny_z = (ny+1) / pdims(1)
-       nys_z = myidx * nny_z
-       nyn_z = ( myidx + 1 ) * nny_z - 1
-       sendrecvcount_yz = nnx_y * nny_z * nnz_y
 
     ELSE