Skip to content
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.

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

[Spring] Merging StiffSpringForceField and its parent #4649

Open
wants to merge 23 commits into
base: master
Choose a base branch
from

Conversation

bakpaul
Copy link
Contributor

@bakpaul bakpaul commented Apr 12, 2024

StiffSpringForceField is basically an extension of SpringForcefield adding implicit solving.
The only added value comes from the ability to define the springs using added data indices1, indices2 and lengths. This mechanism need to also be merged with the current one available in SpringForceField.

Related to #248


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).

…tion of the force computation because it is more complete
@bakpaul bakpaul added pr: breaking Change possibly inducing a compilation error pr: status to review To notify reviewers to review this pull-request refactoring Refactor code labels Apr 12, 2024
@bakpaul
Copy link
Contributor Author

bakpaul commented Apr 12, 2024

Let's see this as a starting point of refactoring. This PR does the merge, the code is neither better nor worst than before, it just removes unnecessary duplication.

Still need to replace every iteration of StiffSpringForceField by SpringForceField and fix Cuda extension

@bakpaul bakpaul added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels Apr 15, 2024
@bakpaul bakpaul added pr: status to review To notify reviewers to review this pull-request and removed pr: status wip Development in the pull-request is still in progress labels Apr 15, 2024
@bakpaul
Copy link
Contributor Author

bakpaul commented Apr 15, 2024

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

@bakpaul bakpaul marked this pull request as ready for review April 15, 2024 12:41
@bakpaul
Copy link
Contributor Author

bakpaul commented Apr 15, 2024

PR is ready for me now.
Still need to decide if I should refactor SofaOpenCL or not given the fact that it doesn't compile with the current SOFA's master branch --> to be discussed in the next SOFA-dev meeting.

@bakpaul
Copy link
Contributor Author

bakpaul commented Apr 22, 2024

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

@hugtalbot
Copy link
Contributor

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

@bakpaul bakpaul added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels May 13, 2024
@bakpaul bakpaul force-pushed the fusion_of_stiffspringff_and_springff branch from de5c7a2 to beff7ab Compare May 13, 2024 15:54
@bakpaul bakpaul added pr: status to review To notify reviewers to review this pull-request and removed pr: status wip Development in the pull-request is still in progress labels May 13, 2024
@bakpaul
Copy link
Contributor Author

bakpaul commented May 13, 2024

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

@bakpaul bakpaul added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels May 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: breaking Change possibly inducing a compilation error pr: status wip Development in the pull-request is still in progress refactoring Refactor code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants