Diffusion akantu 4f6689b4a112

Merge branch 'master' into features/contact
4f6689b4a112
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

Jun 8 2021, 13:14

Parents

rAKA8598265e6520: documentation in progress
rAKA63db325b3a31: Merge branch 'features/phasefield' into 'master'

Branches

Unknown

Tags

Unknown

Event Timeline

richart committed rAKA4f6689b4a112: 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
63db325b3a31	richart	Merge branch 'features/phasefield' into 'master'	May 19 2021
48566fff3ed0	richart	Merge branch 'master' into features/phasefield	May 14 2021
fdaa2dacbd0c	richart	Correcting documentation	May 14 2021
da8a139c0051	richart	removing dead cmake code	May 14 2021
583b06990849	richart	Linting the code and applying clang-tidy corrections	May 14 2021
ed63cd404c2f	richart	Removing useless parameter that comes from a copy/paste...	May 14 2021
a1f8c50c9afc	richart	Reordering methods	May 14 2021
5c0a955c98b9	richart	Correcting compilation errors on newer version of pybind11	May 14 2021
0f2be8165fcb	pundir	Documentation for phasefield added changes in index	May 9 2021
1a3b184cdd43	pundir	Documentation for phasefield added	May 9 2021
6c828a4ab000	richart	Merge branch 'features/versioneer' into 'master'	May 7 2021
f66bea2afab4	richart	Modified the import of py11_akantu	May 7 2021
2214b92238c9	richart	Relocated py11_akantu module as a submodule of akantu	May 7 2021
ccc0cad429ca	richart	adding versioneer to generate a version number in the python interface	May 7 2021
ca7a0f4b9298	richart	Merge branch 'features/doc_energies' into 'master'	Apr 29 2021
b6cbe61d90b8	pundir	cleaning tests for check warnings	Apr 28 2021
a3a0c621fd12	pundir	fixed override functions	Apr 28 2021
3c109d4497eb	frerot	[doc] added dissipated energy doc for relevant materials	Apr 23 2021
4e7cea78bab9	pundir	increased mesh size for phasefield example to finish as a test	Apr 7 2021
2f318e8d0e9b	pundir	removed the memory part from the phasefield model	Apr 2 2021
5acfa6ca970d	pundir	Merge branch 'master' into features/phasefield	Apr 2 2021
be0ea515f119	pundir	added eta parameter to avoid full degradation of elastic energy	Apr 2 2021
1ce2f1aeb5ef	pundir	cleaning the code and adding descriptions to the classes	Apr 2 2021
5dbea3e35321	frerot	[doc] added energy explaination for plastic materials	Mar 29 2021
e0ac8fcc77c8	frerot	[doc] added documentation on getEnergy	Mar 29 2021
47d819040865	pundir	Bug Fixed : ill-Conditioning of stiffness matrix corrected	Mar 3 2021
9ec48893da13	pundir	updated the phasefield example	Mar 2 2021
20ca5b1c61d1	tomohitpundir	Update .gitlab-ci.yml	Mar 2 2021
b9142d479371	pundir	ci file updated to build PhaseField model	Mar 2 2021
e64b992bfcc9	pundir	added python interface for defining new user-defined solvers	Mar 2 2021
c41f89ae02c7	pundir	Bug Fixed : added definition of computeNtbN function for structural class	Mar 2 2021
368683505b73	pundir	functionality to defined solver type for solid model during coupling	Mar 1 2021
a904260e1701	pundir	test for phasefield using solid mechanics in explicit scheme	Feb 28 2021
fa42b762652f	pundir	python interface for phasefield coupler added	Feb 28 2021
ac4ae375df6f	pundir	Bug Fixed : internalforces should be zeored and not cleared	Feb 28 2021
2aeda38c1040	pundir	update material phasefield override functions	Feb 26 2021
cbf9ead90501	pundir	aka_array_tmpl conflict resolved	Feb 26 2021
3df6e5b4d787	pundir	Bug Fixed : communicator for serial run	Feb 26 2021
a4e2455c217e	pundir	Merge remote-tracking branch 'upstream/master' into features/phasefield	Feb 26 2021
e53c696aaab0	pundir	python module for phasefield added	Feb 26 2021
9f6ee871c834	pundir	Bug Fixed : multiple material reading	Feb 26 2021
c46a2a570d25	pundir	test for multi material added	Feb 26 2021
0ec1e1d94896	pundir	new tests for phasefield added	Feb 24 2021
f7d1596ca451	pundir	multi-material functionality for phasefield added	Feb 24 2021
c921ebe198ff	pundir	Conflict with master resolved	Jun 19 2020
65817b11dbaa	pundir	test for phasefield selector added	Jun 19 2020
905ad172e612	pundir	change in solid mechanics model file do not know	Jun 19 2020
cddbbc55582d	pundir	phasefield selector compiles	Jun 19 2020
c07cbcedad5b	pundir	changes to internal field to accept any Material like class	May 29 2020
9a71011e80b4	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