Changeset 4236 for palm

Timestamp:

Sep 25, 2019 11:26:18 AM (5 years ago)

Author:

knoop

Message:

Added missing OpenMP directives within "transpose" and "tridia_solver"

Location:

palm/trunk/SOURCE

Files:

• transpose.f90 (modified) (19 diffs)
• tridia_solver_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/transpose.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Added missing OpenMP directives
+! 
+! 4182 2019-08-22 15:20:23Z scharf
 ! Corrected "Former revisions" section
 ! 
@@ -162 +165 @@
 !--    Reorder transposed array
 !$OMP  PARALLEL PRIVATE ( i, j, k, l, ys )
-!$OMP  DO
        DO  l = 0, pdims(2) - 1
           ys = 0 + l * ( nyn_x - nys_x + 1 )
@@ -169 +171 @@
           !$ACC PRESENT(f_out, work)
 #endif
+          !$OMP DO
           DO  i = nxl_y, nxr_y
              DO  k = nzb_y, nzt_y
@@ -176 +179 @@
              ENDDO
           ENDDO
+          !$OMP END DO NOWAIT
        ENDDO
 !$OMP  END PARALLEL
@@ -298 +302 @@
 !--    Reorder input array for transposition
 !$OMP  PARALLEL PRIVATE ( i, j, k, l, xs )
-!$OMP  DO
        DO  l = 0, pdims(1) - 1
           xs = 0 + l * nnx
@@ -305 +308 @@
           !$ACC PRESENT(work, f_in)
 #endif
+          !$OMP DO
           DO  k = nzb_x, nzt_x
              DO  i = xs, xs + nnx - 1
@@ -312 +316 @@
              ENDDO
           ENDDO
+          !$OMP END DO NOWAIT
        ENDDO
 !$OMP  END PARALLEL
@@ -460 +465 @@
 !--    Reorder input array for transposition
 !$OMP  PARALLEL PRIVATE ( i, j, k, l, ys )
-!$OMP  DO
        DO  l = 0, pdims(2) - 1
           ys = 0 + l * ( nyn_x - nys_x + 1 )
@@ -467 +471 @@
           !$ACC PRESENT(work, f_in)
 #endif
+          !$OMP DO
           DO  i = nxl_y, nxr_y
              DO  k = nzb_y, nzt_y
@@ -474 +479 @@
              ENDDO
           ENDDO
+          !$OMP END DO NOWAIT
        ENDDO
 !$OMP  END PARALLEL
@@ -749 +755 @@
 !--    Reorder transposed array
 !$OMP  PARALLEL PRIVATE ( i, j, k, l, zs )
-!$OMP  DO
        DO  l = 0, pdims(1) - 1
           zs = 1 + l * ( nzt_y - nzb_y + 1 )
@@ -756 +761 @@
           !$ACC PRESENT(f_out, work)
 #endif
+          !$OMP DO
           DO  j = nys_z, nyn_z
              DO  k = zs, zs + nzt_y - nzb_y
@@ -763 +769 @@
              ENDDO
           ENDDO
+          !$OMP END DO NOWAIT
        ENDDO
 !$OMP  END PARALLEL
@@ -909 +916 @@
 !--    Reorder transposed array
 !$OMP  PARALLEL PRIVATE ( i, j, k, l, xs )
-!$OMP  DO
        DO  l = 0, pdims(1) - 1
           xs = 0 + l * nnx
@@ -916 +922 @@
           !$ACC PRESENT(f_out, work)
 #endif
+          !$OMP DO
           DO  k = nzb_x, nzt_x
              DO  i = xs, xs + nnx - 1
@@ -923 +930 @@
              ENDDO
           ENDDO
+          !$OMP END DO NOWAIT
        ENDDO
 !$OMP  END PARALLEL
@@ -1028 +1036 @@
 !--    Reorder input array for transposition
 !$OMP  PARALLEL PRIVATE ( i, j, k, l, zs )
-!$OMP  DO
        DO  l = 0, pdims(1) - 1
           zs = 1 + l * ( nzt_y - nzb_y + 1 )
@@ -1035 +1042 @@
           !$ACC PRESENT(work, f_in)
 #endif
+          !$OMP DO
           DO  j = nys_z, nyn_z
              DO  k = zs, zs + nzt_y - nzb_y
@@ -1042 +1050 @@
              ENDDO
           ENDDO
+          !$OMP END DO NOWAIT
        ENDDO
 !$OMP  END PARALLEL

palm/trunk/SOURCE/tridia_solver_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Added missing OpenMP directives
+! 
+! 4182 2019-08-22 15:20:23Z scharf
 ! Corrected "Former revisions" section
 ! 
@@ -249 +252 @@
 #endif
 
+          !$OMP PARALLEL PRIVATE(i,j,k)
+
 !
 !--       Forward substitution
@@ -258 +263 @@
              !$ACC LOOP COLLAPSE(2)
 #endif
+             !$OMP DO
              DO  j = nys_z, nyn_z
                 DO  i = nxl_z, nxr_z
@@ -286 +292 @@
              !$ACC LOOP COLLAPSE(2)
 #endif
+             !$OMP DO
              DO  j = nys_z, nyn_z
                 DO  i = nxl_z, nxr_z
@@ -301 +308 @@
           !$ACC END PARALLEL
 #endif
+
+          !$OMP END PARALLEL
 
 !