Changeset 4669 for palm/trunk/SOURCE/urban_surface_mod.f90

Timestamp:

Sep 9, 2020 1:43:47 PM (4 years ago)

Author:

pavelkrc

Message:

Fix multiple issues with radiation call times

File:

• palm/trunk/SOURCE/urban_surface_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/urban_surface_mod.f90

@@ -27 +27 @@
 ! -----------------
 ! $Id$
+! Fix calculation of force_radiation_call
+!
+! 4668 2020-09-09 13:00:16Z pavelkrc
 ! Limit vertical r_a similarly to horizontal
 !
@@ -8427 +8430 @@
       IF ( intermediate_timestep_count == intermediate_timestep_count_max-1 )  THEN
 #if defined( __parallel )
-        IF ( collective_wait )  CALL MPI_BARRIER( comm2d, ierr )
-        CALL MPI_ALLREDUCE( force_radiation_call_l, force_radiation_call,                          &
-                            1, MPI_LOGICAL, MPI_LOR, comm2d, ierr )
+        IF ( .NOT. force_radiation_call ) THEN
+           IF ( collective_wait )  CALL MPI_BARRIER( comm2d, ierr )
+           CALL MPI_ALLREDUCE( force_radiation_call_l, force_radiation_call,                      &
+                               1, MPI_LOGICAL, MPI_LOR, comm2d, ierr )
+        ENDIF
 #else
-        force_radiation_call = force_radiation_call_l
+        force_radiation_call = force_radiation_call .OR. force_radiation_call_l
 #endif
         force_radiation_call_l = .FALSE.