Conflict with master resolved
Description
Description
Details
Details
- Committed
pundir Jun 19 2020, 21:34 - Pushed
gitlab-richart Feb 26 2021, 14:42 - Parents
- rAKA65817b11dbaa: test for phasefield selector added
rAKA03d3e280c971: Bug fixed : multiple cohesive materials in extrinsic insertion - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 03d3e280c971 | pundir | Bug fixed : multiple cohesive materials in extrinsic insertion | Jun 8 2020 | |||
| c093aeb2cc0f | frerot | [doc] using existing doxygen index for namespace akantu | May 7 2020 | |||
| a8db5fc939de | frerot | [doc] integrating sphinx user manual with cmake-built doc | May 7 2020 | |||
| 5d3608468b0a | frerot | Merge branch 'features/sphinx' | May 7 2020 | |||
| cbccffa9957f | frerot | [user manual] added feengine chapter with isoparametric elements | May 7 2020 | |||
| 95f643fbb529 | richart | Merge branch 'master' of gitlab.com:akantu/akantu | May 6 2020 | |||
| f2b54f6e0331 | richart | Modifications for the documentation | May 6 2020 | |||
| a80e6d048c5a | anciaux | Merge branch 'master' of gitlab.com:akantu/akantu | Mar 25 2020 | |||
| f12826f744d5 | anciaux | if sequential, should exchange information for the pbc | Mar 25 2020 | |||
| c5c7617d4862 | anciaux | extend python interface for dofmanager | Mar 25 2020 | |||
| c9c0de0546d5 | richart | Adding a check on forces in patch test | Mar 24 2020 | |||
| 835ec6cebe6a | richart | Deactivating the copy as target, copy at configure instead | Mar 24 2020 | |||
| 9d71cf55d088 | richart | Merge branch 'master' of gitlab.com:akantu/akantu | Mar 24 2020 | |||
| e8a7879155ab | richart | small bug fix | Mar 24 2020 | |||
| dff47ba9dac7 | anciaux | remove a test not suposed to run in sequential | Mar 18 2020 | |||
| 4b1996c1a5f2 | anciaux | removes a wrong clear of elastic constants in anisotropic law | Mar 18 2020 | |||
| 44a04848e239 | anciaux | allow to initialize the material manually | Mar 18 2020 | |||
| 1ca2a17aa807 | anciaux | correct uninitialized values from materials | Mar 18 2020 | |||
| f2e4a0fa4491 | anciaux | some changes to make PBC work again in sequential: to review | Mar 15 2020 | |||
| 4da59a0e63c4 | anciaux | correct a memory fault problem with the pbc | Mar 13 2020 | |||
| df6425cb1cd3 | anciaux | use new iterators on types | Mar 11 2020 | |||
| d751a95ffe34 | anciaux | set tag upper bound based in MPI_COMM_WORLD | Mar 9 2020 | |||
| 30ae51bad185 | anciaux | extend communicator creation in akantu | Mar 6 2020 | |||
| 5dd81bf14a97 | anciaux | Merge commit '6f65103bbed23c65deb66a484bc8fb13f04216f4' into HEAD | Mar 6 2020 | |||
| ab07bcc3260a | frerot | added sphinx doc | Feb 10 2020 | |||
| 6f65103bbed2 | richart | Merge branch 'master' into 'master' | Jan 22 2020 | |||
| 01e5634d792c | anciaux | fix compilation error for c++17 standard | Jan 22 2020 | |||
| 58c60757d33e | richart | cleaning lincences and clang-formating | Dec 13 2019 |