Merge branch 'master' into 'features/structural_mechanics_lumped_mass'
- Conflicts:
- src/model/structural_mechanics/structural_mechanics_model.cc
Description
Description
Details
Details
- Committed
richart Apr 28 2022, 16:30 - Pushed
gitlab-richart Apr 28 2022, 16:30 - Parents
- rAKA09b079271f45: Update .gitlab-ci.yml file
rAKA7ffe79ae43a2: Merge branch 'master' into 'features/structural_mechanics_lumped_mass' - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 09b079271f45 | richart | Update .gitlab-ci.yml file | Apr 28 2022 | |||
| fb60e2128635 | richart | Merge branch 'bugfixes/Unexpected-behaviour-in-energy-computation-structural… | Apr 28 2022 | |||
| 4f7245f27871 | richart | Merge branch 'master' into bugfixes/Unexpected-behaviour-in-energy-computation… | Apr 28 2022 | |||
| 78946eebbd37 | richart/phimuell | Apply 1 suggestion(s) to 1 file(s) | Apr 27 2022 | |||
| ab8a70eff592 | richart/phimuell | Apply 1 suggestion(s) to 1 file(s) | Apr 27 2022 | |||
| cc6ad0f52582 | richart/phimuell | Apply 1 suggestion(s) to 1 file(s) | Apr 27 2022 | |||
| a015367b0b7c | richart/phimuell | Apply 1 suggestion(s) to 1 file(s) | Apr 27 2022 | |||
| 8c8f962ac1c3 | richart/phimuell | Apply 1 suggestion(s) to 1 file(s) | Apr 27 2022 | |||
| 73f4016ec514 | richart/phimuell | Apply 1 suggestion(s) to 1 file(s) | Apr 27 2022 | |||
| 41c92c6b98b7 | Philip Mueller, HS | Merge branch 'bugfixes/65-Making-the-integrators-available-in-Python' into… | Mar 30 2022 | |||
| de452cb795f1 | Philip Mueller, HS | This commit fixes a bug in the `assembleResidual()` function of the… | Mar 30 2022 | |||
| 45847f50eb7d | Philip Mueller, HS | Updated the implementation of the kinetic energy computation in the solid… | Mar 30 2022 | |||
| 1531328d5dcb | Philip Mueller | Fixed a bug in the `assembleResidual()` function of the structural mechanics… | Mar 23 2022 | |||
| 29b90b0f220d | Philip Mueller, HS | Updates the `assembleResidual()` functions of the `StructuralMechanicsModel`. | Mar 22 2022 | |||
| 7be0c4621be1 | Philip Mueller, HS | Updated the behaviour of the `getPotentialEnergy()` and `getKineticEnergy()`… | Mar 22 2022 |