solved conflicts
5df917a8797e
Actions

Authored by saduruss on Feb 8 2023, 17:07.

Description

solved conflicts

Committed

saduruss

Feb 8 2023, 17:07

Pushed

gitlab-richart

Feb 8 2023, 17:07

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
feb1692ed4c6	anciaux	Merge branch 'bugfixes/46-bug-in-strain-energy-split-and-missing-constraint-in…	Feb 7 2023
894f3fa58ea4	saduruss	add prints to phasefield tests	Feb 6 2023
cc0b8dcbb6d0	richart/saduruss	removed commented code	Feb 6 2023
518da98ed1c3	saduruss	Merge branch 'master' into bugfixes/46-bug-in-strain-energy-split-and-missing…	Feb 6 2023
4d3a517e245d	saduruss	clean and fix in phase field material	Feb 3 2023
608f43139c13	richart	Make the previous commit compile	Jan 24 2023
8209bc49e9a3	saduruss	[skip ci] Random G_c for phasefield	Jan 24 2023
19ccc799ad6e	richart	Made RandomInternalField generic to be usable by other models	Jan 24 2023
496e0760fd9b	saduruss	test for anisothropic phase field formulation	Jan 12 2023
6ac75f2cd518	saduruss	addition of constraint on damage in compression	Dec 14 2022
b6209f9545f9	saduruss	correction in strain energy split for phasefield	Dec 6 2022

				Path
	M			examples/python/phase-field/material_static.dat
	M			examples/python/phase-field/phasefield-static.py
	M			packages/phase_field.cmake
	M			packages/solid_mechanics.cmake
	M			src/model/phase_field/phasefield.cc
	M			src/model/phase_field/phasefield.hh
	M			src/model/phase_field/phasefield_inline_impl.hh
	M			src/model/phase_field/phasefields/phasefield_exponential.cc
	M			src/model/phase_field/phasefields/phasefield_exponential.hh
	A			src/model/phase_field/phasefields/phasefield_exponential_inline_impl.hh
	M			src/model/solid_mechanics/materials/internal_field.hh
	M			src/model/solid_mechanics/materials/material_damage/material_phasefield.cc
	M			src/model/solid_mechanics/materials/material_damage/material_phasefield.hh
	V			src/model/solid_mechanics/materials/material_damage/{material_phasefield_inline_impl.cc → material_phasefield_inline_impl.hh}
	V			src/model/solid_mechanics/materials/material_damage/{material_phasefield_inline_impl.hh ← material_phasefield_inline_impl.cc}
	M			src/model/solid_mechanics/materials/random_internal_field.hh
	M			src/model/solid_mechanics/materials/random_internal_field_tmpl.hh
	M			test/test_model/test_phase_field_model/CMakeLists.txt
	P			test/test_model/test_phase_field_model/test_phase_field_anisotropic.cc Copied from test/test_model/test_phase_field_model/test_phase_solid_explicit.cc
	M			test/test_model/test_phase_field_model/test_phase_solid_coupling.cc
	P			test/test_model/test_phase_field_model/test_phase_solid_explicit.cc Copied to test/test_model/test_phase_field_model/test_phase_field_anisotropic.cc