Changeset 4717 for palm/trunk/SOURCE/land_surface_model_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/land_surface_model_mod.f90 (modified) (10 diffs)

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Fixes and optimizations of OpenMP parallelization, formatting of OpenMP
+! directives (J. Resler)
+!
+! 4716 2020-09-30 22:06:37Z pavelkrc
 ! Revert change at water surfaces (previous)
 !
@@ -1744 +1748 @@
     i_off = surf%ioff
 
-    !$OMP PARALLEL PRIVATE (m, i, j, k, lambda_h_sat, ke, lambda_soil, lambda_surface, ueff,       &
-    !$OMP&                  c_surface_tmp, f1,m_total, f2, e_s, e, f3, m_min, m_liq_max, q_s,      &
-    !$OMP&                  f_qsws_veg, f_qsws_soil, f_qsws_liq, f_shf, f_qsws, e_s_dt, dq_s_dt,   &
-    !$OMP&                  coef_1, coef_2, tend)
-    !$OMP DO SCHEDULE (STATIC)
+    !$OMP PARALLEL DO PRIVATE (m, i, j, k, lambda_h_sat, ke, lambda_soil, lambda_surface, ueff,    &
+    !$OMP&                     c_surface_tmp, f1,m_total, f2, e_s, e, f3, m_min, m_liq_max, q_s,   &
+    !$OMP&                     f_qsws_veg, f_qsws_soil, f_qsws_liq, f_shf, f_qsws, e_s_dt, dq_s_dt,&
+    !$OMP&                     coef_1, coef_2, tend) SCHEDULE (STATIC)
     DO  m = 1, surf%ns
 
@@ -2109 +2112 @@
        surf%shf(m) = - f_shf * ( surf%pt1(m) - surf%pt_surface(m) ) / c_p
 !
-! update the 3d field of rad_lw_out array to have consistent output
+!--    update the 3d field of rad_lw_out array to have consistent output
        IF ( upward )  THEN
           IF ( radiation_scheme == 'rrtmg' ) THEN
@@ -2246 +2249 @@
 
     ENDDO
-    !$OMP END PARALLEL
 
 !
@@ -2294 +2296 @@
        REAL(wp) ::  resistance    !< aerodynamic and soil resistance term
 
-
-       !$OMP PARALLEL PRIVATE (m, i, j, k, e_s, q_s, resistance)
-       !$OMP DO SCHEDULE (STATIC)
+       !$OMP PARALLEL DO PRIVATE (m, i, j, k, e_s, q_s, resistance) SCHEDULE (STATIC)
        DO  m = 1, surf%ns
 
@@ -2330 +2330 @@
                                   ( 1.0_wp + 0.61_wp * surf%q_surface(m) )
 
-
-
        ENDDO
-       !$OMP END PARALLEL
 
     END SUBROUTINE calc_q_surface
@@ -5555 +5552 @@
        ENDIF
 
-       !$OMP PARALLEL PRIVATE (m, k, lambda_temp, lambda_h_sat, ke, tend, gamma_temp, h_vg,       &
-       !$OMP&                  m_total, root_extr)
-       !$OMP DO SCHEDULE (STATIC)
+       !$OMP PARALLEL DO PRIVATE (m, k, lambda_temp, lambda_h_sat, ke, tend, gamma_temp, h_vg,    &
+       !$OMP&                     m_total, root_extr) SCHEDULE (STATIC)
        DO  m = 1, surf%ns
 
@@ -5827 +5823 @@
 
        ENDDO
-       !$OMP END PARALLEL
 !
 !--    Debug location message
@@ -7760 +7755 @@
 !       REAL(wp) :: re_0 !< near-surface roughness Reynolds number
 
-       !$OMP DO PRIVATE (m, i, j) SCHEDULE (STATIC) REDUCTION(.OR.:flag_exceed_z0, flag_exceed_z0h)
+       !$OMP PARALLEL DO PRIVATE (m, i, j) SCHEDULE (STATIC)                                      &
+       !$OMP&            REDUCTION(.OR.:flag_exceed_z0, flag_exceed_z0h)
        DO  m = 1, surf_lsm_h(0)%ns
 !--       only upward facin horizontal surfaces are considered for water surface processing
@@ -7820 +7816 @@
           ENDIF
        ENDDO
-       !$OMP END DO
 #if defined( __parallel )
        CALL MPI_ALLREDUCE( MPI_IN_PLACE, flag_exceed_z0, 1, MPI_LOGICAL,       &