Diffusion akantu 6a9a514cb71d

Merge branch 'master' of lsmssrv1.epfl.ch:akantu
6a9a514cb71d
Actions

Authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> on Apr 29 2015, 15:53.

Description

Merge branch 'master' of lsmssrv1.epfl.ch:akantu

Details

Committed

Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch>

Apr 29 2015, 15:53

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

rAKAd4592f5732fa: Merge branch 'master' of lsmssrv1.epfl.ch:akantu
rAKA651162d500f0: correction of typo, removing dumping of ghosts in material non local

Branches

Unknown

Tags

Unknown

Event Timeline

Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> committed rAKA6a9a514cb71d: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch>).Apr 29 2015, 15:53

Restricted Application failed to build Restricted Buildable!Dec 6 2019, 13:43

Merged Changes

Commit	Author	Details	Committed
d4592f5732fa	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Apr 29 2015
f6fff9704c43	richart	generation of the swig wrapper in build instead of sources	Apr 29 2015
622d103b3de5	richart	Warning fixes + improvement of missing doc message	Apr 28 2015
405efe597836	Lucas Frérot	updated tests for geometry and embedded model	Apr 28 2015
7694f2f7b554	Lucas Frérot	made getInternalDataPerElem virtual for embedded model	Apr 28 2015
18c0e9769242	Lucas Frérot	Documentation of geometry module and embedded interface model	Apr 28 2015

Changes (41)

				Path
	M			doc/manual/CMakeLists.txt
	M			doc/manual/manual-heattransfermodel.tex
	M			doc/manual/manual-parallel.tex
	M			doc/manual/manual-structuralmechanicsmodel.tex
	M			doc/manual/manual.sty
	M			doc/manual/manual.tex
	M			packages/cgal.cmake
	M			python/CMakeLists.txt
	M			src/geometry/aabb_primitives/aabb_primitive.hh
	M			src/geometry/aabb_primitives/tetrahedron.hh
	D			src/geometry/aabb_primitives/tetrahedron_tmpl.hh
	M			src/geometry/aabb_primitives/triangle.hh
	D			src/geometry/aabb_primitives/triangle_tmpl.hh
	M			src/geometry/geom_helper_functions.hh
	M			src/geometry/mesh_geom_abstract.hh
	M			src/geometry/mesh_geom_container.cc
	M			src/geometry/mesh_geom_container.hh
	M			src/geometry/mesh_geom_factory.hh
	M			src/geometry/mesh_geom_factory_tmpl.hh
	M			src/geometry/tree_type_helper.hh
	M			src/model/solid_mechanics/embedded_interface.hh
	M			src/model/solid_mechanics/embedded_interface_model.cc
	M			src/model/solid_mechanics/embedded_interface_model.hh
	M			src/model/solid_mechanics/materials/material_embedded/embedded_internal_field.hh
	M			src/model/solid_mechanics/materials/material_embedded/material_reinforcement.hh
	M			src/model/solid_mechanics/materials/material_embedded/material_reinforcement_template.hh
	M			src/model/solid_mechanics/materials/material_embedded/material_reinforcement_template_inline_impl.cc
	M			src/model/solid_mechanics/solid_mechanics_model.hh
	M			test/test_geometry/CMakeLists.txt
	M			test/test_geometry/test_geometry_intersection.cc
	M			test/test_geometry/test_geometry_intersection_tetrahedron_4.cc
	M			test/test_geometry/test_geometry_intersection_triangle_3.cc
	A			test/test_geometry/test_geometry_tetrahedron.msh
	A			test/test_geometry/test_geometry_triangle.msh
	D			test/test_geometry/tetrahedron_4.geo
	D			test/test_geometry/triangle_3.geo
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/CMakeLists.txt
	A			test/test_model/test_solid_mechanics_model/test_embedded_interface/embedded_mesh_prestress.msh
	P			test/test_model/test_solid_mechanics_model/test_embedded_interface/prestress.dat Copied from test/test_model/test_solid_mechanics_model/test_embedded_interface/material.dat
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_interface_model.cc
	A			test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_interface_model_prestress.cc