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

Authored by richart on May 15 2015, 16:56.

Description

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

Conflicts:
src/common/aka_types.hh

Committed

richart

May 15 2015, 16:56

Pushed

Parents

Branches

Unknown

Tags

Unknown

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

Commit	Author	Details	Committed
5113d7dc2893	richart	Merge branch 'eesd', Factorizing code and adding minor opertators	May 15 2015
9d3b1dd615b1	richart	factorazing computation of tangents	May 15 2015
bb67c591e4ef	richart	confict correction + minor change in the VERSION	May 1 2015
6cac697cfeec	richart	fixes for custom cohesive material + small fixes	Apr 22 2015

				Path
	M			src/common/aka_config.hh.in
	M			src/common/aka_math.cc
	M			src/common/aka_math.hh
	M			src/io/parser/parser_tmpl.hh
	M			src/model/solid_mechanics/material.hh
	M			src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.cc
	M			src/model/solid_mechanics/materials/material_cohesive/constitutive_laws/material_cohesive_linear.hh
	M			src/model/solid_mechanics/solid_mechanics_model_cohesive.cc
	M			src/model/solid_mechanics/solid_mechanics_model_cohesive_inline_impl.cc