Changeset 4717 for palm/trunk/SOURCE/turbulence_closure_mod.f90

Timestamp:

Sep 30, 2020 10:27:40 PM (4 years ago)

Author:

pavelkrc

Message:

Fixes and optimizations of OpenMP parallelization, formatting of OpenMP directives

File:

• palm/trunk/SOURCE/turbulence_closure_mod.f90 (modified) (8 diffs)

palm/trunk/SOURCE/turbulence_closure_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Fixes and optimizations of OpenMP parallelization, formatting of OpenMP
+! directives (J. Resler)
+!
+! 4674 2020-09-10 10:36:55Z pavelkrc
 ! Update ACC directives for downward facing USM and LSM surfaces
 !
@@ -2103 +2107 @@
 !--    Not available in case of non-cyclic boundary conditions.
 !--    Default surfaces, upward-facing
-       !$OMP PARALLEL DO PRIVATE(i,j,k,m)
+       !$OMP PARALLEL DO PRIVATE(i, j, k, m, km_sfc)
        !$ACC PARALLEL LOOP PRIVATE(i, j, k, m, km_sfc) &
        !$ACC PRESENT(surf_def_h(0), u, v, drho_air_zw, zu)
@@ -2132 +2136 @@
 !
 !--    Default surfaces, downward-facing surfaces
-       !$OMP PARALLEL DO PRIVATE(i,j,k,m)
-       !$ACC PARALLEL LOOP PRIVATE(i, j, k, m, km_sfc) &
+       !$OMP PARALLEL DO PRIVATE(i, j, k, m)
+       !$ACC PARALLEL LOOP PRIVATE(i, j, k, m) &
        !$ACC PRESENT(surf_def_h(1), u, v, drho_air_zw, zu, km)
        DO  m = 1, surf_def_h(1)%ns
@@ -2158 +2162 @@
 !
 !--    Natural surfaces, upward- and downward facing
-       !$OMP PARALLEL DO PRIVATE(i,j,k,m)
+       !$OMP PARALLEL DO PRIVATE(i, j, k, m, km_sfc)
        !$ACC PARALLEL LOOP PRIVATE(i, j, k, m, km_sfc) &
        !$ACC PRESENT(surf_lsm_h(0), u, v, drho_air_zw, zu)
@@ -2187 +2191 @@
 !
 !--    Natural surfaces, downward-facing surfaces
-       !$OMP PARALLEL DO PRIVATE(i,j,k,m)
-       !$ACC PARALLEL LOOP PRIVATE(i, j, k, m, km_sfc) &
+       !$OMP PARALLEL DO PRIVATE(i, j, k, m)
+       !$ACC PARALLEL LOOP PRIVATE(i, j, k, m) &
        !$ACC PRESENT(surf_lsm_h(1), u, v, drho_air_zw, zu, km)
        DO  m = 1, surf_lsm_h(1)%ns
@@ -2213 +2217 @@
 !
 !--    Urban surfaces, upward-facing
-       !$OMP PARALLEL DO PRIVATE(i,j,k,m)
+       !$OMP PARALLEL DO PRIVATE(i, j, k, m, km_sfc)
        !$ACC PARALLEL LOOP PRIVATE(i, j, k, m, km_sfc) &
        !$ACC PRESENT(surf_usm_h(0), u, v, drho_air_zw, zu)
@@ -2242 +2246 @@
 !
 !--    Urban surfaces, downward-facing surfaces
-       !$OMP PARALLEL DO PRIVATE(i,j,k,m)
-       !$ACC PARALLEL LOOP PRIVATE(i, j, k, m, km_sfc) &
+       !$OMP PARALLEL DO PRIVATE(i, j, k, m)
+       !$ACC PARALLEL LOOP PRIVATE(i, j, k, m) &
        !$ACC PRESENT(surf_usm_h(1), u, v, drho_air_zw, zu, km)
        DO  m = 1, surf_usm_h(1)%ns
@@ -5192 +5196 @@
                                                 ! Data output
     !$ACC END KERNELS
-!$OMP END PARALLEL
+    !$OMP END PARALLEL
 
  END SUBROUTINE tcm_diffusivities_default