Diffusion akantu 3ba310f2399e

Merge branch 'features/contact' into 'master'
3ba310f2399e
Actions

Authored by anciaux on Jul 29 2021, 09:01.

Description

Merge branch 'features/contact' into 'master'

contact-resolution

Closes #1, #5, and #6

See merge request akantu/akantu!9

Details

Committed

anciaux

Jul 29 2021, 09:01

Pushed

gitlab-richart

Jul 29 2021, 09:01

Parents

rAKA93cfdbc5065a: Merge branch 'features/contact' of gitlab.com:akantu/akantu into…
rAKAf203057a27a5: Merge branch 'bugfixes/16-examples-structrual_mechanics…

Branches

Unknown

Tags

Unknown

Event Timeline

anciaux committed rAKA3ba310f2399e: Merge branch 'features/contact' into 'master' (authored by anciaux).Jul 29 2021, 09:01

Merged Changes

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

Commit	Author	Details	Committed
93cfdbc5065a	richart	Merge branch 'features/contact' of gitlab.com:akantu/akantu into…	Jul 28 2021
67d8f5cfd95f	richart	Code quality corrections	Jul 28 2021
eb9967b52897	anciaux/richart	Apply 3 suggestion(s) to 1 file(s)	Jul 28 2021
054f2d50c5e7	anciaux/richart	Apply 1 suggestion(s) to 1 file(s)	Jul 28 2021
721e10971f05	richart	Adding exception when not converged	Jul 28 2021
c8d9385f5ff2	richart	Correction based on @ganciaux review	Jul 28 2021
8df6b0ee7569	richart	Merge branch 'master' into features/contact	Jul 28 2021
e895177e362a	richart	Warp too long equations	Jul 26 2021
703e28f5b4ab	richart	pinning the versions	Jul 22 2021
19864460b300	richart	Correcting macros	Jul 22 2021
f2a330c6ea76	richart	Left over from a merge	Jul 20 2021
251af691556a	richart	Merge branch 'master' into features/contact	Jul 20 2021
18da45a064ab	richart	Renamed mesh	Jun 28 2021
7d0cc3b36cbd	richart	Bug fix following factorization	Jun 26 2021
7841f146511f	richart	Bug fix refixed	Jun 25 2021
88e4bdd1fc1d	richart	Missing symbols with clang	Jun 25 2021
40104a165ba1	richart	Corrected clang compilation error and linted some part of the contact code	Jun 24 2021
2985136e8a09	richart	Correction based on remarks on MR !9	Jun 24 2021
13da75edd185	richart	Bug fix from the previous refactoring	Jun 24 2021
80a7ec7d8c7d	richart	Merge branch 'master' into features/contact	Jun 24 2021
e1422234d910	richart	Merge branch 'features/contact' of gitlab.com:akantu/akantu into…	Jun 23 2021
b75e7eac6591	richart	refactoring the code of the coupler solid contact	Jun 23 2021
e6faf34e0cc7	richart	Bug fix in the dumper for enums	Jun 23 2021
2dd62fc28d21	Mohit Pundir	Added missing documentation on contact couplers	Jun 23 2021
0ac630be3038	richart	Trying to correct mesh for ubuntu	Jun 20 2021
f03394d43907	Mohit Pundir	added example for cohesive contact	Jun 19 2021
d4516410c368	Mohit Pundir	changes the dof manage for coupler solid cohesive contact	Jun 19 2021
9c13feedb970	richart	Casting enums in UInt in dumpers	Jun 10 2021
157e744011a6	richart	Compilation fixes following application of suggestions	Jun 9 2021
b963975cba79	richart/tomohitpundir	Apply 34 suggestion(s) to 15 file(s)	Jun 8 2021
2993840f29d3	richart	Some more weird quotes	Jun 8 2021
e5dda3c4b199	richart	Problem with tests on ubuntu	Jun 8 2021
bacf19476747	richart	Merge branch 'master' into features/contact	Jun 8 2021
2c779c013a98	pundir	documentation in progress	Jun 6 2021
bbc8e20a800b	pundir	working on documentation/ half-done	Jun 6 2021
205db61909bc	pundir	tests/examples and python modules for contact code added	Jun 6 2021
50e7a2ae0482	richart	Merge branch 'features/phasefield' into 'master'	May 19 2021
45efedd36c79	richart	Merge branch 'master' into features/phasefield	May 14 2021
2d34133da988	richart	Correcting documentation	May 14 2021
f7b833e37c2f	richart	removing dead cmake code	May 14 2021
a52b94276329	richart	Linting the code and applying clang-tidy corrections	May 14 2021
cc28db023977	richart	Removing useless parameter that comes from a copy/paste...	May 14 2021
7b8c44876f35	richart	Reordering methods	May 14 2021
10fb35bffbe5	richart	Correcting compilation errors on newer version of pybind11	May 14 2021
80c68abed965	pundir	Documentation for phasefield added changes in index	May 9 2021
67fb33dfc0c9	pundir	Documentation for phasefield added	May 9 2021
b593cbec19dd	richart	Merge branch 'features/versioneer' into 'master'	May 7 2021
24b456355d09	richart	Modified the import of py11_akantu	May 7 2021
160af748d326	richart	Relocated py11_akantu module as a submodule of akantu	May 7 2021
cd115a96a37c	richart	adding versioneer to generate a version number in the python interface	May 7 2021

Changes (219)

		Path
M		.gitignore
M		.gitlab-ci.yml
M		doc/dev-doc/akantu.dox.j2
M		doc/dev-doc/conf.py
M		doc/dev-doc/index.rst
M		doc/dev-doc/manual/constitutive-laws.rst
A		doc/dev-doc/manual/contactmechanicsmodel.rst
A		doc/dev-doc/manual/figures/contact_mechanics_schematic.png
A		doc/dev-doc/manual/figures/contact_mechanics_schematic.svg
M		doc/dev-doc/manual/phasefieldmodel.rst
A		doc/manual/manual-contactmechanicsmodel.tex
M		examples/CMakeLists.txt
A	(dir)	examples/contact_mechanics/
P		examples/contact_mechanics/CMakeLists.txt Copied from packages/model_couplers.cmake
A		examples/contact_mechanics/cohesive-contact.geo
A		examples/contact_mechanics/cohesive_contact_explicit_dynamic.cc
A		examples/contact_mechanics/contact_explicit_dynamic.cc
A		examples/contact_mechanics/contact_explicit_static.cc
A		examples/contact_mechanics/hertz.geo
A		examples/contact_mechanics/material-cohesive.dat
A		examples/contact_mechanics/material.dat
M		examples/python/CMakeLists.txt
A	(dir)	examples/python/contact-mechanics/
A		examples/python/contact-mechanics/CMakeLists.txt
A		examples/python/contact-mechanics/compression.py
A		examples/python/contact-mechanics/detection-explicit.py
A	(dir)	examples/python/contact-mechanics/materials/
A		examples/python/contact-mechanics/materials/compression.dat
A		examples/python/contact-mechanics/materials/detection-explicit.dat
A	(dir)	examples/python/contact-mechanics/mesh/
A		examples/python/contact-mechanics/mesh/compression.geo
A		examples/python/contact-mechanics/mesh/detection-explicit.msh
A		packages/contact_mechanics.cmake
M		packages/core.cmake
M		packages/damage_non_local.cmake
P		packages/model_couplers.cmake Copied to examples/contact_mechanics/CMakeLists.txt
M		packages/phase_field.cmake
M		packages/solid_mechanics.cmake
M		python/CMakeLists.txt
M		python/py_aka_common.cc
M		python/py_akantu.cc
A		python/py_contact_mechanics_model.cc
A		python/py_contact_mechanics_model.hh
M		python/py_fe_engine.cc
M		python/py_material.cc
M		python/py_material.hh
M		python/py_mesh.cc
M		python/py_model.cc
A		python/py_model_couplers.cc
A		python/py_model_couplers.hh
M		python/py_solid_mechanics_model.cc
M		src/common/aka_array.hh
P		src/common/aka_array_filter.hh Copied from src/mesh/element_type_map_filter.hh
M		src/common/aka_bbox.hh
M		src/common/aka_common.hh
M		src/common/aka_config.hh.in
M		src/common/aka_factory.hh
M		src/common/aka_grid_dynamic.hh
M		src/common/aka_math.hh
M		src/common/aka_math_tmpl.hh
M		src/fe_engine/element_class.hh
A		src/fe_engine/element_class_helper.hh
M		src/fe_engine/element_class_tmpl.hh
M		src/fe_engine/element_classes/element_class_quadrangle_4_inline_impl.hh
M		src/fe_engine/element_classes/element_class_segment_2_inline_impl.hh
M		src/fe_engine/element_classes/element_class_triangle_3_inline_impl.hh
M		src/fe_engine/element_classes/element_class_triangle_6_inline_impl.hh
M		src/fe_engine/fe_engine_inline_impl.hh
M		src/fe_engine/integrator_gauss_inline_impl.hh
M		src/io/dumper/dumper_compute.hh
M		src/io/dumper/dumper_elemental_field.hh
M		src/io/dumper/dumper_generic_elemental_field.hh
M		src/io/dumper/dumper_homogenizing_field.hh
M		src/io/dumper/dumper_internal_material_field.hh
M		src/io/dumper/dumper_material_padders.hh
M		src/io/dumper/dumper_nodal_field.hh
M		src/io/dumper/dumper_text.cc
P		src/io/dumper/dumper_text.hh Copied to src/model/contact_mechanics/contact_element.hh
M		src/io/dumper/dumper_type_traits.hh
M		src/io/parser/parser.hh
M		src/mesh/element_type_map.hh
P		src/mesh/element_type_map_filter.hh Copied to src/common/aka_array_filter.hh
M		src/mesh/group_manager_inline_impl.hh
M		src/mesh/mesh.cc
M		src/mesh/mesh.hh
M		src/mesh/mesh_inline_impl.hh
M		src/mesh_utils/cohesive_element_inserter_helper.cc
M		src/model/common/boundary_condition/boundary_condition.hh
M		src/model/common/boundary_condition/boundary_condition_functor_inline_impl.hh
M		src/model/common/boundary_condition/boundary_condition_tmpl.hh
M		src/model/common/dof_manager/dof_manager_default.cc
M		src/model/common/integration_scheme/newmark-beta.hh
M		src/model/common/integration_scheme/pseudo_time.cc
M		src/model/common/model_solver.cc
M		src/model/common/model_solver.hh
M		src/model/common/non_linear_solver/non_linear_solver_newton_raphson.cc
M		src/model/common/time_step_solvers/time_step_solver.cc
M		src/model/common/time_step_solvers/time_step_solver.hh
M		src/model/common/time_step_solvers/time_step_solver_default.cc
M		src/model/common/time_step_solvers/time_step_solver_default.hh
A	(dir)	src/model/contact_mechanics/
A		src/model/contact_mechanics/contact_detector.cc
A		src/model/contact_mechanics/contact_detector.hh
A		src/model/contact_mechanics/contact_detector_inline_impl.cc
P		src/model/contact_mechanics/contact_element.hh Copied from src/io/dumper/dumper_text.hh
A		src/model/contact_mechanics/contact_mechanics_model.cc
A		src/model/contact_mechanics/contact_mechanics_model.hh
A		src/model/contact_mechanics/geometry_utils.cc
A		src/model/contact_mechanics/geometry_utils.hh
A		src/model/contact_mechanics/geometry_utils_inline_impl.cc
A		src/model/contact_mechanics/resolution.cc
A		src/model/contact_mechanics/resolution.hh
A		src/model/contact_mechanics/resolution_utils.cc
A		src/model/contact_mechanics/resolution_utils.hh
A	(dir)	src/model/contact_mechanics/resolutions/
A		src/model/contact_mechanics/resolutions/resolution_penalty.cc
A		src/model/contact_mechanics/resolutions/resolution_penalty.hh
A		src/model/contact_mechanics/resolutions/resolution_penalty_quadratic.cc
A		src/model/contact_mechanics/resolutions/resolution_penalty_quadratic.hh
A		src/model/contact_mechanics/surface_selector.cc
A		src/model/contact_mechanics/surface_selector.hh
M		src/model/heat_transfer/heat_transfer_model.cc
M		src/model/heat_transfer/heat_transfer_model.hh
M		src/model/model.cc
M		src/model/model.hh
A		src/model/model_couplers/cohesive_contact_solvercallback.cc
A		src/model/model_couplers/cohesive_contact_solvercallback.hh
A		src/model/model_couplers/coupler_solid_cohesive_contact.cc
P		src/model/model_couplers/coupler_solid_cohesive_contact.hh Copied from src/model/solid_mechanics/materials/material_non_local_includes.hh
A		src/model/model_couplers/coupler_solid_contact.cc
P		src/model/model_couplers/coupler_solid_contact.hh Copied from src/model/model_couplers/coupler_solid_phasefield.hh
A		src/model/model_couplers/coupler_solid_contact_tmpl.hh
P		src/model/model_couplers/coupler_solid_phasefield.hh Copied to src/model/model_couplers/coupler_solid_contact.hh
M		src/model/model_inline_impl.hh
M		src/model/model_options.hh
M		src/model/phase_field/phase_field_model.cc
M		src/model/phase_field/phase_field_model.hh
M		src/model/phase_field/phasefield.hh
M		src/model/phase_field/phasefields/phasefield_exponential.cc
M		src/model/phase_field/phasefields/phasefield_exponential.hh
M		src/model/solid_mechanics/material.cc
M		src/model/solid_mechanics/material_inline_impl.hh
M		src/model/solid_mechanics/materials/material_core_includes.hh
M		src/model/solid_mechanics/materials/material_damage/material_damage.hh
A		src/model/solid_mechanics/materials/material_damage/material_von_mises_mazars.cc
A		src/model/solid_mechanics/materials/material_damage/material_von_mises_mazars.hh
A		src/model/solid_mechanics/materials/material_damage/material_von_mises_mazars_inline_impl.hh
A		src/model/solid_mechanics/materials/material_damage/material_von_mises_mazars_non_local.cc
A		src/model/solid_mechanics/materials/material_damage/material_von_mises_mazars_non_local.hh
M		src/model/solid_mechanics/materials/material_elastic_linear_anisotropic.hh
P		src/model/solid_mechanics/materials/material_non_local_includes.hh Copied to multiple locations: src/model/model_couplers/coupler_solid_cohesive_contact.hh test/test_model/test_contact_mechanics_model/test_detector/test_detection.cc test/test_model/test_contact_mechanics_model/test_resolution/test_explicit_resolution.cc test/test_model/test_contact_mechanics_model/test_selector/test_selection.cc
A		src/model/solid_mechanics/materials/material_plastic/material_drucker_prager.cc
A		src/model/solid_mechanics/materials/material_plastic/material_drucker_prager.hh
A		src/model/solid_mechanics/materials/material_plastic/material_drucker_prager_inline_impl.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/materials/constitutive_laws/material_cohesive_linear.hh
M		src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_friction.cc
M		src/model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive.cc
M		src/model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive.hh
M		src/model/solid_mechanics/solid_mechanics_model_inline_impl.hh
M		src/model/solid_mechanics/solid_mechanics_model_io.cc
M		src/model/structural_mechanics/structural_mechanics_model.hh
M		src/solver/sparse_matrix.hh
M		src/solver/sparse_matrix_aij.hh
M		src/solver/sparse_matrix_aij_inline_impl.hh
M		src/synchronizer/grid_synchronizer.cc
M		test/ci/manylinux/Dockerfile
P		test/test_model/CMakeLists.txt Copied to multiple locations: test/test_model/test_contact_mechanics_model/CMakeLists.txt test/test_model/test_contact_mechanics_model/test_coupler/CMakeLists.txt test/test_model/test_contact_mechanics_model/test_resolution/CMakeLists.txt test/test_model/test_contact_mechanics_model/test_selector/CMakeLists.txt
M		test/test_model/test_common/test_model_solver/test_model_solver_my_model.hh
A	(dir)	test/test_model/test_contact_mechanics_model/
P		test/test_model/test_contact_mechanics_model/CMakeLists.txt Copied from test/test_model/CMakeLists.txt
A		test/test_model/test_contact_mechanics_model/flat_on_flat.geo
A		test/test_model/test_contact_mechanics_model/material-friction.dat
A		test/test_model/test_contact_mechanics_model/material.dat
A		test/test_model/test_contact_mechanics_model/sliding-block-2D.geo
A	(dir)	test/test_model/test_contact_mechanics_model/test_coupler/
P		test/test_model/test_contact_mechanics_model/test_coupler/CMakeLists.txt Copied from test/test_model/CMakeLists.txt
A		test/test_model/test_contact_mechanics_model/test_coupler/coupling.geo
A		test/test_model/test_contact_mechanics_model/test_coupler/flat_on_flat.geo
A		test/test_model/test_contact_mechanics_model/test_coupler/material.dat
A		test/test_model/test_contact_mechanics_model/test_coupler/material_stiffness.dat
A		test/test_model/test_contact_mechanics_model/test_coupler/test_contact_coupling.cc
A		test/test_model/test_contact_mechanics_model/test_coupler/test_coupled_stiffness.cc
A	(dir)	test/test_model/test_contact_mechanics_model/test_detector/
A		test/test_model/test_contact_mechanics_model/test_detector/CMakeLists.txt
A	(dir)	test/test_model/test_contact_mechanics_model/test_detector/data/
A		test/test_model/test_contact_mechanics_model/test_detector/data/cohesive_1D.geo
A		test/test_model/test_contact_mechanics_model/test_detector/data/cohesive_strait_2D.geo
A		test/test_model/test_contact_mechanics_model/test_detector/data/cohesive_strait_2D.msh
A		test/test_model/test_contact_mechanics_model/test_detector/data/cohesive_strait_2D_mixte.geo
A		test/test_model/test_contact_mechanics_model/test_detector/data/cohesive_strait_2D_structured.geo
A		test/test_model/test_contact_mechanics_model/test_detector/data/cohesive_strait_3D.geo
A		test/test_model/test_contact_mechanics_model/test_detector/data/cohesive_strait_3D_structured.geo
A		test/test_model/test_contact_mechanics_model/test_detector/data/test.msh
A		test/test_model/test_contact_mechanics_model/test_detector/node.geo
A		test/test_model/test_contact_mechanics_model/test_detector/options.dat
P		test/test_model/test_contact_mechanics_model/test_detector/test_detection.cc Copied from src/model/solid_mechanics/materials/material_non_local_includes.hh
A		test/test_model/test_contact_mechanics_model/test_detector/test_detection_fixture.hh
A		test/test_model/test_contact_mechanics_model/test_explicit_dynamic.cc
A		test/test_model/test_contact_mechanics_model/test_explicit_friction.cc
A	(dir)	test/test_model/test_contact_mechanics_model/test_resolution/
P		test/test_model/test_contact_mechanics_model/test_resolution/CMakeLists.txt Copied from test/test_model/CMakeLists.txt
A		test/test_model/test_contact_mechanics_model/test_resolution/explicit_2d.geo
A		test/test_model/test_contact_mechanics_model/test_resolution/options.dat
P		test/test_model/test_contact_mechanics_model/test_resolution/test_explicit_resolution.cc Copied from src/model/solid_mechanics/materials/material_non_local_includes.hh
A		test/test_model/test_contact_mechanics_model/test_resolution/test_resolution.cc
A	(dir)	test/test_model/test_contact_mechanics_model/test_selector/
P		test/test_model/test_contact_mechanics_model/test_selector/CMakeLists.txt Copied from test/test_model/CMakeLists.txt
A	(dir)	test/test_model/test_contact_mechanics_model/test_selector/data/
A		test/test_model/test_contact_mechanics_model/test_selector/data/selection_1D.geo
A		test/test_model/test_contact_mechanics_model/test_selector/data/selection_2D.geo
A		test/test_model/test_contact_mechanics_model/test_selector/data/selection_3D.geo
A		test/test_model/test_contact_mechanics_model/test_selector/material.dat
P		test/test_model/test_contact_mechanics_model/test_selector/test_selection.cc Copied from src/model/solid_mechanics/materials/material_non_local_includes.hh
A		test/test_model/test_contact_mechanics_model/test_selector/test_selection_fixture.hh
M		test/test_model/test_phase_field_model/test_phase_solid_explicit.cc
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_solid_mechanics_model_reassign_material.cc