Diffusion akantu 82705d8f23c3

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

Authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> on Jun 18 2015, 11:53.

Description

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

Conflicts:
src/common/aka_common.hh
src/common/aka_common_inline_impl.cc

Details

Committed

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

Jun 18 2015, 11: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

rAKAaa23fede75a2: some comments to the quadrature point class
rAKA79c0eea6f9de: set IDs

Branches

Unknown

Tags

Unknown

Event Timeline

Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> committed rAKA82705d8f23c3: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch>).Jun 18 2015, 11:53

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

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
aa23fede75a2	anciaux	some comments to the quadrature point class	Jun 17 2015
c7db7571d394	anciaux	Merge branch 'master' of gitolite:akantu	Jun 17 2015
acc4b049560d	anciaux	separate the quadrature point class in a dedicated file	Jun 17 2015
60604f2e6893	corrado	conflict solved	Jun 17 2015
f253a9d01460	corrado	bug fix in test_cohesive_extrinsic_implicit	Jun 16 2015
e0b276053620	anciaux	avoid mauro to pay a beer	Jun 16 2015
136ba474491d	corrado	definition of the lumped mass by scaling the diagonal terms of the consistent…	Jun 16 2015
5c19cff11493	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Jun 12 2015
751af29e6f7a	richart	Correction in the computation of the mass matrix	Jun 12 2015
4874538ef417	richart	change for mumps 5.0.0	Jun 12 2015
29701078887b	richart	bug fix for cmake < 3.2	Jun 10 2015
79747879aafc	richart	Modified packages for less verbose and no update when disconnected	Jun 10 2015
abc39fe1ae35	anciaux	modify the doc for trapezoidal integrator	Jun 9 2015
95d04bd048fb	richart	update submodules	Jun 9 2015
30117a7b6794	molyneau	corrected ugly typo in RGIB	Jun 7 2015
ae0cf4dc417f	anciaux	Merge branch 'master' of gitolite:akantu	Jun 5 2015
96edddadb091	anciaux	implementing implicit dynamics for heat transfer model	Jun 5 2015
6421d1c9b447	Marco Vocialta	Adding the possibility to have zero tolerance with are_float_equal	Jun 5 2015
785ad9cf3287	Lucas Frérot	corrected nu for 1D material elastic + material reinforcement template	Jun 5 2015
26fd029ead83	anciaux	adding implicit dynamics to heat transfer model	Jun 5 2015
ec1c22bc92e6	anciaux	Merge branch 'master' of gitolite:akantu	Jun 4 2015
38cac290ab18	anciaux	adding the istream reading possibility to elementypes	Jun 4 2015
0259fd809386	Lucas Frérot	added possibility to not use AABB tree algo + typo	Jun 4 2015
1a0bd93b7cca	anciaux	correct a super ugly typo	Jun 4 2015
ce42e7af33c2	anciaux	correct a super ugly typo	Jun 4 2015
b107fd65234d	anciaux	correct a super ugly typo	Jun 4 2015
fa02ee445d4b	anciaux	Merge branch 'master' of gitolite:akantu	Jun 3 2015
ba40bf91d33d	anciaux	add << to elementtypemap	Jun 3 2015
6c1f7eacac7b	Clement Roux	Destroy properly SolverMumps	Jun 3 2015
6b09b61c2403	anciaux	rearrange again the meshiodiana	Jun 2 2015
46357dcc7b48	Lucas Frérot	fixed link problem + added spherical traits file	Jun 2 2015
aa997a2c3218	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Jun 2 2015
7b204375a02f	Clement Roux	intersect CGAL sphere line_arc, need custom AABBTraits	Jun 2 2015
450e17fdba26	anciaux	triangle6 and quadrangle8 Diana reader had to be changed	Jun 2 2015
9fc3d77b8df2	molyneau	Merge branch 'master' of lsmssrv1.epfl.ch:akantu-students	Jun 1 2015
830bd1ec0495	molyneau	final version of RGIB model	Jun 1 2015
4453a52c8f8e	anciaux	temporary comment	Jun 1 2015
0e3936d17c94	Lucas Frérot	Merge branch 'master' of lsmssrv1.epfl.ch:akantu-students	Jun 1 2015
1e477125e7eb	Lucas Frérot	opened the possibility for finer initialization of material internals	Jun 1 2015
02dd97743c6d	anciaux	in meshio remove a function to be implemented: replaced with the mother default…	Jun 1 2015
ffd11cacaefc	anciaux	render the creation of meshio static	Jun 1 2015
fc32600c244b	anciaux	correct an invalid output message	Jun 1 2015
a3b2178bf109	anciaux	meshio printself now exists	Jun 1 2015
ebfdde1c3adc	anciaux	temporary changes over meshio diana	Jun 1 2015
7f680ecc426f	anciaux	Merge branch 'master' of gitolite:akantu	May 29 2015
b8b6a0e28385	anciaux	fix the diana meshio	May 29 2015
f98c780492fc	corrado	problem of memory leak solved in material_cohesive_linear	May 29 2015
ecf274c1ee81	corrado	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	May 29 2015
4fe603b63edd	corrado	merge conflict solved	May 29 2015
0d49513d7d24	Lucas Frérot	modified MaterialReinforcementTemplate for plasticity	May 29 2015

Changes (217)

		Path
M		cmake/AkantuTestAndExamples.cmake
M		cmake/Modules/CMakePackagesSystem.cmake
M	(sub)	extra_packages/extra-materials
P		packages/blackdynamite.cmake Copied from test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/CMakeLists.txt
M		packages/cgal.cmake
M		packages/embedded.cmake
M		packages/iohelper.cmake
M		packages/scotch.cmake
M		python/swig/aka_common.i
M		python/swig/mesh.i
M		src/common/aka_array.hh
M		src/common/aka_common.hh
M		src/common/aka_common_inline_impl.cc
M		src/common/aka_config.hh.in
M		src/common/aka_math.cc
M		src/common/aka_math.hh
M		src/common/aka_math_tmpl.hh
M		src/common/aka_types.hh
M		src/fe_engine/element_classes/element_class_pentahedron_15_inline_impl.cc
M		src/fe_engine/fe_engine.cc
M		src/fe_engine/fe_engine.hh
M		src/fe_engine/fe_engine_template_tmpl.hh
M		src/fe_engine/integration_element.cc
M		src/fe_engine/integrator_gauss.hh
M		src/fe_engine/integrator_gauss_inline_impl.cc
A		src/fe_engine/quadrature_point.hh
P		src/geometry/aabb_primitives/aabb_primitive.cc Copied from src/model/solid_mechanics/materials/material_embedded/material_embedded_includes.hh
M		src/geometry/aabb_primitives/aabb_primitive.hh
P		src/geometry/aabb_primitives/line_arc.hh Copied from src/geometry/aabb_primitives/triangle.hh
M		src/geometry/aabb_primitives/tetrahedron.hh
P		src/geometry/aabb_primitives/triangle.hh Copied to multiple locations: src/geometry/aabb_primitives/line_arc.hh src/geometry/mesh_geom_spherical_traits.hh
M		src/geometry/geom_helper_functions.hh
M		src/geometry/mesh_geom_abstract.hh
A		src/geometry/mesh_geom_common.hh
D		src/geometry/mesh_geom_container.cc
D		src/geometry/mesh_geom_container.hh
M		src/geometry/mesh_geom_factory.hh
M		src/geometry/mesh_geom_factory_tmpl.hh
A		src/geometry/mesh_geom_intersector.hh
A		src/geometry/mesh_geom_intersector_tmpl.hh
P		src/geometry/mesh_geom_spherical_traits.hh Copied from src/geometry/aabb_primitives/triangle.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/io/dumper/dumpable.cc
M		src/io/dumper/dumpable_inline_impl.hh
M		src/io/dumper/dumper_element_iterator.hh
M		src/io/mesh_io.cc
M		src/io/mesh_io.hh
M		src/io/mesh_io/mesh_io_diana.cc
M		src/io/mesh_io/mesh_io_diana.hh
M		src/io/mesh_io/mesh_io_msh.cc
M		src/io/mesh_io/mesh_io_msh.hh
M		src/io/parser/algebraic_parser.hh
M		src/io/parser/input_file_parser.hh
M		src/io/parser/parser.cc
M		src/io/parser/parser_tmpl.hh
M		src/mesh/element_type_map_tmpl.hh
M		src/mesh/group_manager.cc
M		src/mesh/group_manager.hh
M		src/mesh/mesh.cc
M		src/mesh/mesh_inline_impl.cc
M		src/mesh/node_group.cc
M		src/mesh/node_group.hh
M		src/mesh_utils/cohesive_element_inserter.cc
M		src/mesh_utils/cohesive_element_inserter.hh
M		src/mesh_utils/mesh_utils.cc
M		src/mesh_utils/mesh_utils.hh
M		src/model/boundary_condition_functor.hh
M		src/model/heat_transfer/heat_transfer_model.cc
M		src/model/heat_transfer/heat_transfer_model.hh
M		src/model/heat_transfer/heat_transfer_model_inline_impl.cc
M		src/model/integration_scheme/generalized_trapezoidal.hh
M		src/model/integration_scheme/generalized_trapezoidal_inline_impl.cc
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.cc
M		src/model/solid_mechanics/material.hh
M		src/model/solid_mechanics/material_inline_impl.cc
M		src/model/solid_mechanics/material_selector.hh
M		src/model/solid_mechanics/material_selector_tmpl.hh
M		src/model/solid_mechanics/materials/internal_field.hh
M		src/model/solid_mechanics/materials/internal_field_tmpl.hh
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_bilinear.cc
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_exponential.cc
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/constitutive_laws/material_cohesive_linear_fatigue.cc
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear_fatigue.hh
M		src/model/solid_mechanics/materials/material_cohesive/material_cohesive.hh
M		src/model/solid_mechanics/materials/material_damage/material_marigo.cc
M		src/model/solid_mechanics/materials/material_damage/material_mazars.cc
M		src/model/solid_mechanics/materials/material_damage/material_mazars_non_local.cc
M		src/model/solid_mechanics/materials/material_elastic.cc
M		src/model/solid_mechanics/materials/material_elastic.hh
M		src/model/solid_mechanics/materials/material_elastic_inline_impl.cc
M		src/model/solid_mechanics/materials/material_elastic_linear_anisotropic.cc
M		src/model/solid_mechanics/materials/material_elastic_orthotropic.cc
P		src/model/solid_mechanics/materials/material_embedded/material_embedded_includes.hh Copied to src/geometry/aabb_primitives/aabb_primitive.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_template.hh
V		src/model/solid_mechanics/materials/material_embedded/{material_reinforcement_template_inline_impl.cc → material_reinforcement_template_tmpl.hh}
V		src/model/solid_mechanics/materials/material_embedded/{material_reinforcement_template_tmpl.hh ← material_reinforcement_template_inline_impl.cc}
M		src/model/solid_mechanics/materials/material_finite_deformation/material_neohookean.cc
M		src/model/solid_mechanics/materials/material_plastic/material_linear_isotropic_hardening.cc
M		src/model/solid_mechanics/materials/material_plastic/material_linear_isotropic_hardening.hh
M		src/model/solid_mechanics/materials/material_plastic/material_linear_isotropic_hardening_inline_impl.cc
M		src/model/solid_mechanics/materials/material_plastic/material_plastic.cc
M		src/model/solid_mechanics/materials/material_plastic/material_plastic.hh
M		src/model/solid_mechanics/materials/material_thermal.cc
M		src/model/solid_mechanics/materials/material_thermal.hh
M		src/model/solid_mechanics/materials/material_viscoelastic/material_standard_linear_solid_deviatoric.cc
M		src/model/solid_mechanics/materials/plane_stress_toolbox.hh
M		src/model/solid_mechanics/materials/plane_stress_toolbox_tmpl.hh
M		src/model/solid_mechanics/materials/weight_function.hh
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
M		src/model/solid_mechanics/solid_mechanics_model_cohesive_inline_impl.cc
M		src/model/solid_mechanics/solid_mechanics_model_inline_impl.cc
M		src/model/solid_mechanics/solid_mechanics_model_mass.cc
M		src/solver/petsc_matrix.cc
M		src/solver/solver.cc
M		src/solver/solver_mumps.cc
M		src/solver/static_solver.cc
M		src/synchronizer/distributed_synchronizer.cc
M		test/CMakeLists.txt
M		test/test_common/CMakeLists.txt
A		test/test_common/test_types.cc
M		test/test_fem/CMakeLists.txt
A		test/test_fem/_pentahedron_15.msh
A		test/test_fem/_pentahedron_6.msh
M		test/test_fem/test_gradient_hexahedron_20.verified
M		test/test_fem/test_integrate_hexahedron_20.verified
M		test/test_fem/test_interpolate_hexahedron_20.verified
M		test/test_fem/test_inverse_map_hexahedron_20.verified
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_geometry/test_geometry_predicates.cc
M		test/test_geometry/test_geometry_tetrahedron.msh
M		test/test_geometry/test_geometry_triangle.msh
M		test/test_io/test_parser/input_file.dat
M		test/test_io/test_parser/test_parser.verified
M		test/test_mesh_utils/CMakeLists.txt
A	(dir)	test/test_mesh_utils/test_buildfacets/
P		test/test_mesh_utils/test_buildfacets/CMakeLists.txt Copied from test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/CMakeLists.txt
V		test/{test_mesh_utils/test_buildfacets ← test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets}/hexahedron.msh
V		test/{test_mesh_utils/test_buildfacets/test_buildfacets_hexahedron.cc ← test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/test_cohesive_buildfacets_hexahedron.cc}
V		test/{test_mesh_utils/test_buildfacets/test_buildfacets_tetrahedron.cc ← test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/test_cohesive_buildfacets_tetrahedron.cc}
V		test/{test_mesh_utils/test_buildfacets ← test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets}/tetrahedron.msh
D		test/test_mesh_utils/test_facet_extraction
D		test/test_mesh_utils/test_facet_extraction/CMakeLists.txt
D		test/test_mesh_utils/test_facet_extraction/cube.geo
D		test/test_mesh_utils/test_facet_extraction/square.geo
D		test/test_mesh_utils/test_facet_extraction/test_facet_extraction_tetrahedron_4.cc
D		test/test_mesh_utils/test_facet_extraction/test_facet_extraction_triangle_3.cc
M		test/test_mesh_utils/test_mesh_partitionate/test_mesh_partitionate_mesh_data.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/patch_tests/data/material_anisotropic.dat
M		test/test_model/test_solid_mechanics_model/test_cohesive/CMakeLists.txt
D		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets
P		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/CMakeLists.txt Deleted after being copied to multiple locations: packages/blackdynamite.cmake test/test_mesh_utils/test_buildfacets/CMakeLists.txt test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic_implicit/CMakeLists.txt
V		test/{test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets → test_mesh_utils/test_buildfacets}/hexahedron.msh
V		test/{test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/test_cohesive_buildfacets_hexahedron.cc → test_mesh_utils/test_buildfacets/test_buildfacets_hexahedron.cc}
V		test/{test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets/test_cohesive_buildfacets_tetrahedron.cc → test_mesh_utils/test_buildfacets/test_buildfacets_tetrahedron.cc}
V		test/{test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_buildfacets → test_mesh_utils/test_buildfacets}/tetrahedron.msh
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/CMakeLists.txt
D		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/fatigue.geo
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/fatigue.msh
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/material_fatigue.dat
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/test_cohesive_extrinsic_fatigue.cc
A	(dir)	test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic_implicit/
V		test/test_model/test_solid_mechanics_model/test_cohesive/{test_cohesive_extrinsic_implicit ← test_cohesive_buildfacets}/CMakeLists.txt
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic_implicit/K_matrix_verified.dat
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic_implicit/material.dat
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic_implicit/quadrangle.msh
A		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic_implicit/test_assembling_K_cohe_elements.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/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
M		test/test_model/test_solid_mechanics_model/test_materials/CMakeLists.txt
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/CMakeLists.txt
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/material_damage_non_local.dat
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/test_material_damage_non_local.cc
D		test/test_surface_extraction
D		test/test_surface_extraction/CMakeLists.txt
D		test/test_surface_extraction/cubes.geo
D		test/test_surface_extraction/squares.geo
D		test/test_surface_extraction/test_surface_extraction_tetrahedron_4.cc
D		test/test_surface_extraction/test_surface_extraction_triangle_3.cc
M		third-party/MUMPS_4.10.0_make.inc.cmake
A		third-party/cmake/blackdynamite.cmake
M		third-party/cmake/iohelper.cmake
M		third-party/cmake/mumps.cmake
M		third-party/cmake/scalapack.cmake
M		third-party/cmake/scotch.cmake