diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 35b8a8b3e..ac75cf2ca 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,7 @@ jobs: {project: "physiboss-tutorial", name: "PhysiBoSS Tutorial", binary: "project", config: "config/cell_cycle/PhysiCell_settings.xml", max_time: 300, output_folder: "output"}, {project: "worm-sample", name: "PhysiCell worm", binary: "worm", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: "output"}, {project: "virus-macrophage-sample", name: "Virus Macrophage", binary: "virus-sample", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: "output"}, - {project: "mechano-sample", name: "PhysiCell Mechano", binary: "project", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: "output"}, + {project: "mechano-sample", name: "PhysiCell Mechano", binary: "project", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: ""}, {project: "cancer-biorobots-sample", name: "PhysiCell Cancer Biorobots", binary: "cancer_biorobots", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: ""}, {project: "biorobots-sample", name: "PhysiCell Biorobots", binary: "biorobots", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: ""}, {project: "celltypes3-sample", name: "PhysiCell Celltypes3", binary: "celltypes3", config: "config/PhysiCell_settings.xml", max_time: 120, output_folder: ""}, diff --git a/.github/workflows/tests_cmake.yml b/.github/workflows/tests_cmake.yml index a7b80ce78..0546ee76c 100644 --- a/.github/workflows/tests_cmake.yml +++ b/.github/workflows/tests_cmake.yml @@ -24,7 +24,7 @@ jobs: {"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"}, {"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"}, {"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"}, - {"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"}, + {"use_physiboss": false, cwd: "build/sample_projects/mechano", name: "PhysiCell Mechano", binary: "mechano", config: "config/PhysiCell_settings.xml", max_time: 120, validation_output_folder: ""}, {"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: ""}, {"use_physiboss": false, cwd: "build/sample_projects/biorobots", name: "PhysiCell Biorobots", binary: "biorobots", config: "config/PhysiCell_settings.xml", max_time: 120, validation_output_folder: ""}, {"use_physiboss": false, cwd: "build/sample_projects/celltypes3", name: "PhysiCell Celltypes3", binary: "celltypes3", config: "config/PhysiCell_settings.xml", max_time: 120, validation_output_folder: ""}, diff --git a/core/PhysiCell_cell.cpp b/core/PhysiCell_cell.cpp index 2755d7d5d..e91086f8b 100644 --- a/core/PhysiCell_cell.cpp +++ b/core/PhysiCell_cell.cpp @@ -1069,7 +1069,7 @@ void Cell::add_potentials(Cell* other_agent) state.neighbors.push_back(other_agent); // move here in 1.10.2 so non-adhesive cells also added. } ///////////////////////////////////////////////////////////////// - if( fabs(temp_r) < 1e-16 ) + if( fabs(temp_r) < 1e-16 || is_movable == false ) { return; } temp_r /= distance; // for( int i = 0 ; i < 3 ; i++ ) diff --git a/core/PhysiCell_cell_container.cpp b/core/PhysiCell_cell_container.cpp index 0c5850b1d..a31302c1f 100644 --- a/core/PhysiCell_cell_container.cpp +++ b/core/PhysiCell_cell_container.cpp @@ -240,7 +240,7 @@ void Cell_Container::update_all_cells(double t, double phenotype_dt_ , double me for( int i=0; i < (*all_cells).size(); i++ ) { Cell* pC = (*all_cells)[i]; - if( pC->functions.update_velocity && pC->is_out_of_domain == false && pC->is_movable ) + if( pC->functions.update_velocity && pC->is_out_of_domain == false ) { pC->functions.update_velocity( pC,pC->phenotype,time_since_last_mechanics ); } } diff --git a/tests/cases/output_mechano-sample/snapshot00000000.svg b/tests/cases/output_mechano-sample/snapshot00000000.svg index fc7ee99ec..c4c8a7bb7 100644 --- a/tests/cases/output_mechano-sample/snapshot00000000.svg +++ b/tests/cases/output_mechano-sample/snapshot00000000.svg @@ -2225,7 +2225,7 @@ - 0 days, 0 hours, 0 minutes, and 0.0032 seconds + 0 days, 0 hours, 0 minutes, and 0.0159 seconds diff --git a/tests/cases/output_mechano-sample/snapshot00000001.svg b/tests/cases/output_mechano-sample/snapshot00000001.svg index b21170487..5d84c00a2 100644 --- a/tests/cases/output_mechano-sample/snapshot00000001.svg +++ b/tests/cases/output_mechano-sample/snapshot00000001.svg @@ -2225,7 +2225,7 @@ - 0 days, 0 hours, 0 minutes, and 0.6763 seconds + 0 days, 0 hours, 0 minutes, and 1.4565 seconds diff --git a/tests/cases/output_mechano-sample/snapshot00000002.svg b/tests/cases/output_mechano-sample/snapshot00000002.svg index e01fae8a6..f1c8d5ebf 100644 --- a/tests/cases/output_mechano-sample/snapshot00000002.svg +++ b/tests/cases/output_mechano-sample/snapshot00000002.svg @@ -2225,7 +2225,7 @@ - 0 days, 0 hours, 0 minutes, and 1.3726 seconds + 0 days, 0 hours, 0 minutes, and 3.0496 seconds