Diffusion akantu 0f7c53635738

Merged conflict
0f7c53635738
Actions

Authored by pundir on Dec 11 2020, 12:59.

Tags

None

Subscribers

None

Description

Merged conflict

Details

Committed

Dec 11 2020, 12:59

Pushed

Jan 18 2021, 21:10

Parents

rAKAa5d5a08124f6: Merge branch 'master' into features/contact

Branches

Unknown

Tags

Unknown

Event Timeline

pundir committed rAKA0f7c53635738: Merged conflict (authored by pundir).Dec 11 2020, 12:59

Changes (10)

				Path
	M			.clang-format
	M			CMakeLists.txt
	D			doc/manual/manual-contact_detector.tex
	M			examples/contact_mechanics/CMakeLists.txt
	M			examples/contact_mechanics/material.dat
	M			src/model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive.cc
	M			test/test_model/test_contact_mechanics_model/CMakeLists.txt
	M			test/test_model/test_contact_mechanics_model/test_detector/CMakeLists.txt
	D			test/test_model/test_contact_mechanics_model/test_detector/test_node_selector.cc
	M			test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/material_damage_non_local.dat

rAKA0f7c53635738

.clang-format

Loading...

CMakeLists.txt

Loading...

doc/manual/manual-contact_detector.tex

Loading...

examples/contact_mechanics/CMakeLists.txt

Loading...

examples/contact_mechanics/material.dat

Loading...

src/model/solid_mechanics/solid_mechanics_model_cohesive/solid_mechanics_model_cohesive.cc

Loading...

test/test_model/test_contact_mechanics_model/CMakeLists.txt

Loading...

test/test_model/test_contact_mechanics_model/test_detector/CMakeLists.txt

Loading...

test/test_model/test_contact_mechanics_model/test_detector/test_node_selector.cc

Loading...

test/test_model/test_solid_mechanics_model/test_materials/test_material_non_local/material_damage_non_local.dat

Loading...