Diffusion akantu c36a46eba32e

Merge branch 'features/contact' of c4science:/diffusion/AKAPRIV/akantu-private…
c36a46eba32e
Actions

Authored by richart on May 15 2019, 12:10.

Tags

None

Subscribers

None

Description

Merge branch 'features/contact' of c4science:/diffusion/AKAPRIV/akantu-private into features/contact

Details

Committed

May 15 2019, 12:10

Pushed

Jan 18 2021, 21:10

Parents

rAKA391605902ad3: Broked the compilation... (Mohit I how you a beer), removed some warnings
rAKA062625799cae: resolved conflict in contact mechanics model

Branches

Unknown

Tags

Unknown

Event Timeline

richart committed rAKAc36a46eba32e: Merge branch 'features/contact' of c4science:/diffusion/AKAPRIV/akantu-private… (authored by richart).May 15 2019, 12:10

Merged Changes

	Commit			Author	Details	Committed
	062625799cae			pundir	resolved conflict in contact mechanics model	May 14 2019

Changes (4)

				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

rAKAc36a46eba32e

src/model/contact_mechanics/contact_mechanics_model.cc

Loading...

src/model/contact_mechanics/resolution.cc

Loading...

src/model/contact_mechanics/resolutions/resolution_penalty.cc

Loading...

src/model/contact_mechanics/resolutions/resolution_penalty.hh

Loading...