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

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
-! 
+!
+!
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Fix calculation of force_radiation_call
+! 
+! 4666 2020-09-04 19:22:56Z maronga
 ! Bugfix: wrong value for g_d for vegetation_type = 7 (0.13 -> 0.03)
 !
@@ -2196 +2199 @@
          == 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.