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

Authored by richart on Jul 1 2015, 11:21.

Description

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

Conflicts:
src/model/solid_mechanics/embedded_interface_model.cc
src/model/solid_mechanics/material.hh
src/model/solid_mechanics/material_inline_impl.cc
src/model/solid_mechanics/materials/material_embedded/material_reinforcement.cc
src/model/solid_mechanics/materials/material_embedded/material_reinforcement.hh
src/model/solid_mechanics/materials/material_embedded/material_reinforcement_template.hh
src/model/solid_mechanics/materials/material_embedded/material_reinforcement_template_tmpl.hh
src/model/solid_mechanics/solid_mechanics_model.cc
src/model/solid_mechanics/solid_mechanics_model.hh

Details

Committed

richart

Jul 1 2015, 11:21

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

rAKA5a96a726f378: Fixing the transition from fatigue to standard behavior of the cohesive fatigue…
rAKAd92bdc5cecdf: changes for facet dumper

Branches

Unknown

Tags

Unknown

Event Timeline

richart committed rAKAf4b9a7d1e96d: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by richart).Jul 1 2015, 11:21

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
5a96a726f378	Marco Vocialta	Fixing the transition from fatigue to standard behavior of the cohesive fatigue…	Jun 26 2015
076bb46ee3a6	anciaux	the configurable version	Jun 26 2015
05de871c7f9c	anciaux	Merge branch 'master' of gitolite:akantu	Jun 26 2015
60f2614c0441	anciaux	append the version number to the manual	Jun 26 2015
a9c709129833	Lucas Frérot	cleanup in geometry + embedded and doc	Jun 26 2015
2f85cbcb8ea2	Clement Roux	double element (new and old) send in the add element event for IGFEM cut	Jun 25 2015
5d7764e9ea8e	Clement Roux	Split of the IGFEM mesh generation test and it CGAL part	Jun 25 2015
39bfed80494f	Marco Vocialta	Adding boolean internal fields in materials	Jun 25 2015
8f1f4619dd24	Marco Vocialta	Fixing the transition from fatigue to normal behavior of the cohesive fatigue…	Jun 25 2015
b3d9f917e5ca	anciaux	updating the submodules	Jun 25 2015
325def3caa91	LSMS Tester	compilation bug fix link to renaming of INSTANTIATE_MATERIAL	Jun 25 2015
361f481c1a19	LSMS Tester	compilation bug fix link to renaming of INSTANTIATE_MATERIAL	Jun 25 2015
66c35080d409	Lucas Frérot	removed mesh_geom_spherical_traits.hh	Jun 25 2015
8b39e5385f00	Lucas Frérot	Merge branch 'master' of lsmssrv1.epfl.ch:akantu-students	Jun 25 2015
6ca45a2ce049	Aurelia Cuba Ramos	bug fix to compile dumpers without IGFEM activated	Jun 25 2015
af9a8af28393	Lucas Frérot	Merge branch 'master' of lsmssrv1.epfl.ch:akantu-students	Jun 25 2015
4aebb1f416ea	Aurelia Cuba Ramos	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Jun 25 2015
d009ffea9928	Lucas Frérot	Merge branch 'master' of lsmssrv1.epfl.ch:akantu-students	Jun 25 2015
38458dbca6f5	Aurelia Cuba Ramos	Modifications in the dumper to allow dumping of IGFEM elements	Jun 25 2015
48eded395701	Marco Vocialta	Removing uninitialized values complains by valgrind for the test cohesive…	Jun 25 2015
6800d51a4955	Marco Vocialta	Adding a script to execute the cohesive extrinsic implicit test in order to…	Jun 25 2015
d24434f6acec	Marco Vocialta	Fixing the update of damage in the fatigue cohesive law	Jun 25 2015
fabbe12c52e7	Lucas Frérot	changed reinforcement dump condition on field name	Jun 25 2015
f4ef16942740	Marco Vocialta	Adding possibility of limiting the fatigue dissipation to the initial part of…	Jun 24 2015
c3c539faffaa	Marco Vocialta	Adding the possibility to insert cohesive elements when just one quad point is…	Jun 24 2015
7cf43887b4af	Marco Vocialta	Fix to allow Akantu use a version of Petsc compiled for C and bugfix on my last…	Jun 24 2015
808c659e96fe	Marco Vocialta	Fixing the are_float_equal function that now can correctly deal with little…	Jun 24 2015
3f9659a2deb4	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Jun 24 2015
494e7caf741a	Clement Roux	Update mesh_sphere_intersector way of testing if the node is new and use of…	Jun 24 2015
53f56370d6bb	richart	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Jun 24 2015
db5abba67136	richart	bug fix in cohesive element integrator gauss (Thank you for the beer Aurelia)	Jun 24 2015
cb7362c5f315	richart	bug fix in includes of externalproject	Jun 24 2015
950f09385a29	richart	Merge commit 'c4debfbfcfd6c5bd8b81b01ef0a976aa9f68bbfc'	Jun 24 2015
c4debfbfcfd6	richart	Squashed 'cmake/Modules/' changes from 711d603..efcb171	Jun 24 2015
f4da11ceb1db	richart	Modification comming from the remote repo + conflict corrections	Jun 24 2015
41cc062ba5e4	Clement Roux	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Jun 23 2015
4d2e1c88e268	richart	Merge commit 'db3deb7f08efc91fc945746c91a29970cb99cad2'	Jun 23 2015
db3deb7f08ef	richart	Squashed 'cmake/Modules/' changes from 4e98486..711d603	Jun 23 2015
8c1332783cb5	richart	submodule not uptodate	Jun 23 2015
b4ac98334d85	anciaux	setting public a solve method and adding an include to let it compile without…	Jun 23 2015
38b2ad231910	corrado	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Jun 23 2015
e24221d7a91b	corrado	bug fix in computeTangentTraction in material_cohesive_linear.cc	Jun 23 2015
952d48f6a374	Clement Roux	Mesh sphere intersection for igfem triangles	Jun 23 2015
53a970ecb411	Marco Vocialta	Moving the boolean contact_after_breaking from MaterialCohesiveLinearFatigue to…	Jun 22 2015
210028578cd7	Aurelia Cuba Ramos	remove include of igfem_element	Jun 19 2015
17c8d8918215	Aurelia Cuba Ramos	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Jun 19 2015
66d977849ef8	Aurelia Cuba Ramos	moving element info to element_class_info	Jun 19 2015
f178de7a051c	anciaux	Merge branch 'master' of gitolite:akantu	Jun 18 2015
b6326f44a44f	anciaux	adding the quadrature_point.hh file to the packages	Jun 18 2015
82705d8f23c3	Aurelia Cuba Ramos	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Jun 18 2015

Changes (137)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		cmake/AkantuTestAndExamples.cmake
M		cmake/Modules/CMakePackagesSystem.cmake
M		doc/manual/CMakeLists.txt
M		doc/manual/manual.tex
A		doc/manual/version-definition.tex.in
M	(sub)	extra_packages/extra-materials
M	(sub)	extra_packages/parallel-cohesive-element
P		packages/blackdynamite.cmake Copied from packages/petsc.cmake
M		packages/cgal.cmake
M		packages/core.cmake
M		packages/embedded.cmake
M		packages/iohelper.cmake
P		packages/petsc.cmake Copied to packages/blackdynamite.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
A		src/common/aka_element_classes_info.hh
A		src/common/aka_element_classes_info_inline_impl.cc
M		src/common/aka_error.hh
M		src/common/aka_math_tmpl.hh
M		src/common/aka_types.hh
M		src/fe_engine/element_class.hh
M		src/fe_engine/element_class_structural.hh
M		src/fe_engine/element_class_tmpl.hh
M		src/fe_engine/fe_engine.cc
M		src/fe_engine/fe_engine.hh
M		src/fe_engine/fe_engine_template.hh
M		src/fe_engine/fe_engine_template_tmpl.hh
M		src/fe_engine/integrator_gauss_inline_impl.cc
A		src/fe_engine/quadrature_point.hh
M		src/fe_engine/shape_lagrange.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
A		src/geometry/aabb_primitives/line_arc.hh
M		src/geometry/geom_helper_functions.hh
M		src/geometry/mesh_geom_common.hh
M		src/geometry/mesh_geom_factory_tmpl.hh
M		src/geometry/mesh_geom_intersector.hh
M		src/geometry/mesh_segment_intersector.hh
A		src/geometry/mesh_sphere_intersector.hh
A		src/geometry/mesh_sphere_intersector_tmpl.hh
M		src/geometry/tree_type_helper.hh
M		src/io/dumper/dumpable.cc
M		src/io/dumper/dumpable_iohelper.hh
M		src/io/dumper/dumper_generic_elemental_field.hh
M		src/io/dumper/dumper_iohelper.cc
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/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/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/solid_mechanics/embedded_interface_intersector.cc
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/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_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_inline_impl.cc
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/solid_mechanics_model.cc
M		src/model/solid_mechanics/solid_mechanics_model.hh
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_mass.cc
M		src/solver/petsc_matrix.cc
M		src/solver/petsc_wrapper.hh
M		src/solver/solver_mumps.cc
M		src/synchronizer/distributed_synchronizer.cc
M		test/test_fem/CMakeLists.txt
D		test/test_fem/test_igfem_integrate.cc
M		test/test_geometry/test_geometry_intersection.cc
M		test/test_geometry/test_geometry_intersection_triangle_3.cc
M		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic/test_cohesive_extrinsic_fatigue.cc
M		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_extrinsic_implicit/{K_matrix_verified → K_matrix_verified.dat}
V		test/test_model/test_solid_mechanics_model/test_cohesive/test_cohesive_extrinsic_implicit/{K_matrix_verified.dat ← K_matrix_verified}
M		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_cohesive/test_cohesive_extrinsic_implicit/test_assembling_K_cohe_elements.sh
M		test/test_model/test_solid_mechanics_model/test_embedded_interface/CMakeLists.txt
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/custom_non_local_test_material.cc
A		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/mesh_section_gap.geo
M		test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/test_material_damage_non_local.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

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

Description

Details

Event Timeline

Merged Changes

Changes (137)Show All Changes

Very Large Commit

rAKAf4b9a7d1e96d

cmake/AkantuTestAndExamples.cmake

cmake/Modules/CMakePackagesSystem.cmake

doc/manual/CMakeLists.txt

doc/manual/manual.tex

doc/manual/version-definition.tex.in

extra_packages/extra-materials

extra_packages/parallel-cohesive-element

packages/blackdynamite.cmake

packages/cgal.cmake

packages/core.cmake

packages/embedded.cmake

packages/iohelper.cmake

packages/petsc.cmake

packages/scotch.cmake

python/swig/aka_common.i

python/swig/mesh.i

src/common/aka_array.hh

src/common/aka_common.hh

src/common/aka_common_inline_impl.cc

src/common/aka_element_classes_info.hh

src/common/aka_element_classes_info_inline_impl.cc

src/common/aka_error.hh

src/common/aka_math_tmpl.hh

src/common/aka_types.hh

src/fe_engine/element_class.hh

src/fe_engine/element_class_structural.hh

src/fe_engine/element_class_tmpl.hh

src/fe_engine/fe_engine.cc

src/fe_engine/fe_engine.hh

src/fe_engine/fe_engine_template.hh

src/fe_engine/fe_engine_template_tmpl.hh

src/fe_engine/integrator_gauss_inline_impl.cc

src/fe_engine/quadrature_point.hh

src/fe_engine/shape_lagrange.hh

src/geometry/aabb_primitives/aabb_primitive.cc

src/geometry/aabb_primitives/aabb_primitive.hh

src/geometry/aabb_primitives/line_arc.hh

src/geometry/geom_helper_functions.hh

src/geometry/mesh_geom_common.hh

src/geometry/mesh_geom_factory_tmpl.hh

src/geometry/mesh_geom_intersector.hh

src/geometry/mesh_segment_intersector.hh

src/geometry/mesh_sphere_intersector.hh

src/geometry/mesh_sphere_intersector_tmpl.hh

src/geometry/tree_type_helper.hh

src/io/dumper/dumpable.cc

src/io/dumper/dumpable_iohelper.hh

src/io/dumper/dumper_generic_elemental_field.hh

src/io/dumper/dumper_iohelper.cc

src/io/mesh_io.cc

src/io/mesh_io.hh

src/io/mesh_io/mesh_io_diana.cc

src/io/mesh_io/mesh_io_diana.hh

src/io/mesh_io/mesh_io_msh.cc

src/io/mesh_io/mesh_io_msh.hh

src/mesh/element_type_map_tmpl.hh

src/mesh/group_manager.cc

src/mesh/group_manager.hh

src/mesh/mesh.cc

src/mesh/mesh_inline_impl.cc

src/mesh/node_group.cc

src/mesh/node_group.hh

src/model/heat_transfer/heat_transfer_model.cc

src/model/heat_transfer/heat_transfer_model.hh

src/model/heat_transfer/heat_transfer_model_inline_impl.cc

src/model/integration_scheme/generalized_trapezoidal.hh

src/model/integration_scheme/generalized_trapezoidal_inline_impl.cc

src/model/solid_mechanics/embedded_interface_intersector.cc

src/model/solid_mechanics/embedded_interface_model.cc

src/model/solid_mechanics/embedded_interface_model.hh

src/model/solid_mechanics/material.cc

src/model/solid_mechanics/material.hh

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

Changes (137)
Show All Changes