Diffusion akantu 63a5b31828e0

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

Authored by richart on Apr 12 2015, 03:03.

Description

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

Conflicts:
src/io/dumper/dumper_connectivity_field.hh
src/io/dumper/dumper_iohelper.cc

Details

Committed

richart

Apr 12 2015, 03:03

Pushed

richart	Dec 6 2019, 13:35
richart	Dec 6 2019, 13:16
richart	Dec 6 2019, 12:16
richart	Dec 6 2019, 11:45
richart	Dec 5 2019, 22:54
richart	Dec 5 2019, 18:45

Parents

rAKAc08cb640aa1b: modified aka_config.hh.in for students-extra-package
rAKAd39799d82ebd: aligning submodules

Branches

Unknown

Tags

Unknown

Event Timeline

richart committed rAKA63a5b31828e0: Merge branch 'master' of lsmssrv1.epfl.ch:akantu (authored by richart).Apr 12 2015, 03:03

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

Merged Changes

Commit	Author	Details	Committed
c08cb640aa1b	molyneau	modified aka_config.hh.in for students-extra-package	Apr 11 2015
6bcae4a3d87b	corrado	renamed variables in solid_mechanics_model_cohesive_inline_impl.cc	Apr 10 2015
f9f10dc8ed67	corrado	tests for hexahedron 20	Apr 10 2015
fbcc33484b3a	corrado	conflicts solved	Apr 10 2015
dee5ba7b2bfb	corrado	implementing function to check delta_max in case of no convergence	Apr 10 2015
1d3da3dfa0ad	corrado	Merge branch 'master' of lsmssrv1.epfl.ch:akantu	Apr 7 2015
9b64fc7eae71	corrado	fixed bugs with hexahedron_20	Apr 7 2015
2eb87f8351ac	corrado	conflicts solved	Mar 31 2015
1f39ca97a8bd	corrado	correcting indentation	Mar 31 2015
58c643481d74	corrado	correcting facet numbering for hexa20	Mar 31 2015

Changes (29)

				Path
	M			src/common/aka_common.hh
	M			src/common/aka_common_inline_impl.cc
	M			src/common/aka_config.hh.in
	M			src/fe_engine/element_class.cc
	M			src/fe_engine/element_class.hh
	M			src/fe_engine/element_classes/element_class_hexahedron_20_inline_impl.cc
	M			src/fe_engine/element_classes/element_class_pentahedron_15_inline_impl.cc
	M			src/fe_engine/element_classes/element_class_quadrangle_8_inline_impl.cc
	M			src/fe_engine/geometrical_element.cc
	M			src/fe_engine/integration_element.cc
	M			src/fe_engine/interpolation_element_tmpl.hh
	M			src/io/dumper/dumper_connectivity_field.hh
	M			src/io/dumper/dumper_iohelper.cc
	M			src/io/mesh_io/mesh_io_msh.cc
	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/materials/material_cohesive/material_cohesive.cc
	M			src/model/solid_mechanics/materials/material_cohesive/material_cohesive.hh
	M			src/model/solid_mechanics/solid_mechanics_model_cohesive_inline_impl.cc
	M			test/test_fem/CMakeLists.txt
	A			test/test_fem/_hexahedron_20.msh
	M			test/test_fem/cube.geo
	M			test/test_fem/test_gradient.cc
	P			test/test_fem/test_gradient_hexahedron_20.verified Copied from test/test_fem/test_interpolate_bernoulli_beam_2.verified
	P			test/test_fem/test_integrate_hexahedron_20.verified Copied from test/test_fem/test_interpolate_bernoulli_beam_2.verified
	P			test/test_fem/test_interpolate_hexahedron_20.verified Copied from test/test_fem/test_interpolate_bernoulli_beam_2.verified
	P			test/test_fem/test_inverse_map_hexahedron_20.verified Copied from test/test_fem/test_interpolate_bernoulli_beam_2.verified
	M			test/test_model/test_solid_mechanics_model/patch_tests/CMakeLists.txt
	A			test/test_model/test_solid_mechanics_model/patch_tests/data/_hexahedron_20.msh