Merge conflict resolved in MeshSphereIntersector
Description
Description
Details
Details
- Committed
Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> Aug 11 2015, 11:08 - 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
- rAKA54b6e2f946d8: getInternal and getArray in Material are now templated, cleanup of flattened…
rAKA72e4960f4c2c: Update thedocumentation for the addition of a new material: getStableTimeStep… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 72e4960f4c2c | Clement Roux | Update thedocumentation for the addition of a new material: getStableTimeStep… | Aug 10 2015 | |||
| a23a9800fbe0 | Clement Roux | Merge branch 'master' of lsmssrv1.epfl.ch:akantu | Aug 10 2015 | |||
| 2c5e517cd3de | Clement Roux | update test_local_material and predent copy of material | Aug 10 2015 | |||
| 70fa1c247f46 | richart | Bug fix on CMake code, concat does not exists before 3.0 | Aug 8 2015 | |||
| cea2d4828c56 | richart | Merge branch 'master' of lsmssrv1.epfl.ch:akantu | Aug 8 2015 | |||
| 4ba0541fcf79 | richart | INTEREST_LIST generated in cmake (ticket #68) | Aug 8 2015 | |||
| 9f000c0ac5db | richart | refining mpi compile flags handling | Aug 8 2015 | |||
| a675bb0ab426 | fabarras | Merge branch 'master' of lsmssrv1.epfl.ch:akantu | Aug 7 2015 | |||
| f332b2421734 | fabarras | test + doc of cohesive elements insertion along physical surfaces | Aug 7 2015 | |||
| 21ce0527e9b2 | anciaux | make the init for the solver reentrant | Aug 7 2015 | |||
| 2bff9da7343d | fabarras | insertion of intrinsic cohesive elements along physical surfaces + change of… | Aug 6 2015 | |||
| db7a92057d33 | anciaux | Merge branch 'master' of gitolite:akantu | Aug 5 2015 | |||
| 60551555c624 | anciaux | correct another memory leak | Aug 5 2015 | |||
| bf1f2c2bac15 | richart | Merge branch 'master' of lsmssrv1.epfl.ch:akantu | Aug 4 2015 | |||
| 4bee089d6542 | richart | Modification to make akantu compile with long int (64bit idx) Still has to… | Aug 4 2015 | |||
| 66aebf94f133 | anciaux | freeing solver for heattransfermodel | Aug 4 2015 | |||
| 4cfea41bf633 | richart | Bug fix for python | Aug 4 2015 | |||
| 2b41c6049562 | richart | Fix for files that are only in a branch for now | Aug 4 2015 | |||
| d8d4b8982704 | richart | Merge branch 'master' of lsmssrv1.epfl.ch:akantu | Aug 4 2015 | |||
| 88ec5e44af0b | richart | Modifications to be able to compile akantu in float | Aug 4 2015 | |||
| 7096a8ee1288 | richart | removed warning for missing _point_1.msh | Aug 4 2015 | |||
| a4fcb7a89308 | anciaux | automatic conversion and check of numpy/Akantu arrays | Aug 3 2015 | |||
| 8a136b183f21 | richart | Merge branch 'master' of lsmssrv1.epfl.ch:akantu | Aug 3 2015 | |||
| a847f8befd96 | richart | reactivated the compilation of examples with chenger of package system | Aug 3 2015 | |||
| 4ee09abbe88d | anciaux | Merge branch 'master' of gitolite:akantu | Aug 3 2015 | |||
| 09cf306d8802 | anciaux | splitting in several files the swig warppers | Aug 3 2015 | |||
| 47c6b20d5c70 | Clement Roux | test_local_material is now actually testing the damage model | Jul 31 2015 | |||
| f02a49090f3d | Clement Roux | AKANTU review, ticket 51 | Jul 30 2015 | |||
| 7d9124f4097e | anciaux | forcing version 3 of swig | Jul 24 2015 | |||
| 8bf24b72b2d9 | anciaux | fix compilation error | Jul 23 2015 | |||
| 087d7e771c84 | anciaux | Merge branch 'master' of gitolite:akantu | Jul 23 2015 | |||
| fe55d8ba0934 | anciaux | improving python interface to iterate csr | Jul 23 2015 | |||
| c3702d2464e1 | Lucas Frérot | separation for test_segment_intersection_* | Jul 22 2015 | |||
| 13659b265c30 | Lucas Frérot | fixed bug in MeshSphereIntersector | Jul 22 2015 | |||
| 571e9e349498 | Lucas Frérot | non const mesh in geometry module + cleanup + performance of compareSegments | Jul 22 2015 | |||
| 1776da21a721 | anciaux | fix the initPBC of heat transfer model | Jul 21 2015 | |||
| f8b881f6c275 | anciaux | add the synchronizer to python | Jul 21 2015 | |||
| 7d2223d91ea9 | anciaux | extend resize for temp Array for python and allow setmodetext to models | Jul 21 2015 | |||
| 58763ce8bf48 | anciaux | extend resize for temp Array for python | Jul 21 2015 | |||
| c62fef079db6 | anciaux | remove useless log | Jul 21 2015 | |||
| ee7949aecd03 | anciaux | prevent swig compilation with c++11: temporary ? | Jul 21 2015 | |||
| 97791428f8e0 | anciaux | passing the correct flags to swig | Jul 21 2015 | |||
| 4407e5eaa7b8 | richart | Correcting python intreface for commits on moving element declaration in cmake | Jul 20 2015 | |||
| dae6cdd96b37 | richart | PackageSystem correction | Jul 19 2015 | |||
| 2169e26115cd | richart | updateing meta data of submodules | Jul 19 2015 | |||
| 3f4dbe5670f1 | richart | ensuring that every element are tested | Jul 19 2015 | |||
| df46d616a18b | richart | small modification to help debug | Jul 19 2015 | |||
| 2efaf2711a76 | richart | removing warnings | Jul 19 2015 | |||
| 4f7c66ec2034 | richart | Modified cmake to declare the element info in the packages | Jul 19 2015 | |||
| 0c32f434c9c9 | richart | bug fix du to multiple facet modification | Jul 19 2015 |