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

Authored by richart on Mar 16 2015, 11:28.

Description

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

Committed

richart

Mar 16 2015, 11:28

Pushed

Parents

Branches

Unknown

Tags

Unknown

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

Commit	Author	Details	Committed
9a5d13e59913	Lucas Frérot	Added computeShapes and computeShapeDerivatives to FEEngine interface	Mar 13 2015
21efbde4dd31	Lucas Frérot	Added embedded model package	Mar 13 2015
cf8698bc1a6a	Lucas Frérot	Simplified extension of geometry module and added mesh generation test	Mar 13 2015
09309c556471	Lucas Frérot	Added computeShapeDerivatives to FEEngineTemplate	Mar 12 2015
e415564c78d8	Lucas Frérot	Improved memory management in interface mesh generation	Mar 10 2015

				Path
	M			packages/cgal.cmake
	P			packages/embedded.cmake Copied from packages/50_implicit.cmake
	M			src/common/aka_config.hh.in
	M			src/fe_engine/fe_engine.hh
	M			src/fe_engine/fe_engine_template.hh
	M			src/fe_engine/fe_engine_template_tmpl.hh
	A			src/geometry/aabb_primitives/aabb_primitive.hh
	V			src/geometry/aabb_primitives/{tetrahedron.hh ← triangle_primitive.hh}
	V			src/geometry/aabb_primitives/{tetrahedron_tmpl.hh ← triangle_primitive.cc}
	V			src/geometry/aabb_primitives/{triangle_primitive.cc → tetrahedron_tmpl.hh}
	V			src/geometry/aabb_primitives/{triangle_primitive.hh → tetrahedron.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
	A			src/model/solid_mechanics/embedded_interface_model.cc
	P			src/model/solid_mechanics/embedded_interface_model.hh Copied from src/io/mesh_io.hh
	M			src/model/solid_mechanics/material_list.hh
	P			src/model/solid_mechanics/materials/material_embedded_includes.hh Copied from src/geometry/mesh_geom_abstract.cc
	A			src/model/solid_mechanics/materials/material_reinforcement.cc
	A			src/model/solid_mechanics/materials/material_reinforcement.hh
	P			src/model/solid_mechanics/materials/material_reinforcement_inline_impl.cc Copied from src/synchronizer/data_accessor.cc
	M			test/test_geometry/CMakeLists.txt
	P			test/test_geometry/test_geometry_mesh.cc Copied from test/test_geometry/test_geometry_intersection.cc