resolved conflict in contact mechanics model
062625799cae
Actions

Authored by pundir on May 14 2019, 13:08.

Description

resolved conflict in contact mechanics model

Committed

pundir

May 14 2019, 13:08

Pushed

gitlab-richart

Jan 18 2021, 21:10

Parents

Branches

Unknown

Tags

Unknown

				Path
	M			src/model/contact_mechanics/contact_mechanics_model.cc
	M			src/model/contact_mechanics/resolution.cc
	M			src/model/contact_mechanics/resolutions/resolution_penalty.cc
	M			src/model/contact_mechanics/resolutions/resolution_penalty.hh