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

Jump to bottom

[SofaExplicitOdeSolver] Introduce examples scenes #2199

Merged

fredroy merged 12 commits into sofa-framework:master from alxbilger:eulerexplicit_scenes

Jul 12, 2021

Contributor

alxbilger commented Jun 24, 2021 •

edited by guparan

Loading

Introduce examples scenes for 4 cases of Euler explicit solver:

Mass matrix is not diagonal and Euler is not symplectic: EulerExplicitSolver.scn
Mass matrix is diagonal and Euler is not symplectic: EulerExplicitSolver_diagonal.scn
Mass matrix is not diagonal and Euler is symplectic: EulerSymplecticSolver.scn
Mass matrix is diagonal and Euler is symplectic: EulerSymplecticSolver_diagonal.scn

I did my best to create stable scenes, but it is not that simple with an Euler explicit solver. Especially if not symplectic. It comes at the price of very small time step sizes.

This PR is based on #2163. It will need to be updated after #2165 is merged

[ci-depends-on https://github.com/sofa-framework/Regression/pull/15]

alxbilger added 5 commits

June 4, 2021 17:07


          [SofaSimulationCore] Add tons of details in Euler solver

dab9c57


          [SofaExplicitOdeSolver] addSeparateGravity is added a parameter

So it is more similar to the other signature functions. Suggestion by jnbrunet PR#2163


          [SofaExplicitOdeSolver] Apply separate gravity on the velocity parameter

5c0e858


          [SofaExplicitOdeSolver] Fix constraint projection when system is asse…

92774c4

…mbled


          [SofaExplicitOdeSolver] Introduce scenes for all cases of Euler ODE s…

03aa5a6

…olver

alxbilger added pr: fast merge pr: status to review and removed pr: fast merge labels

alxbilger marked this pull request as ready for review

June 24, 2021 14:35

Contributor Author

alxbilger commented Jun 28, 2021

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

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

alxbilger added 2 commits

June 30, 2021 14:58


          Merge remote-tracking branch 'upstream/master' into eulerexplicit_scenes

c530483

# Conflicts:
#	SofaKernel/modules/SofaExplicitOdeSolver/src/SofaExplicitOdeSolver/EulerSolver.cpp
#	SofaKernel/modules/SofaExplicitOdeSolver/src/SofaExplicitOdeSolver/EulerSolver.h


          [examples] Remove optimizedForDiagonalMatrix

c1fea4c

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

Contributor Author

alxbilger commented Jul 1, 2021

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

Contributor Author

alxbilger commented Jul 1, 2021

Now that #2165 is merged, I could remove the Data optimizedForDiagonalMatrix from the scenes. I confirm that the code goes to the right branch depending on the diagonal property of the mass matrix.


          Merge remote-tracking branch 'upstream/master' into eulerexplicit_scenes

1057b41

Contributor

fredroy commented Jul 2, 2021 •

edited

Loading

Two regression tests are failing :

Regression_test/StateRegression_test.sceneTest/EulerExplicitSolver
Regression_test/StateRegression_test.sceneTest/EulerExplicitSolver_diagonal

I suppose this is because you moved them into a new folder and the Regression project has not been updated accordingly.

Contributor Author

alxbilger commented Jul 2, 2021

@fredroy, yes it makes sense. Thanks for pointing it out.

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

alxbilger added 2 commits

July 7, 2021 14:46


          Merge remote-tracking branch 'upstream/master' into eulerexplicit_scenes

25ae77f


          Update EulerExplicitSolver reference because of new scenes

0249c45

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

Contributor Author

alxbilger commented Jul 7, 2021

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

Collaborator

sofabot commented Jul 7, 2021

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

To unlock the merge button, you must

Merge or close Update EulerExplicitSolver reference because of new scenes Regression#15
For this build, regression/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/regression
GIT_TAG b2ab6375727242ddf63721f62ec36b363e93e5f0

Collaborator

sofabot commented Jul 8, 2021

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

To unlock the merge button, you must

Merge or close Update EulerExplicitSolver reference because of new scenes Regression#15
For this build, regression/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/regression
GIT_TAG b2ab6375727242ddf63721f62ec36b363e93e5f0

Collaborator

sofabot commented Jul 8, 2021

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

To unlock the merge button, you must

Merge or close Update EulerExplicitSolver reference because of new scenes Regression#15
For this build, regression/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/regression
GIT_TAG b2ab6375727242ddf63721f62ec36b363e93e5f0

Collaborator

sofabot commented Jul 8, 2021

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

To unlock the merge button, you must

Merge or close Update EulerExplicitSolver reference because of new scenes Regression#15
For this build, Regression/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/Regression
GIT_TAG b2ab6375727242ddf63721f62ec36b363e93e5f0

Contributor

guparan commented Jul 8, 2021

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

Collaborator

sofabot commented Jul 8, 2021

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

To unlock the merge button, you must

Merge or close Update EulerExplicitSolver reference because of new scenes Regression#15
For this build, Regression/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/Regression
GIT_TAG b2ab6375727242ddf63721f62ec36b363e93e5f0

alxbilger added 2 commits

July 9, 2021 09:22


          Merge remote-tracking branch 'upstream/master' into eulerexplicit_scenes

d79c7f9


          [SofaExporter] Give reason for failing creating a file

811a792

Collaborator

sofabot commented Jul 9, 2021

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

To unlock the merge button, you must

Merge or close Update EulerExplicitSolver reference because of new scenes Regression#15
For this build, Regression/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/Regression
GIT_TAG b2ab6375727242ddf63721f62ec36b363e93e5f0

Contributor Author

alxbilger commented Jul 9, 2021

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

Collaborator

sofabot commented Jul 9, 2021

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

To unlock the merge button, you must

Merge or close Update EulerExplicitSolver reference because of new scenes Regression#15
For this build, Regression/ExternalProjectConfig.cmake.in will be edited by builders with
GIT_REPOSITORY https://github.com/sofa-framework/Regression
GIT_TAG b2ab6375727242ddf63721f62ec36b363e93e5f0

fredroy added pr: status ready and removed pr: status to review labels

fredroy approved these changes

View reviewed changes

fredroy merged commit 10c54cc into sofa-framework:master

guparan added this to the v21.12 milestone

alxbilger deleted the eulerexplicit_scenes branch

June 28, 2022 10:51

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

Labels

pr: status ready