Diffusion akantu be8aed2cefbf

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

Authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> on Jul 14 2015, 13:33.

Description

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

Details

Committed

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

Jul 14 2015, 13:33

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

rAKAb3668a068626: fixed bug in cosine matrix (MaterialReinforcement)
rAKA89088a68b210: add a reference to the feengine the material, modification to dynamically…

Branches

Unknown

Tags

Unknown

Event Timeline

Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> committed rAKAbe8aed2cefbf: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch>).Jul 14 2015, 13:33

Merged Changes

Commit	Author	Details	Committed
b3668a068626	Lucas Frérot	fixed bug in cosine matrix (MaterialReinforcement)	Jul 13 2015
77064f508581	Lucas Frérot	made use of intersectors easier with MeshAbstractIntersector	Jul 13 2015
adf62ab5e66d	anciaux	Merge branch 'master' of gitolite:akantu	Jul 13 2015
a65be22768ca	anciaux	fixing the heat transfer tests	Jul 13 2015
3304043c0c61	richart	updateing meta data of submodules	Jul 13 2015
070a0968f192	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Jul 13 2015
6b4b0849fcd9	richart	Renaming of test_fem to test_fe_engine	Jul 13 2015
0b8d00ba3541	richart	Change of array output to correct the fe_engine test in Release mode	Jul 13 2015
eb4edae5197c	Clement Roux	bug fix2: geometry no longer use igfem type if AKANTU_IGFEM == false	Jul 13 2015
e628a4c48c38	Clement Roux	bug fix: geometry no longer use igfem type if AKANTU_IGFEM == false	Jul 13 2015
a6d17d8f6d59	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Jul 10 2015
183a75ee20a5	Clement Roux	mesh sphere intersector ready for growing gel pockets	Jul 10 2015
c846efc4c5fd	Lucas Frérot	fixed bugs in dumper for embedded model	Jul 9 2015
a8b4896b3c64	Clement Roux	Use of exact number type for spherical kernel with test tetrahedron	Jul 9 2015
b2845cd192b7	Clement Roux	Use of exact number type for spherical kernel	Jul 9 2015

Changes (186)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M	(sub)	extra_packages/igfem
M		packages/cgal.cmake
M		src/common/aka_array_tmpl.hh
M		src/common/aka_error.hh
M		src/fe_engine/fe_engine_template.hh
M		src/fe_engine/fe_engine_template_tmpl.hh
M		src/geometry/aabb_primitives/aabb_primitive.cc
M		src/geometry/geom_helper_functions.hh
P		src/geometry/mesh_abstract_intersector.hh Copied from src/geometry/mesh_geom_intersector.hh
P		src/geometry/mesh_abstract_intersector_tmpl.hh Copied from src/geometry/mesh_geom_intersector_tmpl.hh
M		src/geometry/mesh_geom_common.hh
M		src/geometry/mesh_geom_factory_tmpl.hh
P		src/geometry/mesh_geom_intersector.hh Copied to src/geometry/mesh_abstract_intersector.hh
P		src/geometry/mesh_geom_intersector_tmpl.hh Copied to src/geometry/mesh_abstract_intersector_tmpl.hh
M		src/geometry/mesh_segment_intersector.hh
M		src/geometry/mesh_segment_intersector_tmpl.hh
M		src/geometry/mesh_sphere_intersector.hh
M		src/geometry/mesh_sphere_intersector_tmpl.hh
M		src/model/heat_transfer/heat_transfer_model.cc
M		src/model/solid_mechanics/embedded_interface_intersector.cc
M		src/model/solid_mechanics/material.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/materials/material_embedded/material_reinforcement_inline_impl.cc
M		test/CMakeLists.txt
A	(dir)	test/test_fe_engine/
V		test/{test_fe_engine ← test_fem}/CMakeLists.txt
V		test/{test_fe_engine ← test_fem}/_b_beam_2.msh
V		test/{test_fe_engine ← test_fem}/_hexahedron_20.msh
V		test/{test_fe_engine ← test_fem}/_hexahedron_8.msh
V		test/{test_fe_engine ← test_fem}/_pentahedron_15.msh
V		test/{test_fe_engine ← test_fem}/_pentahedron_6.msh
V		test/{test_fe_engine ← test_fem}/_quadrangle_4.msh
V		test/{test_fe_engine ← test_fem}/_quadrangle_8.msh
V		test/{test_fe_engine ← test_fem}/_segment_2.msh
V		test/{test_fe_engine ← test_fem}/_segment_3.msh
V		test/{test_fe_engine ← test_fem}/_tetrahedron_10.msh
V		test/{test_fe_engine ← test_fem}/_tetrahedron_4.msh
V		test/{test_fe_engine ← test_fem}/_triangle_3.msh
V		test/{test_fe_engine ← test_fem}/_triangle_6.msh
V		test/{test_fe_engine ← test_fem}/circle.geo
V		test/{test_fe_engine ← test_fem}/cube.geo
V		test/{test_fe_engine ← test_fem}/cube_physical_names.geo
V		test/{test_fe_engine ← test_fem}/generate_test
V		test/{test_fe_engine ← test_fem}/hexa_structured.geo
V		test/{test_fe_engine ← test_fem}/line.geo
V		test/{test_fe_engine ← test_fem}/square.geo
V		test/{test_fe_engine ← test_fem}/square_structured.geo
V		test/{test_fe_engine ← test_fem}/test_facet_element_mapping.cc
P		test/test_fe_engine/test_fe_engine_precomputation.cc Copied from test/test_fem/test_interpolate.cc
A		test/test_fe_engine/test_fe_engine_precomputation_hexahedron_20.verified
A		test/test_fe_engine/test_fe_engine_precomputation_hexahedron_8.verified
A		test/test_fe_engine/test_fe_engine_precomputation_pentahedron_15.verified
A		test/test_fe_engine/test_fe_engine_precomputation_pentahedron_6.verified
A		test/test_fe_engine/test_fe_engine_precomputation_quadrangle_4.verified
A		test/test_fe_engine/test_fe_engine_precomputation_quadrangle_8.verified
A		test/test_fe_engine/test_fe_engine_precomputation_segment_2.verified
A		test/test_fe_engine/test_fe_engine_precomputation_segment_3.verified
A		test/test_fe_engine/test_fe_engine_precomputation_tetrahedron_10.verified
A		test/test_fe_engine/test_fe_engine_precomputation_tetrahedron_4.verified
A		test/test_fe_engine/test_fe_engine_precomputation_triangle_3.verified
A		test/test_fe_engine/test_fe_engine_precomputation_triangle_6.verified
V		test/{test_fe_engine ← test_fem}/test_gradient.cc
A		test/test_fe_engine/test_gradient_hexahedron_20.verified
A		test/test_fe_engine/test_gradient_hexahedron_8.verified
A		test/test_fe_engine/test_gradient_quadrangle_4.verified
A		test/test_fe_engine/test_gradient_quadrangle_8.verified
A		test/test_fe_engine/test_gradient_segment_2.verified
A		test/test_fe_engine/test_gradient_segment_3.verified
A		test/test_fe_engine/test_gradient_tetrahedron_10.verified
A		test/test_fe_engine/test_gradient_tetrahedron_4.verified
A		test/test_fe_engine/test_gradient_triangle_3.verified
A		test/test_fe_engine/test_gradient_triangle_6.verified
V		test/{test_fe_engine ← test_fem}/test_integrate.cc
A		test/test_fe_engine/test_integrate_hexahedron_20.verified
A		test/test_fe_engine/test_integrate_hexahedron_8.verified
A		test/test_fe_engine/test_integrate_quadrangle_4.verified
A		test/test_fe_engine/test_integrate_quadrangle_8.verified
A		test/test_fe_engine/test_integrate_segment_2.verified
A		test/test_fe_engine/test_integrate_segment_3.verified
A		test/test_fe_engine/test_integrate_tetrahedron_10.verified
A		test/test_fe_engine/test_integrate_tetrahedron_4.verified
A		test/test_fe_engine/test_integrate_triangle_3.verified
A		test/test_fe_engine/test_integrate_triangle_6.verified
V		test/{test_fe_engine ← test_fem}/test_interpolate.cc
V		test/{test_fe_engine ← test_fem}/test_interpolate_bernoulli_beam_2.cc
V		test/{test_fe_engine ← test_fem}/test_interpolate_bernoulli_beam_2.verified
A		test/test_fe_engine/test_interpolate_hexahedron_20.verified
A		test/test_fe_engine/test_interpolate_hexahedron_8.verified
A		test/test_fe_engine/test_interpolate_quadrangle_4.verified
A		test/test_fe_engine/test_interpolate_quadrangle_8.verified
A		test/test_fe_engine/test_interpolate_segment_2.verified
A		test/test_fe_engine/test_interpolate_segment_3.verified
A		test/test_fe_engine/test_interpolate_tetrahedron_10.verified
A		test/test_fe_engine/test_interpolate_tetrahedron_4.verified
A		test/test_fe_engine/test_interpolate_triangle_3.verified
A		test/test_fe_engine/test_interpolate_triangle_6.verified
V		test/{test_fe_engine ← test_fem}/test_inverse_map.cc
V		test/{test_fe_engine ← test_fem}/test_inverse_map_hexahedron_20.verified
V		test/{test_fe_engine ← test_fem}/test_inverse_map_hexahedron_8.verified
V		test/{test_fe_engine ← test_fem}/test_inverse_map_quadrangle_4.verified
V		test/{test_fe_engine ← test_fem}/test_inverse_map_quadrangle_8.verified
V		test/{test_fe_engine ← test_fem}/test_inverse_map_segment_2.verified
V		test/{test_fe_engine ← test_fem}/test_inverse_map_segment_3.verified
V		test/{test_fe_engine ← test_fem}/test_inverse_map_tetrahedron_10.verified
V		test/{test_fe_engine ← test_fem}/test_inverse_map_tetrahedron_4.verified
V		test/{test_fe_engine ← test_fem}/test_inverse_map_triangle_3.verified
V		test/{test_fe_engine ← test_fem}/test_inverse_map_triangle_6.verified
V		test/{test_fe_engine ← test_fem}/test_mesh_boundary.cc
V		test/{test_fe_engine ← test_fem}/test_mesh_data.cc
D		test/test_fem
V		test/{test_fem → test_fe_engine}/CMakeLists.txt
V		test/{test_fem → test_fe_engine}/_b_beam_2.msh
V		test/{test_fem → test_fe_engine}/_hexahedron_20.msh
V		test/{test_fem → test_fe_engine}/_hexahedron_8.msh
V		test/{test_fem → test_fe_engine}/_pentahedron_15.msh
V		test/{test_fem → test_fe_engine}/_pentahedron_6.msh
V		test/{test_fem → test_fe_engine}/_quadrangle_4.msh
V		test/{test_fem → test_fe_engine}/_quadrangle_8.msh
V		test/{test_fem → test_fe_engine}/_segment_2.msh
V		test/{test_fem → test_fe_engine}/_segment_3.msh
V		test/{test_fem → test_fe_engine}/_tetrahedron_10.msh
V		test/{test_fem → test_fe_engine}/_tetrahedron_4.msh
V		test/{test_fem → test_fe_engine}/_triangle_3.msh
V		test/{test_fem → test_fe_engine}/_triangle_6.msh
V		test/{test_fem → test_fe_engine}/circle.geo
V		test/{test_fem → test_fe_engine}/cube.geo
V		test/{test_fem → test_fe_engine}/cube_physical_names.geo
V		test/{test_fem → test_fe_engine}/generate_test
V		test/{test_fem → test_fe_engine}/hexa_structured.geo
V		test/{test_fem → test_fe_engine}/line.geo
V		test/{test_fem → test_fe_engine}/square.geo
V		test/{test_fem → test_fe_engine}/square_structured.geo
V		test/{test_fem → test_fe_engine}/test_facet_element_mapping.cc
V		test/{test_fem → test_fe_engine}/test_gradient.cc
D		test/test_fem/test_gradient_hexahedron_20.verified
D		test/test_fem/test_gradient_hexahedron_8.verified
D		test/test_fem/test_gradient_quadrangle_4.verified
D		test/test_fem/test_gradient_quadrangle_8.verified
D		test/test_fem/test_gradient_segment_2.verified
D		test/test_fem/test_gradient_segment_3.verified
D		test/test_fem/test_gradient_tetrahedron_10.verified
D		test/test_fem/test_gradient_tetrahedron_4.verified
D		test/test_fem/test_gradient_triangle_3.verified
D		test/test_fem/test_gradient_triangle_6.verified
V		test/{test_fem → test_fe_engine}/test_integrate.cc
D		test/test_fem/test_integrate_hexahedron_20.verified
D		test/test_fem/test_integrate_hexahedron_8.verified
D		test/test_fem/test_integrate_quadrangle_4.verified
D		test/test_fem/test_integrate_quadrangle_8.verified
D		test/test_fem/test_integrate_segment_2.verified
D		test/test_fem/test_integrate_segment_3.verified
D		test/test_fem/test_integrate_tetrahedron_10.verified
D		test/test_fem/test_integrate_tetrahedron_4.verified
D		test/test_fem/test_integrate_triangle_3.verified
D		test/test_fem/test_integrate_triangle_6.verified
P		test/test_fem/test_interpolate.cc Deleted after being copied to multiple locations: test/test_fe_engine/test_fe_engine_precomputation.cc test/test_fe_engine/test_interpolate.cc
V		test/{test_fem → test_fe_engine}/test_interpolate_bernoulli_beam_2.cc
V		test/{test_fem → test_fe_engine}/test_interpolate_bernoulli_beam_2.verified
D		test/test_fem/test_interpolate_hexahedron_20.verified
D		test/test_fem/test_interpolate_hexahedron_8.verified
D		test/test_fem/test_interpolate_quadrangle_4.verified
D		test/test_fem/test_interpolate_quadrangle_8.verified
D		test/test_fem/test_interpolate_segment_2.verified
D		test/test_fem/test_interpolate_segment_3.verified
D		test/test_fem/test_interpolate_tetrahedron_10.verified
D		test/test_fem/test_interpolate_tetrahedron_4.verified
D		test/test_fem/test_interpolate_triangle_3.verified
D		test/test_fem/test_interpolate_triangle_6.verified
V		test/{test_fem → test_fe_engine}/test_inverse_map.cc
V		test/{test_fem → test_fe_engine}/test_inverse_map_hexahedron_20.verified
V		test/{test_fem → test_fe_engine}/test_inverse_map_hexahedron_8.verified
V		test/{test_fem → test_fe_engine}/test_inverse_map_quadrangle_4.verified
V		test/{test_fem → test_fe_engine}/test_inverse_map_quadrangle_8.verified
V		test/{test_fem → test_fe_engine}/test_inverse_map_segment_2.verified
V		test/{test_fem → test_fe_engine}/test_inverse_map_segment_3.verified
V		test/{test_fem → test_fe_engine}/test_inverse_map_tetrahedron_10.verified
V		test/{test_fem → test_fe_engine}/test_inverse_map_tetrahedron_4.verified
V		test/{test_fem → test_fe_engine}/test_inverse_map_triangle_3.verified
V		test/{test_fem → test_fe_engine}/test_inverse_map_triangle_6.verified
V		test/{test_fem → test_fe_engine}/test_mesh_boundary.cc
V		test/{test_fem → test_fe_engine}/test_mesh_data.cc
M		test/test_geometry/test_geometry_intersection.cc
M		test/test_geometry/test_geometry_intersection_tetrahedron_4.cc
M		test/test_model/test_solid_mechanics_model/test_embedded_interface/CMakeLists.txt
M		test/test_model/test_solid_mechanics_model/test_embedded_interface/test_embedded_interface_model.cc