Skip to content

Update force class names following Chaste force restructure#3

Open
Copilot wants to merge 5 commits intomainfrom
copilot/update-user-project-forces
Open

Update force class names following Chaste force restructure#3
Copilot wants to merge 5 commits intomainfrom
copilot/update-user-project-forces

Conversation

Copy link
Copy Markdown

Copilot AI commented May 3, 2026

Following the Chaste force restructure (#513), several force classes were renamed. This PR updates all four test files to use the correct replacement classes.

Changes

  • TestCylindricalCryptLiteratePaper.hpp — adds LinearSpringForce.hpp and PathmanathanInteractionForce.hpp; removes unused RepulsionForce.hpp
  • TestDeltaNotchLiteratePaper.hpp — replaces GeneralisedLinearSpringForce.hpp with LinearSpringForce.hpp and PathmanathanInteractionForce.hpp; removes unused RepulsionForce.hpp
  • TestMorphogenMonolayerLiteratePaper.hpp — same include swaps as above
  • TestCellSortingLiteratePaper.hpp — replaces DifferentialAdhesionGeneralisedLinearSpringForce.hpp with DifferentialAdhesionPathmanathanInteractionForce.hpp (node-based) and DifferentialAdhesionLinearSpringForce.hpp (mesh-based)

In each file, MAKE_PTR usages are updated accordingly:

// NodeBasedCellPopulation — was GeneralisedLinearSpringForce
MAKE_PTR(PathmanathanInteractionForce<2>, p_linear_force);

// MeshBasedCellPopulation — was GeneralisedLinearSpringForce
MAKE_PTR(LinearSpringForce<2>, p_linear_force);

// Node-based cell sorting — was DifferentialAdhesionGeneralisedLinearSpringForce
MAKE_PTR(DifferentialAdhesionPathmanathanInteractionForce<2>, p_differential_adhesion_force);

// Mesh-based cell sorting — was DifferentialAdhesionGeneralisedLinearSpringForce
MAKE_PTR(DifferentialAdhesionLinearSpringForce<2>, p_differential_adhesion_force);

@jmosborne jmosborne marked this pull request as ready for review May 3, 2026 09:28
Copilot AI review requested due to automatic review settings May 3, 2026 09:28
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review any files in this pull request.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@jmosborne jmosborne marked this pull request as draft May 3, 2026 09:29
Copilot AI changed the title [WIP] Update user project forces following restructure Replace GeneralisedLinearSpringForce with LinearSpringForce/PathmanathanInteractionForce May 3, 2026
Copilot AI requested a review from jmosborne May 3, 2026 09:30
@jmosborne
Copy link
Copy Markdown
Member

@copilot Also replace DifferentialAdhesionGeneralisedLinearSpringForce and RepulsionForce as per the instructions in Chaste/Chaste#513

Copy link
Copy Markdown
Author

Copilot AI commented May 3, 2026

@copilot Also replace DifferentialAdhesionGeneralisedLinearSpringForce and RepulsionForce as per the instructions in Chaste/Chaste#513

Done in commit 87c1aeb:

  • DifferentialAdhesionGeneralisedLinearSpringForceDifferentialAdhesionLinearSpringForce (include + 2× MAKE_PTR in TestCellSortingLiteratePaper.hpp)
  • RepulsionForceLogarithmicRepulsionForce (include rename in TestCylindricalCryptLiteratePaper.hpp, TestDeltaNotchLiteratePaper.hpp, and TestMorphogenMonolayerLiteratePaper.hpp)

Copilot AI changed the title Replace GeneralisedLinearSpringForce with LinearSpringForce/PathmanathanInteractionForce Update force class names following Chaste force restructure May 3, 2026
Copy link
Copy Markdown
Member

@jmosborne jmosborne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot make these changes

Comment thread test/TestCellSortingLiteratePaper.hpp Outdated

// Create a force law and pass it to the simulation
MAKE_PTR(DifferentialAdhesionGeneralisedLinearSpringForce<2>, p_differential_adhesion_force);
MAKE_PTR(DifferentialAdhesionLinearSpringForce<2>, p_differential_adhesion_force);
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
MAKE_PTR(DifferentialAdhesionLinearSpringForce<2>, p_differential_adhesion_force);
MAKE_PTR(DifferentialAdhesionPathmanathanInteractionForce<2>, p_differential_adhesion_force);

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated in commit 45fb0ec — node-based test now uses DifferentialAdhesionPathmanathanInteractionForce<2>, mesh-based test keeps DifferentialAdhesionLinearSpringForce<2>.


#include "NagaiHondaForce.hpp"
#include "RepulsionForce.hpp"
#include "LogarithmicRepulsionForce.hpp"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#include "LogarithmicRepulsionForce.hpp"

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed in commit 45fb0ec.

Comment thread test/TestDeltaNotchLiteratePaper.hpp Outdated
#include "DiffusionForce.hpp"
#include "RepulsionForce.hpp"
#include "GeneralisedLinearSpringForce.hpp"
#include "LogarithmicRepulsionForce.hpp"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#include "LogarithmicRepulsionForce.hpp"

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed in commit 45fb0ec.


#include "NodeBasedCellPopulation.hpp"
#include "RepulsionForce.hpp"
#include "LogarithmicRepulsionForce.hpp"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#include "LogarithmicRepulsionForce.hpp"

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed in commit 45fb0ec.

…Force for node-based, remove LogarithmicRepulsionForce includes

Agent-Logs-Url: https://github.com/Chaste/CellBasedComparison2017/sessions/e5f2f4ab-5362-4bf4-b7fe-7e898948ccde

Co-authored-by: jmosborne <2212095+jmosborne@users.noreply.github.com>
Copy link
Copy Markdown
Author

Copilot AI commented May 3, 2026

@copilot make these changes

Done in commit 45fb0ec.

Copilot AI requested a review from jmosborne May 3, 2026 09:44
Co-authored-by: Copilot <copilot@github.com>
Copy link
Copy Markdown
Member

@jmosborne jmosborne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All Pass on my local machine with the correct branch

@jmosborne jmosborne marked this pull request as ready for review May 3, 2026 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update User Project following Force restructure in https://github.com/Chaste/Chaste/issues/417

3 participants