Skip to content

Commit 167c817

Browse files
authored
Merge pull request #430 from vincent-noel/fix/heberlr/pr-neighbor-list-for-non-movable-cells
Fix/heberlr/pr neighbor list for non movable cells
2 parents 39be5bd + e81f443 commit 167c817

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
{project: "physiboss-tutorial", name: "PhysiBoSS Tutorial", binary: "project", config: "config/cell_cycle/PhysiCell_settings.xml", max_time: 300, output_folder: "output"},
2626
{project: "worm-sample", name: "PhysiCell worm", binary: "worm", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: "output"},
2727
{project: "virus-macrophage-sample", name: "Virus Macrophage", binary: "virus-sample", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: "output"},
28-
{project: "mechano-sample", name: "PhysiCell Mechano", binary: "project", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: "output"},
28+
{project: "mechano-sample", name: "PhysiCell Mechano", binary: "project", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: ""},
2929
{project: "cancer-biorobots-sample", name: "PhysiCell Cancer Biorobots", binary: "cancer_biorobots", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: ""},
3030
{project: "biorobots-sample", name: "PhysiCell Biorobots", binary: "biorobots", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: ""},
3131
{project: "celltypes3-sample", name: "PhysiCell Celltypes3", binary: "celltypes3", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: ""},

‎.github/workflows/tests_cmake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
{"use_physiboss": true, cwd: "build/sample_projects_intracellular/boolean/tutorial", name: "PhysiBoSS Tutorial", binary: "tutorial", config: "config/cell_cycle/PhysiCell_settings.xml", max_time: 300, validation_output_folder: "output_physiboss-tutorial"},
2525
{"use_physiboss": false, cwd: "build/sample_projects/worm", name: "PhysiCell worm", binary: "worm", config: "config/PhysiCell_settings.xml", max_time: 120, validation_output_folder: "output_worm-sample"},
2626
{"use_physiboss": false, cwd: "build/sample_projects/virus_macrophage", name: "Virus Macrophage", binary: "virus_macrophage", config: "config/PhysiCell_settings.xml", max_time: 120, validation_output_folder: "output_virus-macrophage-sample"},
27-
{"use_physiboss": false, cwd: "build/sample_projects/mechano", name: "PhysiCell Mechano", binary: "mechano", config: "config/PhysiCell_settings.xml", max_time: 120, validation_output_folder: "output_mechano-sample"},
27+
{"use_physiboss": false, cwd: "build/sample_projects/mechano", name: "PhysiCell Mechano", binary: "mechano", config: "config/PhysiCell_settings.xml", max_time: 120, validation_output_folder: ""},
2828
{"use_physiboss": false, cwd: "build/sample_projects/cancer_biorobots", name: "PhysiCell Cancer Biorobots", binary: "cancer_biorobots", config: "config/PhysiCell_settings.xml", max_time: 120, validation_output_folder: ""},
2929
{"use_physiboss": false, cwd: "build/sample_projects/biorobots", name: "PhysiCell Biorobots", binary: "biorobots", config: "config/PhysiCell_settings.xml", max_time: 120, validation_output_folder: ""},
3030
{"use_physiboss": false, cwd: "build/sample_projects/celltypes3", name: "PhysiCell Celltypes3", binary: "celltypes3", config: "config/PhysiCell_settings.xml", max_time: 120, validation_output_folder: ""},

‎core/PhysiCell_cell.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,7 @@ void Cell::add_potentials(Cell* other_agent)
10791079
state.neighbors.push_back(other_agent); // move here in 1.10.2 so non-adhesive cells also added.
10801080
}
10811081
/////////////////////////////////////////////////////////////////
1082-
if( fabs(temp_r) < 1e-16 )
1082+
if( fabs(temp_r) < 1e-16 || is_movable == false )
10831083
{ return; }
10841084
temp_r /= distance;
10851085
// for( int i = 0 ; i < 3 ; i++ )

‎core/PhysiCell_cell_container.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ void Cell_Container::update_all_cells(double t, double phenotype_dt_ , double me
210210
for( int i=0; i < (*all_cells).size(); i++ )
211211
{
212212
Cell* pC = (*all_cells)[i];
213-
if( pC->functions.update_velocity && pC->is_out_of_domain == false && pC->is_movable )
213+
if( pC->functions.update_velocity && pC->is_out_of_domain == false )
214214
{ pC->functions.update_velocity( pC,pC->phenotype,time_since_last_mechanics ); }
215215
}
216216

‎tests/cases/output_mechano-sample/snapshot00000000.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎tests/cases/output_mechano-sample/snapshot00000001.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎tests/cases/output_mechano-sample/snapshot00000002.svg‎

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)