Changeset 3165

Timestamp:

Jul 24, 2018 1:12:42 PM (6 years ago)

Author:

sward

Message:

Added agent ID output

Location:

palm/trunk/SOURCE

Files:

• multi_agent_system_mod.f90 (modified) (3 diffs)
• netcdf_interface_mod.f90 (modified) (3 diffs)

palm/trunk/SOURCE/multi_agent_system_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Added agent ID output
+! 
+! 3160 2018-07-20 11:52:56Z sward
 ! Changed C_SIZEOF to STORAGE_SIZE
 ! 
@@ -1206 +1209 @@
           agents=>out_agents
 
-
 #if defined( __netcdf )
 
@@ -1247 +1249 @@
                                   count = (/ out_noa /) )
           CALL netcdf_handle_error( 'mas_data_output_agents', 7 )
+
+          nc_stat = NF90_PUT_VAR( id_set_agt, id_var_agt(6), agents%id,        &
+                                  start = (/ 1, agt_time_count /),             &
+                                  count = (/ out_noa /) )
+          CALL netcdf_handle_error( 'mas_data_output_agents', 8 )
+
 
 !           nc_stat = NF90_PUT_VAR( id_set_agt, id_var_agt(6), agents%pm10,      &

palm/trunk/SOURCE/netcdf_interface_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Added agent ID output
+! 
+! 3159 2018-07-20 11:20:01Z sward
 ! Added multi agent system
 ! 
@@ -287 +290 @@
     CHARACTER (LEN=16), DIMENSION(13) ::  agt_var_names =                      &
           (/ 'ag_x            ', 'ag_y            ', 'ag_wind         ',       &
-             'ag_temp         ', 'ag_group        ', 'PM10            ',       &
-             'PM25            ', 'ag_therm_comf   ', 'ag_uv           ',       &
-             'not_used        ', 'not_used        ', 'not_used        ',       &
+             'ag_temp         ', 'ag_group        ', 'ag_id           ',       &
+             'PM10            ', 'PM25            ', 'ag_therm_comf   ',       &
+             'ag_uv           ', 'not_used        ', 'not_used        ',       &
              'not_used        ' /)
 
     CHARACTER (LEN=16), DIMENSION(13) ::  agt_var_units = &
           (/ 'meters          ', 'meters          ', 'm/s             ',       &
-             'K               ', 'dim_less        ', 'tbd             ',       &
+             'K               ', 'dim_less        ', 'dim_less        ',       &
              'tbd             ', 'tbd             ', 'tbd             ',       &
-             'not_used        ', 'not_used        ', 'not_used        ',       &
+             'tbd             ', 'not_used        ', 'not_used        ',       &
              'not_used        ' /)
 
@@ -1986 +1989 @@
 !
 !--       Define the variables
-          DO  i = 1, 5
+          DO  i = 1, 6
              CALL netcdf_create_var( id_set_agt, (/ id_dim_agtnum,             &
                                      id_dim_time_agt /), agt_var_names(i),     &