Diffusion akantu 6a4008333ad0

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

Authored by corrado on May 4 2015, 16:16.

Description

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

Details

Committed

corrado

May 4 2015, 16:16

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

rAKAd342eb95aeda: modified dumper functions for dumping stress_embedded in embedded model
rAKAaa6acea078bb: comments added in material_cohesive_linear.cc

Branches

Unknown

Tags

Unknown

Event Timeline

corrado committed rAKA6a4008333ad0: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by corrado).May 4 2015, 16:16

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

Merged Changes

Commit	Author	Details	Committed
d342eb95aeda	Lucas Frérot	modified dumper functions for dumping stress_embedded in embedded model	May 4 2015
01701e25c678	Lucas Frérot	modified TREE_TYPE_HELPER_MACRO	May 4 2015
6fff7f6f7a0e	Lucas Frérot	added test for MeshDataMaterialSelector	May 1 2015
e94731e758b1	Lucas Frérot	rearranged material selectors for easier subclassing	May 1 2015
c2b83fa87ed0	Lucas Frérot	Merge branch 'master' of lsmssrv1.epfl.ch:akantu-students	May 1 2015
8e99f234f929	Lucas Frérot	reinforcements can now be read in a seperate mesh	May 1 2015
7dd6ebd6c9db	Lucas Frérot	fixed bug with negative mumps error codes	Apr 30 2015
18c859a8b7a5	Lucas Frérot	geometry module rework	Apr 29 2015

Changes (49)

				Path
	M			packages/cgal.cmake
	M			packages/embedded.cmake
	M			src/geometry/aabb_primitives/aabb_primitive.hh
	M			src/geometry/geom_helper_functions.hh
	M			src/geometry/mesh_geom_abstract.hh
	D			src/geometry/mesh_geom_container.cc
	D			src/geometry/mesh_geom_container.hh
	M			src/geometry/mesh_geom_factory.hh
	A			src/geometry/mesh_geom_factory_inline_impl.cc
	M			src/geometry/mesh_geom_factory_tmpl.hh
	A			src/geometry/mesh_geom_intersector.hh
	A			src/geometry/mesh_geom_intersector_tmpl.hh
	A			src/geometry/mesh_segment_intersector.hh
	A			src/geometry/mesh_segment_intersector_tmpl.hh
	M			src/geometry/tree_type_helper.hh
	M			src/model/model.cc
	M			src/model/model.hh
	D			src/model/solid_mechanics/embedded_interface.cc
	D			src/model/solid_mechanics/embedded_interface.hh
	A			src/model/solid_mechanics/embedded_interface_intersector.cc
	A			src/model/solid_mechanics/embedded_interface_intersector.hh
	M			src/model/solid_mechanics/embedded_interface_model.cc
	M			src/model/solid_mechanics/embedded_interface_model.hh
	M			src/model/solid_mechanics/material.hh
	M			src/model/solid_mechanics/material_selector.hh
	P			src/model/solid_mechanics/material_selector_tmpl.hh Copied from src/io/model_io.cc
	M			src/model/solid_mechanics/materials/material_embedded/material_reinforcement.cc
	M			src/model/solid_mechanics/materials/material_embedded/material_reinforcement.hh
	M			src/model/solid_mechanics/solid_mechanics_model.cc
	M			src/model/solid_mechanics/solid_mechanics_model.hh
	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
	M			test/test_model/test_solid_mechanics_model/CMakeLists.txt
	A			test/test_model/test_solid_mechanics_model/material_selector.dat
	A			test/test_model/test_solid_mechanics_model/material_selector.geo
	A			test/test_model/test_solid_mechanics_model/material_selector.msh
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/CMakeLists.txt
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/embedded_element.dat
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/embedded_mesh.msh
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/embedded_mesh_prestress.msh
	A			test/test_model/test_solid_mechanics_model/test_embedded_interface/embedded_mesh_prestress_reinforcement.msh
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/material.dat
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/prestress.dat
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_element_matrix.cc
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_interface_model.cc
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_interface_model_prestress.cc
	M			test/test_model/test_solid_mechanics_model/test_embedded_interface/triangle.msh
	A			test/test_model/test_solid_mechanics_model/test_material_selector.cc