Commit 26246554 authored by mponce's avatar mponce
Browse files

fixing basic agent count

parent 8b87fe4e
......@@ -6508,7 +6508,7 @@ Cell_Definition* initialize_cell_definition_from_pugixml( pugi::xml_node cd_node
// node = node.parent();
model_node = model_node.next_sibling( "model" );
model_node = model_node.next_sibling( "model" );
// death_model_index++;
}
......@@ -6516,7 +6516,7 @@ Cell_Definition* initialize_cell_definition_from_pugixml( pugi::xml_node cd_node
// volume
node = cd_node.child( "phenotype" );
node = node.child( "volume" );
node = node.child( "volume" );
if( node )
{
Volume* pV = &(pCD->phenotype.volume);
......
......@@ -475,7 +475,7 @@ std::vector<std::string> my_coloring_function(Cell *pCell)
int total_basic_agent_count(mpi_Environment &world, mpi_Cartesian &cart_topo)
{
int local_count = (*all_basic_agents).size();
int local_count = all_basic_agents.size();
int global_count;
MPI_Reduce(&local_count, &global_count, 1, MPI_INT, MPI_SUM, 0, cart_topo.mpi_cart_comm);
return global_count;
......@@ -500,9 +500,8 @@ int total_live_cell_count(mpi_Environment &world, mpi_Cartesian &cart_topo)
for (int i = 0; i < (*all_cells).size(); i++)
{
Cell* pCell = (*all_cells)[i];
if ((*all_cells)[i]->phenotype.death.dead)
continue;
local_count++;
if(pCell->phenotype.death.dead==false)
{ local_count++;; }
}
int global_count;
MPI_Reduce(&local_count, &global_count, 1, MPI_INT, MPI_SUM, 0, cart_topo.mpi_cart_comm);
......
......@@ -238,7 +238,7 @@ int main( int argc, char* argv[] )
display_simulation_status( std::cout, world, cart_topo );
double timepoint = PhysiCell_globals.current_time;
int basic_agents;
int basic_agents = total_basic_agent_count(world, cart_topo);
int cell_agents = total_cell_agent_count(world, cart_topo);
int alive = total_live_cell_count(world, cart_topo);
int dead = total_dead_cell_count(world, cart_topo);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment