Skip to content

Update force class names following Chaste force restructure #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 5 commits into
base: main
Choose a base branch
from
+26 −22
Open

Update force class names following Chaste force restructure #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fed549e
Initial plan
Copilot May 3, 2026
cec147a
Replace GeneralisedLinearSpringForce with LinearSpringForce/Pathmanat…
Copilot May 3, 2026
87c1aeb
Also replace DifferentialAdhesionGeneralisedLinearSpringForce and Rep…
Copilot May 3, 2026
45fb0ec
Apply review suggestions: DifferentialAdhesionPathmanathanInteraction…
Copilot May 3, 2026
c9aaded
Updating User Project to Latest Force Hierachy
jmosborne May 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions test/TestCellSortingLiteratePaper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@

#include "MeshBasedCellPopulationWithGhostNodes.hpp"
#include "HoneycombMeshGenerator.hpp"
#include "DifferentialAdhesionGeneralisedLinearSpringForce.hpp"
#include "DifferentialAdhesionPathmanathanInteractionForce.hpp"
#include "DifferentialAdhesionLinearSpringForce.hpp"

#include "OnLatticeSimulation.hpp"
#include "CellPopulationAdjacencyMatrixWriter.hpp"
Expand Down Expand Up @@ -311,8 +312,8 @@ class TestCellSortingLiteratePaper : public AbstractCellBasedWithTimingsTestSuit
simulator.SetEndTime(M_TIME_TO_STEADY_STATE);

// Create a force law and pass it to the simulation
MAKE_PTR(DifferentialAdhesionGeneralisedLinearSpringForce<2>, p_differential_adhesion_force);
p_differential_adhesion_force->SetMeinekeSpringStiffness(50.0);
MAKE_PTR(DifferentialAdhesionPathmanathanInteractionForce<2>, p_differential_adhesion_force);
p_differential_adhesion_force->SetSpringStiffness(50.0);
p_differential_adhesion_force->SetHomotypicLabelledSpringConstantMultiplier(1.0);
p_differential_adhesion_force->SetHeterotypicSpringConstantMultiplier(0.1);
p_differential_adhesion_force->SetCutOffLength(cut_off_length);
Expand Down Expand Up @@ -384,8 +385,8 @@ class TestCellSortingLiteratePaper : public AbstractCellBasedWithTimingsTestSuit
simulator.SetEndTime(M_TIME_TO_STEADY_STATE);

// Create a force law and pass it to the simulation
MAKE_PTR(DifferentialAdhesionGeneralisedLinearSpringForce<2>, p_differential_adhesion_force);
p_differential_adhesion_force->SetMeinekeSpringStiffness(50.0);
MAKE_PTR(DifferentialAdhesionLinearSpringForce<2>, p_differential_adhesion_force);
p_differential_adhesion_force->SetSpringStiffness(50.0);
p_differential_adhesion_force->SetHomotypicLabelledSpringConstantMultiplier(1.0);
p_differential_adhesion_force->SetHeterotypicSpringConstantMultiplier(0.1);
simulator.AddForce(p_differential_adhesion_force);
Expand Down
11 changes: 6 additions & 5 deletions test/TestCylindricalCryptLiteratePaper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
#include "OnLatticeSimulation.hpp"

#include "NagaiHondaForce.hpp"
#include "RepulsionForce.hpp"
#include "LinearSpringForce.hpp"
#include "PathmanathanInteractionForce.hpp"
#include "DiffusionCaUpdateRule.hpp"
#include "VolumeConstraintPottsUpdateRule.hpp"
#include "AdhesionPottsUpdateRule.hpp"
Expand Down Expand Up @@ -329,8 +330,8 @@ class TestCylindricalCryptLiteratePaper : public AbstractCellBasedWithTimingsTes
simulator.AddSimulationModifier(p_modifier);

// Create a force law and pass it to the simulation
MAKE_PTR(GeneralisedLinearSpringForce<2>, p_linear_force);
p_linear_force->SetMeinekeSpringStiffness(50.0);
MAKE_PTR(PathmanathanInteractionForce<2>, p_linear_force);
p_linear_force->SetSpringStiffness(50.0);
p_linear_force->SetCutOffLength(cut_off_length);
simulator.AddForce(p_linear_force);

Expand Down Expand Up @@ -407,8 +408,8 @@ class TestCylindricalCryptLiteratePaper : public AbstractCellBasedWithTimingsTes
simulator.AddSimulationModifier(p_modifier);

// Create a force law and pass it to the simulation
MAKE_PTR(GeneralisedLinearSpringForce<2>, p_linear_force);
p_linear_force->SetMeinekeSpringStiffness(50.0);
MAKE_PTR(LinearSpringForce<2>, p_linear_force);
p_linear_force->SetSpringStiffness(50.0);
simulator.AddForce(p_linear_force);

// Solid base boundary condition
Expand Down
14 changes: 8 additions & 6 deletions test/TestDeltaNotchLiteratePaper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@

#include "MeshBasedCellPopulationWithGhostNodes.hpp"
#include "HoneycombMeshGenerator.hpp"
#include "NodesOnlyMesh.hpp"
#include "NodeBasedCellPopulation.hpp"
#include "DiffusionForce.hpp"
#include "RepulsionForce.hpp"
#include "GeneralisedLinearSpringForce.hpp"
#include "LinearSpringForce.hpp"
#include "PathmanathanInteractionForce.hpp"

#include "OnLatticeSimulation.hpp"
#include "DeltaNotchTrackingModifier.hpp"
Expand Down Expand Up @@ -314,8 +316,8 @@ class TestDeltaNotchLiteratePaper: public AbstractCellBasedWithTimingsTestSuite
simulator.AddSimulationModifier(p_differentiation_modifier);

// Create a force law and pass it to the simulation
MAKE_PTR(GeneralisedLinearSpringForce<2>, p_linear_force);
p_linear_force->SetMeinekeSpringStiffness(50.0);
MAKE_PTR(PathmanathanInteractionForce<2>, p_linear_force);
p_linear_force->SetSpringStiffness(50.0);
p_linear_force->SetCutOffLength(cut_off_length);
simulator.AddForce(p_linear_force);

Expand Down Expand Up @@ -378,8 +380,8 @@ class TestDeltaNotchLiteratePaper: public AbstractCellBasedWithTimingsTestSuite
simulator.AddSimulationModifier(p_differentiation_modifier);

// Create a force law and pass it to the simulation
MAKE_PTR(GeneralisedLinearSpringForce<2>, p_linear_force);
p_linear_force->SetMeinekeSpringStiffness(50.0);
MAKE_PTR(LinearSpringForce<2>, p_linear_force);
p_linear_force->SetSpringStiffness(50.0);
p_linear_force->SetCutOffLength(1.5);
simulator.AddForce(p_linear_force);

Expand Down
12 changes: 6 additions & 6 deletions test/TestMorphogenMonolayerLiteratePaper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@

#include "MeshBasedCellPopulationWithGhostNodes.hpp"
#include "HoneycombMeshGenerator.hpp"
#include "GeneralisedLinearSpringForce.hpp"
#include "LinearSpringForce.hpp"
#include "PathmanathanInteractionForce.hpp"

#include "NodeBasedCellPopulation.hpp"
#include "RepulsionForce.hpp"

#include "VertexBasedCellPopulation.hpp"
#include "HoneycombVertexMeshGenerator.hpp"
Expand Down Expand Up @@ -341,8 +341,8 @@ class TestMorphogenMonolayerLiteratePaper : public AbstractCellBasedWithTimingsT
simulator.SetOutputDivisionLocations(true);

// Create a force law and pass it to the simulation
MAKE_PTR(GeneralisedLinearSpringForce<2>, p_linear_force);
p_linear_force->SetMeinekeSpringStiffness(50.0);
MAKE_PTR(PathmanathanInteractionForce<2>, p_linear_force);
p_linear_force->SetSpringStiffness(50.0);
p_linear_force->SetCutOffLength(cut_off_length);
simulator.AddForce(p_linear_force);

Expand Down Expand Up @@ -416,8 +416,8 @@ class TestMorphogenMonolayerLiteratePaper : public AbstractCellBasedWithTimingsT

simulator.SetOutputDivisionLocations(true);

MAKE_PTR(GeneralisedLinearSpringForce<2>, p_linear_force);
p_linear_force->SetMeinekeSpringStiffness(50.0);
MAKE_PTR(LinearSpringForce<2>, p_linear_force);
p_linear_force->SetSpringStiffness(50.0);
p_linear_force->SetCutOffLength(1.5);
simulator.AddForce(p_linear_force);

Expand Down