Merge branch 'master' of lsmssrv.epfl.ch:akantu
Conflicts:
cmake/AkantuMacros.cmake
Description
Description
Details
Details
- Committed
richart Feb 23 2015, 13:55 - 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
- rAKAd5d9c899342d: Adding to the user's manual the documentation of the new cohesive linear…
rAKAd6d332fadd4c: blackdynamite correction - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| d5d9c899342d | Marco Vocialta | Adding to the user's manual the documentation of the new cohesive linear… | Feb 23 2015 | |||
| 610d424ce967 | Marco Vocialta | Adding operator T() to the internal field in order to access the defaul value | Feb 20 2015 | |||
| 760a7dc24426 | Marco Vocialta | New fatigue cohesive law: linear decreasing with dissipative unloading… | Feb 20 2015 | |||
| e711e43067e9 | richart | non local material corrections | Feb 20 2015 | |||
| 622e196967be | Lucas Frérot | Removed CGAL header from geometrical_primitive.hh | Feb 20 2015 | |||
| 75abc3c3e649 | Lucas Frérot | Merge branch 'master' of lsmssrv1.epfl.ch:akantu-students | Feb 20 2015 | |||
| a408fb1d8c34 | Lucas Frérot | Added geometry module using CGAL, with point, segment and triangle… | Feb 19 2015 | |||
| fb864822e2c3 | richart | Bug fix in material lists | Feb 19 2015 | |||
| d21eb45693a2 | richart | Merge branch 'master' of lsmssrv1.epfl.ch:akantu | Feb 19 2015 | |||
| 21bf02c5472a | richart | scotch non system package correction | Feb 19 2015 | |||
| 875775b07a74 | richart | extra non local materials compilation | Feb 19 2015 | |||
| 8ad37ee50db2 | richart | extra non local materials compilation | Feb 19 2015 | |||
| efaeb4dc389b | frerot | Corrected shape derivatives for quadrangle elements in manual | Feb 18 2015 | |||
| 828b30fc1dce | Marco Vocialta | Manual update due to the new parameters of the cohesive laws | Feb 18 2015 | |||
| 5b6d038f664f | Marco Vocialta | CMake fixes | Feb 18 2015 | |||
| b4d5081b981e | Marco Vocialta | Merge branch 'master' of lsmssrv1.epfl.ch:akantu | Feb 6 2015 | |||
| ed1d56ec3948 | Marco Vocialta | New user parameters for cohesive elements | Feb 6 2015 | |||
| c7bdff3b2815 | Aurelia Cuba Ramos | define matrix is positive definite in petsc solver | Feb 5 2015 | |||
| abeffd1f298b | richart | Merge commit '22ac6e78bd6e43053b9085ac8f86f26401bb0624' | Jan 30 2015 | |||
| 22ac6e78bd6e | richart | Squashed 'cmake/Modules/' changes from 5478da4..4e98486 | Jan 30 2015 | |||
| d19aad35bb8b | richart | Merge commit '4e984865c1a782ddf35c8596aadf4ed89484a285' | Jan 30 2015 | |||
| cc987229c87d | richart | manual should compile again submodules | Jan 30 2015 | |||
| 936c1b652252 | richart | manual should compile again | Jan 30 2015 | |||
| 4e984865c1a7 | anciaux | fixing the definitions getter in a more robust way | Jan 22 2015 | |||
| efe5d027bed4 | anciaux | bug fix about the scope for the use in the function package_use_system | Jan 21 2015 | |||
| 732fe22b88bf | anciaux | adding a simple function | Jan 21 2015 | |||
| 9f4aa1714ff4 | anciaux | had to modify something in the cache variables: is it the way should have been… | Jan 20 2015 | |||
| 7870cf35b987 | Aurelia Cuba Ramos | Merge branch 'master' of gitolite-lsmssrv1:akantu | Dec 19 2014 | |||
| c6bf1c236a35 | Aurelia Cuba Ramos | correction of compilation for examples | Dec 19 2014 | |||
| 4a6f5ca92a22 | richart | correction of python wrapper | Dec 16 2014 | |||
| 9f902449a4ec | richart | corrections in the package sysem + python | Dec 12 2014 | |||
| bd5255e41f52 | richart | Change for the external projects variables | Dec 10 2014 | |||
| cc92ef896816 | richart | bug fix | Dec 9 2014 | |||
| 489d880d9f30 | richart | added the test for real | Dec 8 2014 | |||
| 583f13425236 | richart | reactivated the test: need to add the listing of files for the packaging system | Dec 2 2014 | |||
| 538727089904 | richart | bug fix | Nov 10 2014 | |||
| 76507b40462d | richart | Rewrote the package system | Nov 5 2014 | |||
| f77efff04dc2 | richart | static libraries troubles | Oct 24 2014 | |||
| 250b34d8b9c4 | richart | IOHelper as external | Oct 19 2014 | |||
| 5478da4f5b57 | richart | headers update for the release 2.2 | Sep 30 2014 | |||
| 183b299f9485 | anciaux | removing the dead code | Sep 10 2014 | |||
| c3c457f621d1 | richart | change PATHS to HINTS to force the _DIR variable to be tested prior to the… | Sep 9 2014 | |||
| 78cd6f818ed8 | anciaux | mark as advanced some quantities | Jul 28 2014 | |||
| b6f39bf6d85e | richart | minor changes | Jul 24 2014 | |||
| 61caeeecdbba | anciaux | remove warning of CMake | Jun 24 2014 | |||
| d6265cc89041 | anciaux | add the parse arguments stuff | Jun 16 2014 | |||
| db21467fe5b4 | richart | Fixing pre-release 2.2 versions | Jun 13 2014 | |||
| 1e1a89b7af57 | richart | missing files for cmake <=2.8.7 | Jun 11 2014 | |||
| dea09247b0e9 | richart | missing files for cmake <=2.8.7 | Jun 11 2014 | |||
| ca66ab66d1f5 | anciaux | package dependencies hook in the package system | Jun 11 2014 |