Merge branch 'master' of lsmssrv1.epfl.ch:akantu
Conflicts:
src/model/solid_mechanics/material_inline_impl.cc
src/model/solid_mechanics/materials/material_non_local_inline_impl.cc
Description
Description
Details
Details
- Committed
richart Feb 25 2015, 21:51 - Pushed
richart Dec 6 2019, 13:35 richart Dec 6 2019, 13:16 richart Dec 6 2019, 12:16 richart Dec 6 2019, 11:45 richart Dec 5 2019, 22:54 richart Dec 5 2019, 18:45 - Parents
- rAKA7390af5db8e6: Merge branch 'master' of lsmssrv1.epfl.ch:akantu
rAKAbf218b3a7743: change from element_index_by_material to material_index +… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 7390af5db8e6 | Aurelia Cuba Ramos | Merge branch 'master' of lsmssrv1.epfl.ch:akantu | Feb 25 2015 | |||
| 75c7b6cdc881 | Aurelia Cuba Ramos | correction of material_non_local, functions added to convert elements | Feb 25 2015 | |||
| e9828e91c9df | Benjamin Paccaud | Add finite_deformation to the linear isotropic hardening plastic material. | Feb 25 2015 |