Changeset 3201

Timestamp:

Aug 20, 2018 11:45:01 AM (6 years ago)

Author:

sward

Message:

Added missing preprocessor directive, corrected default value for restarts

File:

• palm/trunk/SOURCE/multi_agent_system_mod.f90 (modified) (7 diffs)

palm/trunk/SOURCE/multi_agent_system_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix, missing pre-processor directive. Set default 
+! read_agents_from_restartfile = .FALSE. restarts not yet implemented.
+! 
+! 3198 2018-08-15 09:23:10Z sward
 ! Now using time_since_reference_point; moved multi_agent_system_start and
 ! multi_agent_system_end to control_parameters; renamed NAMELIST agents_par to
@@ -121 +125 @@
     LOGICAL ::  agents_active = .FALSE.                !< flag for agent system
     LOGICAL ::  random_start_position_agents = .TRUE.  !< namelist parameter (see documentation)
-    LOGICAL ::  read_agents_from_restartfile = .TRUE.  !< namelist parameter (see documentation)
+    LOGICAL ::  read_agents_from_restartfile = .FALSE.  !< namelist parameter (see documentation)
     LOGICAL ::  agent_own_timestep = .FALSE.           !< namelist parameter (see documentation)
 
@@ -1165 +1169 @@
           ENDDO
        ENDIF
+#if defined( __parallel )
 !
 !--    Gather all agents on PE0 for output
@@ -1214 +1219 @@
 !--    tag 0
        CALL MPI_BARRIER( comm2d, ierr )
+#endif
        IF ( myid == 0 ) THEN
+#if defined( __parallel )
           agents=>out_agents
+#else
+          agents=>trf_agents
+#endif
 
 #if defined( __netcdf )
@@ -2159 +2169 @@
 
 !
-!--    Accumulate the number of agents transferred between the subdomains
-#if defined( __parallel )
+!--    Accumulate the number of agents transferred between the subdomains)
        CALL mas_eh_ghost_exchange
-#endif
 
        CALL cpu_log( log_point_s(18), 'mas_eh_exchange_horiz', 'stop' )
@@ -2178 +2186 @@
 
        IMPLICIT NONE
-       
+
+#if defined( __parallel )
+
        INTEGER(iwp) ::  i           !< grid index (x) of agent positition
        INTEGER(iwp) ::  ip          !< index variable along x
@@ -2462 +2472 @@
 
        ENDIF
+
+#endif
 
     END SUBROUTINE mas_eh_ghost_exchange