Conflict with master resolved
Description
Description
Details
Details
- Committed
pundir Jun 19 2020, 21:34 - Pushed
gitlab-richart Jul 29 2021, 09:01 - Parents
- rAKAc25cca753279: test for phasefield selector added
rAKA14d51fa1489c: Bug fixed : multiple cohesive materials in extrinsic insertion - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 14d51fa1489c | pundir | Bug fixed : multiple cohesive materials in extrinsic insertion | Jun 8 2020 | |||
| f7ff56aa871c | frerot | [doc] using existing doxygen index for namespace akantu | May 7 2020 | |||
| 895ed3f8046c | frerot | [doc] integrating sphinx user manual with cmake-built doc | May 7 2020 | |||
| 1b35e545f75a | frerot | Merge branch 'features/sphinx' | May 7 2020 | |||
| 79b71a4d9b6d | frerot | [user manual] added feengine chapter with isoparametric elements | May 7 2020 | |||
| e4e28c3d93c1 | richart | Merge branch 'master' of gitlab.com:akantu/akantu | May 6 2020 | |||
| d2aec9116f8f | richart | Modifications for the documentation | May 6 2020 | |||
| b8239a722d43 | anciaux | Merge branch 'master' of gitlab.com:akantu/akantu | Mar 25 2020 | |||
| a99bde2cb035 | anciaux | if sequential, should exchange information for the pbc | Mar 25 2020 | |||
| 91ec91e70c12 | anciaux | extend python interface for dofmanager | Mar 25 2020 | |||
| 84d1ca463409 | richart | Adding a check on forces in patch test | Mar 24 2020 | |||
| ebe1f6380d9d | richart | Deactivating the copy as target, copy at configure instead | Mar 24 2020 | |||
| 058be8fff920 | richart | Merge branch 'master' of gitlab.com:akantu/akantu | Mar 24 2020 | |||
| acfed465d647 | richart | small bug fix | Mar 24 2020 | |||
| 27ff61a392d5 | anciaux | remove a test not suposed to run in sequential | Mar 18 2020 | |||
| c3a69f376315 | anciaux | removes a wrong clear of elastic constants in anisotropic law | Mar 18 2020 | |||
| 6253ea6dfda4 | anciaux | allow to initialize the material manually | Mar 18 2020 | |||
| 399f5d332b58 | anciaux | correct uninitialized values from materials | Mar 18 2020 | |||
| 727f18940ec2 | anciaux | some changes to make PBC work again in sequential: to review | Mar 15 2020 | |||
| 1ef067ca8326 | anciaux | correct a memory fault problem with the pbc | Mar 13 2020 | |||
| 66af74b287b4 | anciaux | use new iterators on types | Mar 11 2020 | |||
| 210089c6948a | anciaux | set tag upper bound based in MPI_COMM_WORLD | Mar 9 2020 | |||
| 3e99190b3c2f | anciaux | extend communicator creation in akantu | Mar 6 2020 | |||
| 62927968802a | anciaux | Merge commit '4c6551ee91289c5a9b4318582ef7780324c3170e' into HEAD | Mar 6 2020 | |||
| 3a0bc0ee32b4 | frerot | added sphinx doc | Feb 10 2020 | |||
| 4c6551ee9128 | richart | Merge branch 'master' into 'master' | Jan 22 2020 | |||
| 4995de870e93 | anciaux | fix compilation error for c++17 standard | Jan 22 2020 | |||
| 3ad548c8dbb5 | richart | cleaning lincences and clang-formating | Dec 13 2019 |