[Framework] Apply template method design pattern to BaseForceField#5485

Open

hugtalbot wants to merge 20 commits intosofa-framework:masterfrom

hugtalbot:2025_sprintsed_BaseForceField

Contributor

hugtalbot commented May 15, 2025 •

edited

Loading

Based on #5446

Functions

addForce
addDForce
addKToMatrix
addBToMatrix
buildStiffnessMatrix
buildDampingMatrix
getPotentialEnergy

[ci-depends-on https://github.com/sofa-framework/SofaSphFluid/pull/16]
[ci-depends-on https://github.com/sofa-framework/Registration/pull/27]
[ci-depends-on https://github.com/SofaDefrost/ModelOrderReduction/pull/162]
[ci-depends-on https://github.com/sofa-framework/BeamAdapter/pull/194]
[ci-depends-on https://github.com/SofaDefrost/SoftRobots/pull/330]
[ci-depends-on https://github.com/sofa-framework/SofaPython3/pull/500]

By submitting this pull request, I acknowledge that
I have read, understand, and agree SOFA Developer Certificate of Origin (DCO).

Reviewers will merge this pull-request only if

it builds with SUCCESS for all platforms on the CI.
it does not generate new warnings.
it does not generate new unit test failures.
it does not generate new scene test failures.
it does not break API compatibility.
it is more than 1 week old (or has fast-merge label).

hugtalbot added 9 commits

May 12, 2025 18:11


          [Framework] Apply template method design pattern to BaseMass

8c30ba8


          Add all associated warning comments

46aea63


          fix warnings

d77c426


          Pursue rest of the API

1be30df


          [Framework] Apply template method design pattern to BaseForceField - …

ac64d77

…start with addForce


          Apply pattern : addDForce

f53eec9


          Apply pattern : getPotentialEnergy

a5d8846


          Move all functions in BaseForceField.cpp and add comment message

ef76b8d


          continue but compilation of TrianglePressureForceField and SurfacePre…

24065fd

…ssureForceField fails in ForceFieldTestCreation

hugtalbot added pr: breaking pr: status wip refactoring labels

bakpaul added the pr: based on previous PR label

hugtalbot and others added 7 commits

May 15, 2025 15:39


          Fix compilation for SOFA, TODO: plugins

e7557fe


          [Engine.Select] Automatically find topology in MeshBoundaryROI (sofa-…

59f8466

…framework#5116)

* [Engine.Select] Automatically find topology in MeshBoundaryROI

* add warning when no topology is provided


          [Core] Rename BaseConstraint to BaseLagrangianConstraint (sofa-framew…

e2e5f6a

…ork#5423)

* [Core] Rename BaseConstraint to BaseLagrangianConstraint

* restore toBaseConstraint and deprecate it

* fix?

---------

Co-authored-by: Hugo <[email protected]>


          Move all functions in BaseMass.cpp and add comment message

799f7c2


          Fix compilation CUDA

0e38542


          fix CUDA compilation on doGetElementMass

62e691d


          Apply changes on SofaDistanceGrid

b9da001

This was referenced May 27, 2025

Apply template method on BaseForceField SofaDefrost/ModelOrderReduction#162

Open

Apply template method on BaseForceField: ClosestPointRFF IntensityPro… sofa-framework/Registration#27

Open

Template method : fix ParticlesRepulsionForceField::addKToMatrix sofa-framework/SofaSphFluid#16

Open

Apply template method on BaseForceField sofa-framework/BeamAdapter#194

Open

Apply template method on BaseForceField SofaDefrost/SoftRobots#330

Open

hugtalbot added the pr: highlighted in next release label


          202601 attempt to merge with master

22d0f33

Collaborator

sofabot commented Jan 6, 2026

[ci-depends-on] detected during build #4.

To unlock the merge button, you must

Merge or close Template method : fix ParticlesRepulsionForceField::addKToMatrix SofaSphFluid#16
For this build, the following CMake flags will be set
-DSOFASPHFLUID_GIT_REPOSITORY='https://github.com/sofa-framework/SofaSphFluid'
-DSOFASPHFLUID_GIT_TAG='d85efed071c04706ddc06e0b54138a7b2d433b10'
Merge or close Apply template method on BaseForceField: ClosestPointRFF IntensityPro… Registration#27
For this build, the following CMake flags will be set
-DREGISTRATION_GIT_REPOSITORY='https://github.com/sofa-framework/Registration'
-DREGISTRATION_GIT_TAG='227bd2cf53d66f27ab4c9d411a4288ca58407a92'
Merge or close Apply template method on BaseForceField SofaDefrost/ModelOrderReduction#162
For this build, the following CMake flags will be set
-DMODELORDERREDUCTION_GIT_REPOSITORY='https://github.com/SofaDefrost/ModelOrderReduction'
-DMODELORDERREDUCTION_GIT_TAG='29530d747d00b1a05a2e52efab319720c5ca9aed'
Please fix merging issues of Apply template method on BaseForceField BeamAdapter#194. This build is aborted until these issues are fixed.
Merge or close Apply template method on BaseForceField SofaDefrost/SoftRobots#330
For this build, the following CMake flags will be set
-DSOFTROBOTS_GIT_REPOSITORY='https://github.com/SofaDefrost/SoftRobots'
-DSOFTROBOTS_GIT_TAG='546974abda93f6030d9c830889ca2879490593ce'
Merge or close Changes related to template method pattern on BaseForceField SofaPython3#500
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='0a17990ef5f734c2562df1270b4bece4615b09f4'


          update version of change

794fe86

Collaborator

sofabot commented Jan 6, 2026

[ci-depends-on] detected during build #5.

To unlock the merge button, you must

Merge or close Template method : fix ParticlesRepulsionForceField::addKToMatrix SofaSphFluid#16
For this build, the following CMake flags will be set
-DSOFASPHFLUID_GIT_REPOSITORY='https://github.com/sofa-framework/SofaSphFluid'
-DSOFASPHFLUID_GIT_TAG='d85efed071c04706ddc06e0b54138a7b2d433b10'
Merge or close Apply template method on BaseForceField: ClosestPointRFF IntensityPro… Registration#27
For this build, the following CMake flags will be set
-DREGISTRATION_GIT_REPOSITORY='https://github.com/sofa-framework/Registration'
-DREGISTRATION_GIT_TAG='9e3db3e748eb041840d6f5fb9b7202f59e3c89d9'
Merge or close Apply template method on BaseForceField SofaDefrost/ModelOrderReduction#162
For this build, the following CMake flags will be set
-DMODELORDERREDUCTION_GIT_REPOSITORY='https://github.com/SofaDefrost/ModelOrderReduction'
-DMODELORDERREDUCTION_GIT_TAG='49fc5b5171496c564e4faff317612bf54d1d046c'
Please fix merging issues of Apply template method on BaseForceField BeamAdapter#194. This build is aborted until these issues are fixed.
Merge or close Apply template method on BaseForceField SofaDefrost/SoftRobots#330
For this build, the following CMake flags will be set
-DSOFTROBOTS_GIT_REPOSITORY='https://github.com/SofaDefrost/SoftRobots'
-DSOFTROBOTS_GIT_TAG='e64af6d493ccb7c4ff5fd7c35bd70d371c0103d2'
Merge or close Changes related to template method pattern on BaseForceField SofaPython3#500
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='d392a4d45b1f715a764211e7b6f381f0e8fa9703'


          remove forgotten unresolved conflicts

0adb8dd

Collaborator

sofabot commented Jan 6, 2026

[ci-depends-on] detected during build #6.

To unlock the merge button, you must

Merge or close Template method : fix ParticlesRepulsionForceField::addKToMatrix SofaSphFluid#16
For this build, the following CMake flags will be set
-DSOFASPHFLUID_GIT_REPOSITORY='https://github.com/sofa-framework/SofaSphFluid'
-DSOFASPHFLUID_GIT_TAG='d85efed071c04706ddc06e0b54138a7b2d433b10'
Merge or close Apply template method on BaseForceField: ClosestPointRFF IntensityPro… Registration#27
For this build, the following CMake flags will be set
-DREGISTRATION_GIT_REPOSITORY='https://github.com/sofa-framework/Registration'
-DREGISTRATION_GIT_TAG='9e3db3e748eb041840d6f5fb9b7202f59e3c89d9'
Merge or close Apply template method on BaseForceField SofaDefrost/ModelOrderReduction#162
For this build, the following CMake flags will be set
-DMODELORDERREDUCTION_GIT_REPOSITORY='https://github.com/SofaDefrost/ModelOrderReduction'
-DMODELORDERREDUCTION_GIT_TAG='49fc5b5171496c564e4faff317612bf54d1d046c'
Please fix merging issues of Apply template method on BaseForceField BeamAdapter#194. This build is aborted until these issues are fixed.
Merge or close Apply template method on BaseForceField SofaDefrost/SoftRobots#330
For this build, the following CMake flags will be set
-DSOFTROBOTS_GIT_REPOSITORY='https://github.com/SofaDefrost/SoftRobots'
-DSOFTROBOTS_GIT_TAG='e64af6d493ccb7c4ff5fd7c35bd70d371c0103d2'
Merge or close Changes related to template method pattern on BaseForceField SofaPython3#500
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='d392a4d45b1f715a764211e7b6f381f0e8fa9703'

hugtalbot added pr: status to review and removed pr: status wip labels

hugtalbot self-assigned this

Contributor Author

hugtalbot commented Jan 6, 2026

[ci-build][with-all-tests]

Collaborator

sofabot commented Jan 6, 2026

[ci-depends-on] detected during build #7.

To unlock the merge button, you must

Merge or close Template method : fix ParticlesRepulsionForceField::addKToMatrix SofaSphFluid#16
For this build, the following CMake flags will be set
-DSOFASPHFLUID_GIT_REPOSITORY='https://github.com/sofa-framework/SofaSphFluid'
-DSOFASPHFLUID_GIT_TAG='d85efed071c04706ddc06e0b54138a7b2d433b10'
Merge or close Apply template method on BaseForceField: ClosestPointRFF IntensityPro… Registration#27
For this build, the following CMake flags will be set
-DREGISTRATION_GIT_REPOSITORY='https://github.com/sofa-framework/Registration'
-DREGISTRATION_GIT_TAG='9e3db3e748eb041840d6f5fb9b7202f59e3c89d9'
Merge or close Apply template method on BaseForceField SofaDefrost/ModelOrderReduction#162
For this build, the following CMake flags will be set
-DMODELORDERREDUCTION_GIT_REPOSITORY='https://github.com/SofaDefrost/ModelOrderReduction'
-DMODELORDERREDUCTION_GIT_TAG='49fc5b5171496c564e4faff317612bf54d1d046c'
Please fix merging issues of Apply template method on BaseForceField BeamAdapter#194. This build is aborted until these issues are fixed.
Merge or close Apply template method on BaseForceField SofaDefrost/SoftRobots#330
For this build, the following CMake flags will be set
-DSOFTROBOTS_GIT_REPOSITORY='https://github.com/SofaDefrost/SoftRobots'
-DSOFTROBOTS_GIT_TAG='e64af6d493ccb7c4ff5fd7c35bd70d371c0103d2'
Merge or close Changes related to template method pattern on BaseForceField SofaPython3#500
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='d392a4d45b1f715a764211e7b6f381f0e8fa9703'

Contributor Author

hugtalbot commented Jan 6, 2026

I need to remember why all getPotentialEnergy are not covered
Same for some addForce/addDForce


          Update master, fix conflicts and cover new files

2bb4443

Collaborator

sofabot commented Apr 8, 2026

[ci-depends-on] detected during build #8.

To unlock the merge button, you must

Merge or close Template method : fix ParticlesRepulsionForceField::addKToMatrix SofaSphFluid#16
For this build, the following CMake flags will be set
-DSOFASPHFLUID_GIT_REPOSITORY='https://github.com/sofa-framework/SofaSphFluid'
-DSOFASPHFLUID_GIT_TAG='d85efed071c04706ddc06e0b54138a7b2d433b10'
Merge or close Apply template method on BaseForceField: ClosestPointRFF IntensityPro… Registration#27
For this build, the following CMake flags will be set
-DREGISTRATION_GIT_REPOSITORY='https://github.com/sofa-framework/Registration'
-DREGISTRATION_GIT_TAG='f91b9c8553aee3968da7eeb81bf8b998964700d1'
Merge or close Apply template method on BaseForceField SofaDefrost/ModelOrderReduction#162
For this build, the following CMake flags will be set
-DMODELORDERREDUCTION_GIT_REPOSITORY='https://github.com/SofaDefrost/ModelOrderReduction'
-DMODELORDERREDUCTION_GIT_TAG='49fc5b5171496c564e4faff317612bf54d1d046c'
Please fix merging issues of Apply template method on BaseForceField BeamAdapter#194. This build is aborted until these issues are fixed.
Merge or close Apply template method on BaseForceField SofaDefrost/SoftRobots#330
For this build, the following CMake flags will be set
-DSOFTROBOTS_GIT_REPOSITORY='https://github.com/SofaDefrost/SoftRobots'
-DSOFTROBOTS_GIT_TAG='8c1402cd51b4cee39b99f86b90b476c225e35458'
Merge or close Changes related to template method pattern on BaseForceField SofaPython3#500
For this build, the following CMake flags will be set
-DSOFAPYTHON3_GIT_REPOSITORY='https://github.com/sofa-framework/SofaPython3'
-DSOFAPYTHON3_GIT_TAG='d0dd6d0b682f317dbda676d2e9b8e470ee433f0f'

hugtalbot added refactoring and removed refactoring labels

bakpaul mentioned this pull request

[all] Apply template method pattern to SOFA Core #6074

Open

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr: based on previous PR pr: breaking pr: highlighted in next release pr: status to review refactoring