Changeset 3268 for palm/trunk

Timestamp:

Sep 21, 2018 1:45:37 PM (6 years ago)

Author:

sward

Message:

Fix in pointer assignment in MAS and MAS-Examples updated

Location:

palm/trunk

Files:

• EXAMPLES/agents/canyon/INPUT/canyon_p3d (modified) (3 diffs)
• EXAMPLES/agents/canyon/OUTPUT/ani_agt.py (modified) (1 diff)
• EXAMPLES/agents/corners/INPUT/corners_p3d (modified) (1 diff)
• SOURCE/multi_agent_system_mod.f90 (modified) (2 diffs)

palm/trunk/EXAMPLES/agents/canyon/INPUT/canyon_p3d

@@ -35 +35 @@
  &runtime_parameters
    !-- simulation time
-      end_time                = 200.0, 
+      end_time                = 10800.0, 
 
    !-- others
@@ -46 +46 @@
 
 
- &agents_par
-    dt_arel                = 3.1,
-    dt_write_agent_data    = .1,
-    dt_agent = 0.02,
-    number_of_agent_groups = 2,
-    adx                    = 1.8,1.8,
-    ady                    = 1.,1.,
-    asl                    = 13.,13.,
-    asr                    = 27.,27.,
-    ass                    = .5,38.,
-    asn                    = 2.,39.5,
-    at_x                   = 20.,20.,
-    at_y                   = 999.,-999.,  ! chosen far out of domain so that agents walk nearly parallel
+ &agent_parameters
+    multi_agent_system_start = 10500.,
+    dt_arel                  = 3.1,
+    dt_write_agent_data      = .04,
+    number_of_agent_groups   = 2,
+    adx                      = 1.8,1.8,
+    ady                      = 1.,1.,
+    asl                      = 13.,13.,
+    asr                      = 27.,27.,
+    ass                      = .5,38.,
+    asn                      = 2.,39.5,
+    at_x                     = 20.,20.,
+    at_y                     = 999.,-999.,  ! chosen far out of domain so that agents walk nearly parallel
 
 
@@ -66 +66 @@
 
  &prepro_par
-      tolerance_dp  = 1.41, 1.41,
+      tolerance_dp  = .71,
 
     /

palm/trunk/EXAMPLES/agents/canyon/OUTPUT/ani_agt.py

@@ -82 +82 @@
     return ax,
 
-anim = animation.FuncAnimation(fig, animate, frames=Nt, interval=60, blit=False,save_count=0)
+anim = animation.FuncAnimation(fig, animate, frames=Nt, interval=20, blit=False,save_count=0)
 anim.save('ags.mp4', dpi=200, writer='ffmpeg')

palm/trunk/EXAMPLES/agents/corners/INPUT/corners_p3d

@@ -46 +46 @@
 
 
- &agents_par
+ &agent_parameters
+    dim_size_agtnum_manual = 50,
     dt_arel                = 12.,
     dt_write_agent_data    = .05,

palm/trunk/SOURCE/multi_agent_system_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Cleaned up agent pointer assignment in output routine
+! 
+! 3248 2018-09-14 09:42:06Z sward
 ! Minor formating changes
 ! 
@@ -1365 +1368 @@
 
 #endif
-
-          DEALLOCATE(out_agents)
+          agents => NULL()
+#if defined( __parallel )
+          IF ( ALLOCATED( out_agents ) ) DEALLOCATE( out_agents )
+#endif
        ELSE
           CALL cpu_log( log_point_s(17), 'mas_data_output', 'stop' )
        ENDIF
 
+       IF ( ALLOCATED( trf_agents ) ) DEALLOCATE( trf_agents )
 
     END SUBROUTINE mas_data_output_agents