Changeset 4717 for palm/trunk/SOURCE/surface_layer_fluxes_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/surface_layer_fluxes_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/surface_layer_fluxes_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Fixes and optimizations of OpenMP parallelization, formatting of OpenMP
+! directives (J. Resler)
+!
+! 4691 2020-09-22 14:38:38Z suehring
 ! Bugfix for commit 4593 in vector branch of calc_ol
 !
@@ -720 +724 @@
 !-- This is because the scalar coefficients are also used for other scalars such as passive scalars,
 !-- chemistry and aerosols.
-    !$OMP PARALLEL  DO PRIVATE( z_mo )
+    !$OMP PARALLEL DO PRIVATE( z_mo )
     !$ACC PARALLEL LOOP PRIVATE(z_mo) &
     !$ACC PRESENT(surf)
@@ -1050 +1054 @@
 !
 !--    Calculate the Obukhov length using Newton iteration
-       !$OMP PARALLEL DO PRIVATE(i, j, z_mo) &
-       !$OMP PRIVATE(ol_old, ol_m, ol_l, ol_u, f, f_d_ol)
+       !$OMP PARALLEL DO PRIVATE(i, j, z_mo, ol_old, iter, ol_m, ol_l, ol_u, f, f_d_ol)
        !$ACC PARALLEL LOOP PRIVATE(i, j, z_mo) &
        !$ACC PRIVATE(ol_old, ol_m, ol_l, ol_u, f, f_d_ol) &
@@ -1583 +1586 @@
 
           IF ( bulk_cloud_model  .OR.  cloud_droplets )  THEN
-            !$OMP PARALLEL DO PRIVATE( i, j, k, z_mo )
+             !$OMP PARALLEL DO PRIVATE( i, j, k, z_mo )
              DO  m = 1, surf%ns
                 i = surf%i(m)
@@ -1952 +1955 @@
 !--    Compute wsus l={0,1} and wsvs l={2,3}
        IF ( mom_w )  THEN
-          !$OMP PARALLEL  DO PRIVATE( i, j, k )
+          !$OMP PARALLEL DO PRIVATE( i, j, k )
           DO  m = 1, surf%ns
              i = surf%i(m)