Changeset 3899 for palm/trunk/SOURCE/prognostic_equations.f90

Timestamp:

Apr 16, 2019 2:05:27 PM (5 years ago)

Author:

monakurppa

Message:

corrected the OpenMP implementation for salsa and some minor bugs in salsa_mod

File:

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

palm/trunk/SOURCE/prognostic_equations.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Corrections in the OpenMP version of salsa
+! 
+! 3887 2019-04-12 08:47:41Z schwenkel
 ! Implicit Bugfix for chemistry model, loop for non_transport_physics over 
 ! ghost points is avoided. Instead introducing module_interface_exchange_horiz.
@@ -562 +565 @@
           THEN
              CALL cpu_log( log_point_s(90), 'salsa processes ', 'start' )
-             !$OMP PARALLEL PRIVATE (i,j,ib,ic,icc,ig)
+             !$OMP PARALLEL PRIVATE (i,j)
+!
+!--          Call salsa processes
              !$OMP DO
-!
-!--          Call salsa processes
              DO  i = nxl, nxr
                 DO  j = nys, nyn
@@ -573 +576 @@
                 ENDDO
              ENDDO
+             !$OMP END PARALLEL
 
              CALL cpu_log( log_point_s(90), 'salsa processes ', 'stop' )
-             
+
              CALL cpu_log( log_point_s(91), 'salsa exch-horiz ', 'start' )
 !
@@ -599 +603 @@
              ENDIF
              CALL cpu_log( log_point_s(91), 'salsa exch-horiz ', 'stop' )
-             
-             !$OMP END PARALLEL
              last_salsa_time = time_since_reference_point
 
@@ -631 +633 @@
 !--       Tendency terms for u-velocity component. Please note, in case of 
 !--       non-cyclic boundary conditions the grid point i=0 is excluded from
-!--       the prognostic equations for the u-component.    
+!--       the prognostic equations for the u-component.
           IF ( i >= nxlu )  THEN
 
@@ -1175 +1177 @@
           THEN
              CALL cpu_log( log_point_s(90), 'salsa processes ', 'start' )
-             !$OMP PARALLEL PRIVATE (i,j,ib,ic,icc,ig)
+             !$OMP PARALLEL PRIVATE (i,j)
              !$OMP DO
 !
@@ -1186 +1188 @@
                 ENDDO
              ENDDO
+             !$OMP END PARALLEL
 
              CALL cpu_log( log_point_s(90), 'salsa processes ', 'stop' )
@@ -1210 +1213 @@
              ENDIF
              CALL cpu_log( log_point_s(91), 'salsa exch-horiz ', 'stop' )
-             !$OMP END PARALLEL
              last_salsa_time = time_since_reference_point
           ENDIF