Diffusion akantu bacf19476747

Merge branch 'master' into features/contact
bacf19476747
Actions

Authored by richart on Jun 8 2021, 10:46.

Description

Merge branch 'master' into features/contact

Details

Committed

richart

Jun 8 2021, 11:08

Pushed

gitlab-richart

Jul 29 2021, 09:01

Parents

rAKA50e7a2ae0482: Merge branch 'features/phasefield' into 'master'
rAKA2c779c013a98: documentation in progress

Branches

Unknown

Tags

Unknown

Event Timeline

richart committed rAKAbacf19476747: Merge branch 'master' into features/contact (authored by richart).Jun 8 2021, 11:08

Merged Changes

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

Commit	Author	Details	Committed
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
38002f187447	richart	Merge branch 'features/doc_energies' into 'master'	Apr 29 2021
2baf1f94252e	pundir	cleaning tests for check warnings	Apr 28 2021
11b13960905f	pundir	fixed override functions	Apr 28 2021
4d220fb60710	frerot	[doc] added dissipated energy doc for relevant materials	Apr 23 2021
07a2fc700aa1	pundir	increased mesh size for phasefield example to finish as a test	Apr 7 2021
a4358f0535b7	pundir	removed the memory part from the phasefield model	Apr 2 2021
00d14211d024	pundir	Merge branch 'master' into features/phasefield	Apr 2 2021
34d21a7b59df	pundir	added eta parameter to avoid full degradation of elastic energy	Apr 2 2021
9d9fd80295fa	pundir	cleaning the code and adding descriptions to the classes	Apr 2 2021
10c849b800ee	frerot	[doc] added energy explaination for plastic materials	Mar 29 2021
a355669be2d4	frerot	[doc] added documentation on getEnergy	Mar 29 2021
006b83c5ba82	pundir	Bug Fixed : ill-Conditioning of stiffness matrix corrected	Mar 3 2021
72e9f8e86988	pundir	updated the phasefield example	Mar 2 2021
0ce59b2e3799	tomohitpundir	Update .gitlab-ci.yml	Mar 2 2021
b9a976030a42	pundir	ci file updated to build PhaseField model	Mar 2 2021
212fe077251d	pundir	added python interface for defining new user-defined solvers	Mar 2 2021
6fdd25ed8c5e	pundir	Bug Fixed : added definition of computeNtbN function for structural class	Mar 2 2021
5842df242385	pundir	functionality to defined solver type for solid model during coupling	Mar 1 2021
4b3aa36f3132	pundir	test for phasefield using solid mechanics in explicit scheme	Feb 28 2021
6c7aa362ca34	pundir	python interface for phasefield coupler added	Feb 28 2021
285963f471a9	pundir	Bug Fixed : internalforces should be zeored and not cleared	Feb 28 2021
7aa518d0af84	pundir	update material phasefield override functions	Feb 26 2021
6300a0929ab8	pundir	aka_array_tmpl conflict resolved	Feb 26 2021
6eb538ea0e7b	pundir	Bug Fixed : communicator for serial run	Feb 26 2021
ff5e68dcafd8	pundir	Merge remote-tracking branch 'upstream/master' into features/phasefield	Feb 26 2021
22d5e285e92d	pundir	python module for phasefield added	Feb 26 2021
857e91531d8e	pundir	Bug Fixed : multiple material reading	Feb 26 2021
3fb5d4d98714	pundir	test for multi material added	Feb 26 2021
cdfa4a235616	pundir	new tests for phasefield added	Feb 24 2021
fbdb0f3b5737	pundir	multi-material functionality for phasefield added	Feb 24 2021
ebae9abcee87	pundir	Conflict with master resolved	Jun 19 2020
c25cca753279	pundir	test for phasefield selector added	Jun 19 2020
6942cd6ca300	pundir	change in solid mechanics model file do not know	Jun 19 2020
8070a024e3e5	pundir	phasefield selector compiles	Jun 19 2020
c569c48c9bae	pundir	changes to internal field to accept any Material like class	May 29 2020
db48e749ac96	pundir	added synchronization tags for better parallelization	Feb 22 2020

Changes (91)

		Path
A		.gitattributes
M		.gitlab-ci.yml
M		cmake/akantu_environement.sh.in
M		doc/dev-doc/index.rst
M		doc/dev-doc/manual/appendix/material-parameters.rst
A		doc/dev-doc/manual/figures/phasefield-dynamic.png
A		doc/dev-doc/manual/phasefieldmodel.rst
M		doc/dev-doc/manual/solidmechanicsmodel.rst
M		doc/dev-doc/reference.rst
M		examples/CMakeLists.txt
A	(dir)	examples/phase_field/
P		examples/phase_field/CMakeLists.txt Copied from packages/model_couplers.cmake
A		examples/phase_field/material_notch.dat
A		examples/phase_field/phase_field_notch.cc
A		examples/phase_field/square_notch.geo
A	(dir)	examples/python/phase-field/
A		examples/python/phase-field/phasefield-dynamic.py
A		examples/python/phase-field/phasefield-static.py
M		packages/contact_mechanics.cmake
P		packages/model_couplers.cmake Copied to multiple locations: examples/phase_field/CMakeLists.txt packages/phase_field.cmake
P		packages/phase_field.cmake Copied from packages/model_couplers.cmake
M		packages/solid_mechanics.cmake
M		python/CMakeLists.txt
M		python/akantu/__init__.py
A		python/akantu/_version.py
M		python/py_aka_common.cc
M		python/py_akantu.cc
M		python/py_model.cc
M		python/py_model_couplers.cc
M		python/py_parser.cc
A		python/py_phase_field_model.cc
A		python/py_phase_field_model.hh
D		python/setup.py.in
M		src/common/aka_array_tmpl.hh
M		src/common/aka_common.hh
M		src/common/aka_config.hh.in
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/shape_cohesive.hh
M		src/fe_engine/shape_lagrange.hh
M		src/fe_engine/shape_lagrange_inline_impl.hh
M		src/fe_engine/shape_structural.hh
M		src/io/parser/parser.hh
M		src/model/common/integration_scheme/integration_scheme.cc
P		src/model/common/integration_scheme/integration_scheme.hh Copied to src/model/solid_mechanics/materials/material_damage/material_phasefield.hh
M		src/model/common/model_solver.hh
M		src/model/model.hh
M		src/model/model_couplers/cohesive_contact_solvercallback.cc
A		src/model/model_couplers/coupler_solid_phasefield.cc
A		src/model/model_couplers/coupler_solid_phasefield.hh
M		src/model/model_options.hh
A	(dir)	src/model/phase_field/
A		src/model/phase_field/phase_field_model.cc
A		src/model/phase_field/phase_field_model.hh
A		src/model/phase_field/phase_field_model_inline_impl.cc
A		src/model/phase_field/phasefield.cc
A		src/model/phase_field/phasefield.hh
A		src/model/phase_field/phasefield_inline_impl.cc
A		src/model/phase_field/phasefield_selector.hh
A		src/model/phase_field/phasefield_selector_tmpl.hh
A	(dir)	src/model/phase_field/phasefields/
A		src/model/phase_field/phasefields/phasefield_exponential.cc
A		src/model/phase_field/phasefields/phasefield_exponential.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_core_includes.hh
M		src/model/solid_mechanics/materials/material_damage/material_damage_tmpl.hh
A		src/model/solid_mechanics/materials/material_damage/material_phasefield.cc
P		src/model/solid_mechanics/materials/material_damage/material_phasefield.hh Copied from src/model/common/integration_scheme/integration_scheme.hh
A		src/model/solid_mechanics/materials/material_damage/material_phasefield_inline_impl.cc
M		src/model/solid_mechanics/materials/material_plastic/material_plastic.hh
M		src/model/solid_mechanics/solid_mechanics_model.cc
M		src/model/solid_mechanics/solid_mechanics_model.hh
M		src/synchronizer/communicator_inline_impl.hh
P		test/test_model/CMakeLists.txt Copied to test/test_model/test_phase_field_model/CMakeLists.txt
A	(dir)	test/test_model/test_phase_field_model/
P		test/test_model/test_phase_field_model/CMakeLists.txt Copied from test/test_model/CMakeLists.txt
A		test/test_model/test_phase_field_model/material_coupling.dat
A		test/test_model/test_phase_field_model/material_multiple.dat
A		test/test_model/test_phase_field_model/phasefield_selector.dat
A		test/test_model/test_phase_field_model/phasefield_selector.msh
A		test/test_model/test_phase_field_model/test_multi_material.cc
A		test/test_model/test_phase_field_model/test_one_element.geo
A		test/test_model/test_phase_field_model/test_one_element.msh
A		test/test_model/test_phase_field_model/test_phase_solid_coupling.cc
A		test/test_model/test_phase_field_model/test_phase_solid_explicit.cc
A		test/test_model/test_phase_field_model/test_phasefield_selector.cc
A		test/test_model/test_phase_field_model/test_two_element.geo
A		test/test_model/test_phase_field_model/test_two_element.msh
M		test/test_python_interface/CMakeLists.txt