Diffusion akantu 850e169d52c0

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

Authored by richart on Mar 30 2015, 22:11.

Description

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

Conflicts:
src/fe_engine/geometrical_element.cc

Details

Committed

richart

Mar 30 2015, 22:11

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

rAKAb6583ee9cc52: Corrected bugs with embedded model
rAKAd130997e6472: Modification sof the package system for third-party + making functions more…

Branches

Unknown

Tags

Unknown

Event Timeline

richart committed rAKA850e169d52c0: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by richart).Mar 30 2015, 22:11

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

Merged Changes

Commit	Author	Details	Committed
b6583ee9cc52	Lucas Frérot	Corrected bugs with embedded model	Mar 30 2015
a3a7aba9a7ea	molyneau	added rgib in students-extra-package	Mar 30 2015
68e28d10eb2c	molyneau	extra package	Mar 27 2015
60ed12fddf5b	corrado	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Mar 27 2015
4d6c6d596e56	Marco Vocialta	Adding the dumping of Green and principal strains	Mar 27 2015
b2cab96fd3d7	corrado	modification to material_cohesive_linear.cc and implementation of hexa20 and…	Mar 27 2015
80a2d1be7767	Lucas Frérot	Fixed matrix param copy in parsable	Mar 27 2015
66bd85835912	Lucas Frérot	Added computation of mesh intersections for _tetrahedron_4 elements	Mar 26 2015
a48d455bb728	corrado	modifications related to extrinsic-implicit cohesive method	Mar 25 2015
3bf2516c3195	Lucas Frérot	Finished implementing embedded model	Mar 25 2015
c7d283e24031	Marco Vocialta	Adding the possibility of dumping strain and Von Mises stress	Mar 24 2015
33d07e80730b	corrado	modification to enable extrinsic implicit cohesive element method	Mar 6 2015
179c23d61404	corrado	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Mar 3 2015
b90dc8080730	corrado	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Feb 26 2015
fb4a4cc192f1	corrado	adding solveStepCohesive for implicit extrinsic cohesive elements	Feb 26 2015

Changes (75)

		Path
M		doc/manual/manual-io.tex
M	(sub)	extra_packages/extra-materials
A	(sub)	extra_packages/students-extra-package
M		packages/cohesive_element.cmake
M		packages/core.cmake
M		packages/embedded.cmake
M		src/common/aka_common.hh
M		src/common/aka_common_inline_impl.cc
M		src/fe_engine/element_class.cc
M		src/fe_engine/element_class.hh
A		src/fe_engine/element_classes/element_class_hexahedron_20_inline_impl.cc
A		src/fe_engine/element_classes/element_class_pentahedron_15_inline_impl.cc
M		src/fe_engine/geometrical_element.cc
M		src/fe_engine/integration_element.cc
M		src/fe_engine/interpolation_element_tmpl.hh
M		src/geometry/aabb_primitives/aabb_primitive.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/io/dumper/dumper_material_padders.hh
M		src/io/mesh_io/mesh_io_msh.cc
M		src/io/mesh_io/mesh_io_msh.hh
M		src/io/parser/parsable_tmpl.hh
M		src/io/parser/parser.hh
A		src/model/solid_mechanics/embedded_interface.cc
P		src/model/solid_mechanics/embedded_interface.hh Copied from src/io/model_io.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_inline_impl.cc
M		src/model/solid_mechanics/material_list.hh
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.cc
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.hh
M		src/model/solid_mechanics/materials/material_cohesive/material_cohesive.cc
A	(dir)	src/model/solid_mechanics/materials/material_embedded/
P		src/model/solid_mechanics/materials/material_embedded/embedded_internal_field.hh Copied from src/io/model_io/model_io_ibarras.hh
V		src/model/solid_mechanics/materials/{material_embedded ← }/material_embedded_includes.hh
A		src/model/solid_mechanics/materials/material_embedded/material_reinforcement.cc
V		src/model/solid_mechanics/materials/{material_embedded ← }/material_reinforcement.hh
V		src/model/solid_mechanics/materials/{material_embedded ← }/material_reinforcement_inline_impl.cc
A		src/model/solid_mechanics/materials/material_embedded/material_reinforcement_template.hh
A		src/model/solid_mechanics/materials/material_embedded/material_reinforcement_template_inline_impl.cc
V		src/model/solid_mechanics/materials/{ → material_embedded}/material_embedded_includes.hh
D		src/model/solid_mechanics/materials/material_reinforcement.cc
V		src/model/solid_mechanics/materials/{ → material_embedded}/material_reinforcement.hh
V		src/model/solid_mechanics/materials/{ → material_embedded}/material_reinforcement_inline_impl.cc
M		src/model/solid_mechanics/solid_mechanics_model.cc
M		src/model/solid_mechanics/solid_mechanics_model.hh
M		src/model/solid_mechanics/solid_mechanics_model_cohesive.cc
M		src/model/solid_mechanics/solid_mechanics_model_cohesive.hh
A		src/model/solid_mechanics/solid_mechanics_model_cohesive_inline_impl.cc
P		test/test_geometry/CMakeLists.txt Copied to test/test_model/test_solid_mechanics_model/test_embedded_interface/CMakeLists.txt
V		test/test_geometry/{mesh.geo → triangle_3.geo}
M		test/test_geometry/test_geometry_intersection.cc
P		test/test_geometry/test_geometry_intersection_tetrahedron_4.cc Copied from test/test_geometry/test_geometry_mesh.cc
V		test/test_geometry/{test_geometry_intersection_triangle_3.cc ← test_geometry_mesh.cc}
P		test/test_geometry/test_geometry_mesh.cc Deleted after being copied to multiple locations: test/test_geometry/test_geometry_intersection_tetrahedron_4.cc test/test_geometry/test_geometry_intersection_triangle_3.cc
P		test/test_geometry/test_geometry_predicates.cc Copied from src/geometry/mesh_geom_abstract.cc
A		test/test_geometry/tetrahedron_4.geo
V		test/test_geometry/{triangle_3.geo ← mesh.geo}
M		test/test_model/test_solid_mechanics_model/CMakeLists.txt
A	(dir)	test/test_model/test_solid_mechanics_model/test_embedded_interface/
P		test/test_model/test_solid_mechanics_model/test_embedded_interface/CMakeLists.txt Copied from test/test_geometry/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/embedded_element.dat
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/embedded_mesh.msh
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/material.dat
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/matrix
A		test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_element_matrix.cc
A		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.sh
P		test/test_model/test_solid_mechanics_model/test_embedded_interface/triangle.msh Copied from test/test_model/test_solid_mechanics_model/patch_tests/data/_segment_2.msh