Merge branch 'master' of lsmssrv1.epfl.ch:akantu
e9660d462694
Actions

Authored by richart on Apr 9 2015, 13:48.

Description

Merge branch 'master' of lsmssrv1.epfl.ch:akantu

Committed

richart

Apr 9 2015, 13:48

Pushed

Parents

Branches

Unknown

Tags

Unknown

Restricted Application failed to build Restricted Buildable!Dec 6 2019, 13:43

Commit	Author	Details	Committed
fd6043c11f48	fabarras	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Apr 1 2015
e4b2e5ccde02	fabarras	python infc for structural mech + bug in testConvergence<res> bis	Apr 1 2015
6553f3f8a9c7	fabarras	python infc for structural mech + bug in testConvergence<res>	Apr 1 2015
edab3a8977ab	Marco Vocialta	Bugfix after recent modifications to the cohesive elements' insertion	Mar 31 2015
4d57c9fb721c	Lucas Frérot	Added uniform prestressing to reinforcements	Mar 31 2015

		Path
M	(sub)	extra_packages/extra-materials
M	(sub)	extra_packages/parallel-cohesive-element
M		python/swig/aka_common.i
M		python/swig/akantu.i
A		python/swig/load_functions.i
M		python/swig/mesh.i
A		python/swig/structural_mechanics_model.i
M		src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.cc
M		src/model/solid_mechanics/materials/material_embedded/embedded_internal_field.hh
M		src/model/solid_mechanics/materials/material_embedded/material_reinforcement.cc
M		src/model/solid_mechanics/materials/material_embedded/material_reinforcement.hh
M		src/model/solid_mechanics/materials/material_embedded/material_reinforcement_template_inline_impl.cc
M		src/model/solid_mechanics/solid_mechanics_model.cc
M		src/model/structural_mechanics/structural_mechanics_model.cc