akantu into…
bd1fd42431bd
Actions

Authored by pundir on Dec 11 2020, 13:17.

Description

Merge branch 'features/contact' of gitlab.com:akantu/akantu into features/contact

Committed

pundir

Dec 11 2020, 13:17

Pushed

gitlab-richart

Jan 18 2021, 21:10

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	5f5bcf63b549			richart	Correcting compilation errors due to merge	Dec 11 2020

				Path
	M			.gitlab-ci.yml
	M			packages/contact_mechanics.cmake
	M			packages/damage_non_local.cmake
	M			packages/model_couplers.cmake
	M			src/common/aka_grid_dynamic.hh
	M			src/common/aka_math_tmpl.hh
	M			src/mesh/mesh_inline_impl.hh
	M			src/mesh_utils/cohesive_element_inserter_helper.cc
	M			src/mesh_utils/mesh_utils.cc
	M			src/model/common/non_linear_solver/non_linear_solver_newton_raphson.cc
	M			src/model/contact_mechanics/geometry_utils.cc
	M			src/model/contact_mechanics/resolution_utils.cc
	M			src/model/contact_mechanics/resolutions/resolution_penalty.cc
	M			src/model/contact_mechanics/resolutions/resolution_penalty_quadratic.cc
	M			src/model/model_couplers/coupler_solid_cohesive_contact.cc
	M			src/model/model_couplers/coupler_solid_cohesive_contact.hh
	M			src/model/model_couplers/coupler_solid_contact.cc
	M			src/model/model_couplers/coupler_solid_contact.hh
	M			src/model/solid_mechanics/materials/material_damage/material_von_mises_mazars_inline_impl.hh
	M			src/model/solid_mechanics/materials/material_plastic/material_drucker_prager.cc
	M			src/model/solid_mechanics/materials/material_plastic/material_drucker_prager.hh
	M			src/model/solid_mechanics/materials/material_plastic/material_drucker_prager_inline_impl.hh
	M			src/model/solid_mechanics/solid_mechanics_model_cohesive/materials/constitutive_laws/material_cohesive_linear_friction.cc