Diffusion akantu b285dab59995

Merge branch 'release' of gitolite:akantu into release
b285dab59995
Actions

Authored by anciaux on Jan 22 2016, 15:15.

Description

Merge branch 'release' of gitolite:akantu into release

Details

Committed

anciaux

Jan 22 2016, 15:15

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

rAKA888787d966d4: Merge branch 'release' of gitolite-richart:akantu into release
rAKAabcfae9b4062: adding documentation of the python module

Branches

Unknown

Tags

Unknown

Event Timeline

anciaux committed rAKAb285dab59995: Merge branch 'release' of gitolite:akantu into release (authored by anciaux).Jan 22 2016, 15:15

Merged Changes

Commit	Author	Details	Committed
888787d966d4	richart	Merge branch 'release' of gitolite-richart:akantu into release	Jan 22 2016
a9a00a5b7ec0	richart	minor changes in test and examples handling	Jan 22 2016
f9c17105cc93	richart	moving declaration of files	Jan 22 2016
23b925effbe2	richart	Missing file modif in the change of structure	Jan 22 2016
c66c6897a714	richart	Removing warnings in -pedantic	Jan 22 2016
2a1d534f659e	richart	Changing the extra_packages structure	Jan 22 2016

Changes (221)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitmodules
M		CMakeLists.txt
M		cmake/AkantuCPack.cmake
M		cmake/AkantuExampleMacros.cmake
M		cmake/AkantuInstall.cmake
M		cmake/AkantuPackagesSystem.cmake
M		cmake/AkantuTestsMacros.cmake
A		cmake/akantu_environement.csh.in
V		cmake/{akantu_environement.sh.in ← akantu_test_environement.sh.in}
A		cmake/akantu_install_environement.csh.in
A		cmake/akantu_install_environement.sh.in
V		cmake/{akantu_test_environement.sh.in → akantu_environement.sh.in}
V		{doc/manual/figures → extra_packages/contact_alejandro/manual}/hertz_3D.png
V		{doc → extra_packages/contact_alejandro}/manual/manual-contact.tex
M		examples/CMakeLists.txt
A		examples/README.rst
V	(dir)	{examples/contact/ → extra_packages/contact_alejandro/examples/contact}
V		{ → extra_packages/contact_alejandro}/examples/contact/CMakeLists.txt
V		{ → extra_packages/contact_alejandro}/examples/contact/blocks.cc
V		{ → extra_packages/contact_alejandro}/examples/contact/blocks.geo
V		{ → extra_packages/contact_alejandro}/examples/contact/hertz_2D.cc
V		{ → extra_packages/contact_alejandro}/examples/contact/hertz_2D.geo
V		{ → extra_packages/contact_alejandro}/examples/contact/hertz_3D.cc
V		{ → extra_packages/contact_alejandro}/examples/contact/hertz_3D.geo
V		{ → extra_packages/contact_alejandro}/examples/contact/steel.dat
V		{ → extra_packages/contact_alejandro}/examples/contact/tetrahedra.cc
V		{ → extra_packages/contact_alejandro}/examples/contact/tetrahedra.geo
M		examples/explicit/explicit_dynamic.cc
V	(dir)	{examples/optimization/ → extra_packages/contact_alejandro/examples/optimization}
V		{ → extra_packages/contact_alejandro}/examples/optimization/CMakeLists.txt
V		{ → extra_packages/contact_alejandro}/examples/optimization/fn_optimize.cc
A	(dir)	extra_packages/contact_alejandro/
A	(dir)	extra_packages/contact_alejandro/examples/
V	(dir)	{extra_packages/contact_alejandro/examples/contact/ ← examples/contact}
V		{extra_packages/contact_alejandro ← }/examples/contact/CMakeLists.txt
V		{extra_packages/contact_alejandro ← }/examples/contact/blocks.cc
V		{extra_packages/contact_alejandro ← }/examples/contact/blocks.geo
V		{extra_packages/contact_alejandro ← }/examples/contact/hertz_2D.cc
V		{extra_packages/contact_alejandro ← }/examples/contact/hertz_2D.geo
V		{extra_packages/contact_alejandro ← }/examples/contact/hertz_3D.cc
V		{extra_packages/contact_alejandro ← }/examples/contact/hertz_3D.geo
V		{extra_packages/contact_alejandro ← }/examples/contact/steel.dat
V		{extra_packages/contact_alejandro ← }/examples/contact/tetrahedra.cc
V		{extra_packages/contact_alejandro ← }/examples/contact/tetrahedra.geo
V	(dir)	{extra_packages/contact_alejandro/examples/optimization/ ← examples/optimization}
V		{extra_packages/contact_alejandro ← }/examples/optimization/CMakeLists.txt
V		{extra_packages/contact_alejandro ← }/examples/optimization/fn_optimize.cc
A	(dir)	extra_packages/contact_alejandro/manual/
V		{extra_packages/contact_alejandro/manual ← doc/manual/figures}/hertz_3D.png
V		{extra_packages/contact_alejandro ← doc}/manual/manual-contact.tex
A		extra_packages/contact_alejandro/package.cmake
A	(dir)	extra_packages/contact_alejandro/packages/
V		{extra_packages/contact_alejandro ← }/packages/contact.cmake
V		{extra_packages/contact_alejandro ← }/packages/cpparray.cmake
V		{extra_packages/contact_alejandro ← }/packages/nlopt.cmake
V		{extra_packages/contact_alejandro ← }/packages/optimization.cmake
A	(dir)	extra_packages/contact_alejandro/src/
A	(dir)	extra_packages/contact_alejandro/src/common/
V		{extra_packages/contact_alejandro ← }/src/common/aka_ball.cc
V		{extra_packages/contact_alejandro ← }/src/common/aka_ball.hh
V		{extra_packages/contact_alejandro ← }/src/common/aka_bounding_box.cc
V		{extra_packages/contact_alejandro ← }/src/common/aka_bounding_box.hh
V		{extra_packages/contact_alejandro ← }/src/common/aka_geometry.cc
V		{extra_packages/contact_alejandro ← }/src/common/aka_geometry.hh
V		{extra_packages/contact_alejandro ← }/src/common/aka_optimize.cc
V		{extra_packages/contact_alejandro ← }/src/common/aka_optimize.hh
V		{extra_packages/contact_alejandro ← }/src/common/aka_plane.hh
V		{extra_packages/contact_alejandro ← }/src/common/aka_point.hh
V		{extra_packages/contact_alejandro ← }/src/common/aka_polytope.hh
V		{extra_packages/contact_alejandro ← }/src/common/aka_timer.hh
V		{extra_packages/contact_alejandro ← }/src/common/aka_tree.hh
V	(dir)	{extra_packages/contact_alejandro/src/contact/ ← src/contact}
V		{extra_packages/contact_alejandro ← }/src/contact/contact_common.hh
V		{extra_packages/contact_alejandro ← }/src/contact/contact_impl.cc
V		{extra_packages/contact_alejandro ← }/src/contact/contact_impl.hh
V		{extra_packages/contact_alejandro ← }/src/contact/contact_manager.hh
V		{extra_packages/contact_alejandro ← }/src/contact/discretization.cc
V		{extra_packages/contact_alejandro ← }/src/contact/discretization.hh
V		{extra_packages/contact_alejandro ← }/src/contact/element.cc
V		{extra_packages/contact_alejandro ← }/src/contact/element.hh
V		{extra_packages/contact_alejandro ← }/src/contact/friction.cc
V		{extra_packages/contact_alejandro ← }/src/contact/friction.hh
V	(dir)	{extra_packages/contact_alejandro/src/contact/resolution/ ← src/contact/resolution}
V		{extra_packages/contact_alejandro ← }/src/contact/resolution.hh
V		{extra_packages/contact_alejandro ← }/src/contact/resolution/resolution_augmented_lagrangian.cc
V		{extra_packages/contact_alejandro ← }/src/contact/resolution/resolution_augmented_lagrangian.hh
V		{extra_packages/contact_alejandro ← }/src/contact/scheme.cc
V		{extra_packages/contact_alejandro ← }/src/contact/scheme.hh
V		{extra_packages/contact_alejandro ← }/src/contact/search.cc
V		{extra_packages/contact_alejandro ← }/src/contact/search.hh
V		{extra_packages/contact_alejandro ← }/src/contact/surface.cc
V		{extra_packages/contact_alejandro ← }/src/contact/surface.hh
V		{extra_packages/contact_alejandro ← }/src/contact/zone.cc
V		{extra_packages/contact_alejandro ← }/src/contact/zone.hh
A	(dir)	extra_packages/contact_alejandro/src/model/
A	(dir)	extra_packages/contact_alejandro/src/model/solid_mechanics/
V		{extra_packages/contact_alejandro ← }/src/model/solid_mechanics/solid_mechanics_model_element.hh
V	(dir)	{extra_packages/contact_alejandro/test/ ← test/test_contact}
V		{extra_packages/contact_alejandro/test ← test/test_contact}/CMakeLists.txt
V		{extra_packages/contact_alejandro/test ← test/test_contact}/acurnier_2D_1.cc
V		{extra_packages/contact_alejandro/test ← test/test_contact}/acurnier_2D_1.geo
V		{extra_packages/contact_alejandro/test ← test/test_contact}/acurnier_2D_2.cc
V		{extra_packages/contact_alejandro/test ← test/test_contact}/acurnier_2D_2.geo
V		{extra_packages/contact_alejandro/test ← test/test_contact}/acurnier_2D_3.cc
V		{extra_packages/contact_alejandro/test ← test/test_contact}/acurnier_2D_3.geo
V		{extra_packages/contact_alejandro/test ← test/test_contact}/acurnier_3D_1.cc
V		{extra_packages/contact_alejandro/test ← test/test_contact}/acurnier_3D_1.geo
V		{extra_packages/contact_alejandro/test ← test/test_contact}/acurnier_3D_2.cc
V		{extra_packages/contact_alejandro/test ← test/test_contact}/acurnier_3D_2.geo
V		{extra_packages/contact_alejandro/test ← test/test_contact}/acurnier_3D_3.cc
V		{extra_packages/contact_alejandro/test ← test/test_contact}/acurnier_3D_3.geo
V		{extra_packages/contact_alejandro/test ← test/test_contact}/hertz_2D.cc
V		{extra_packages/contact_alejandro/test ← test/test_contact}/hertz_2D.geo
V		{extra_packages/contact_alejandro/test ← test/test_contact}/hertz_3D.cc
V		{extra_packages/contact_alejandro/test ← test/test_contact}/hertz_3D.msh
V		{extra_packages/contact_alejandro/test ← test/test_contact}/material.dat
V		{extra_packages/contact_alejandro/test ← test/test_contact}/offset_1slave.cc
V		{extra_packages/contact_alejandro/test ← test/test_contact}/offset_1slave.geo
V		{extra_packages/contact_alejandro/test ← test/test_contact}/offset_2slaves.cc
V		{extra_packages/contact_alejandro/test ← test/test_contact}/offset_2slaves.geo
V		{extra_packages/contact_alejandro/test ← test/test_contact}/steel.dat
V		{extra_packages/contact_alejandro/test ← test/test_contact}/test_acurnier_2D_1.verified
V		{extra_packages/contact_alejandro/test ← test/test_contact}/test_acurnier_2D_2.verified
V		{extra_packages/contact_alejandro/test ← test/test_contact}/test_acurnier_3D_1.verified
V		{extra_packages/contact_alejandro/test ← test/test_contact}/test_acurnier_3D_2.verified
V		{extra_packages/contact_alejandro/test ← test/test_contact}/test_acurnier_3D_3.verified
V		{extra_packages/contact_alejandro/test ← test/test_contact}/test_hertz_2D.verified
V		{extra_packages/contact_alejandro/test ← test/test_contact}/test_hertz_3D.verified
V		{extra_packages/contact_alejandro/test ← test/test_contact}/test_offset_1slave.verified
V		{extra_packages/contact_alejandro/test ← test/test_contact}/test_offset_2slaves.verified
D		extra_packages/traction-at-split-node-contact
V		{ → extra_packages/contact_alejandro}/packages/contact.cmake
M		packages/core_cxx11.cmake
V		{ → extra_packages/contact_alejandro}/packages/cpparray.cmake
V		{ → extra_packages/contact_alejandro}/packages/nlopt.cmake
V		{ → extra_packages/contact_alejandro}/packages/optimization.cmake
M		packages/python_interface.cmake
M		packages/pythonlibs.cmake
M		src/common/aka_array.hh
M		src/common/aka_array_tmpl.hh
V		{ → extra_packages/contact_alejandro}/src/common/aka_ball.cc
V		{ → extra_packages/contact_alejandro}/src/common/aka_ball.hh
V		{ → extra_packages/contact_alejandro}/src/common/aka_bounding_box.cc
V		{ → extra_packages/contact_alejandro}/src/common/aka_bounding_box.hh
V		{ → extra_packages/contact_alejandro}/src/common/aka_geometry.cc
V		{ → extra_packages/contact_alejandro}/src/common/aka_geometry.hh
V		{ → extra_packages/contact_alejandro}/src/common/aka_optimize.cc
V		{ → extra_packages/contact_alejandro}/src/common/aka_optimize.hh
V		{ → extra_packages/contact_alejandro}/src/common/aka_plane.hh
V		{ → extra_packages/contact_alejandro}/src/common/aka_point.hh
V		{ → extra_packages/contact_alejandro}/src/common/aka_polytope.hh
V		{ → extra_packages/contact_alejandro}/src/common/aka_timer.hh
V		{ → extra_packages/contact_alejandro}/src/common/aka_tree.hh
M		src/common/aka_types.hh
M		src/common/aka_voigthelper.hh
V	(dir)	{src/contact/ → extra_packages/contact_alejandro/src/contact}
V		{ → extra_packages/contact_alejandro}/src/contact/contact_common.hh
V		{ → extra_packages/contact_alejandro}/src/contact/contact_impl.cc
V		{ → extra_packages/contact_alejandro}/src/contact/contact_impl.hh
V		{ → extra_packages/contact_alejandro}/src/contact/contact_manager.hh
V		{ → extra_packages/contact_alejandro}/src/contact/discretization.cc
V		{ → extra_packages/contact_alejandro}/src/contact/discretization.hh
V		{ → extra_packages/contact_alejandro}/src/contact/element.cc
V		{ → extra_packages/contact_alejandro}/src/contact/element.hh
V		{ → extra_packages/contact_alejandro}/src/contact/friction.cc
V		{ → extra_packages/contact_alejandro}/src/contact/friction.hh
V	(dir)	{src/contact/resolution/ → extra_packages/contact_alejandro/src/contact/resolution}
V		{ → extra_packages/contact_alejandro}/src/contact/resolution.hh
V		{ → extra_packages/contact_alejandro}/src/contact/resolution/resolution_augmented_lagrangian.cc
V		{ → extra_packages/contact_alejandro}/src/contact/resolution/resolution_augmented_lagrangian.hh
V		{ → extra_packages/contact_alejandro}/src/contact/scheme.cc
V		{ → extra_packages/contact_alejandro}/src/contact/scheme.hh
V		{ → extra_packages/contact_alejandro}/src/contact/search.cc
V		{ → extra_packages/contact_alejandro}/src/contact/search.hh
V		{ → extra_packages/contact_alejandro}/src/contact/surface.cc
V		{ → extra_packages/contact_alejandro}/src/contact/surface.hh
V		{ → extra_packages/contact_alejandro}/src/contact/zone.cc
V		{ → extra_packages/contact_alejandro}/src/contact/zone.hh
M		src/io/model_io/model_io_ibarras.cc
M		src/mesh/mesh.cc
M		src/mesh_utils/mesh_partition.cc
M		src/mesh_utils/mesh_partition/mesh_partition_scotch.cc
M		src/mesh_utils/mesh_utils.cc
V		{ → extra_packages/contact_alejandro}/src/model/solid_mechanics/solid_mechanics_model_element.hh
M		src/synchronizer/distributed_synchronizer.cc
M		src/synchronizer/grid_synchronizer.cc
M		test/CMakeLists.txt
V	(dir)	{test/test_contact/ → extra_packages/contact_alejandro/test}
V		{test/test_contact → extra_packages/contact_alejandro/test}/CMakeLists.txt
V		{test/test_contact → extra_packages/contact_alejandro/test}/acurnier_2D_1.cc
V		{test/test_contact → extra_packages/contact_alejandro/test}/acurnier_2D_1.geo
V		{test/test_contact → extra_packages/contact_alejandro/test}/acurnier_2D_2.cc
V		{test/test_contact → extra_packages/contact_alejandro/test}/acurnier_2D_2.geo
V		{test/test_contact → extra_packages/contact_alejandro/test}/acurnier_2D_3.cc
V		{test/test_contact → extra_packages/contact_alejandro/test}/acurnier_2D_3.geo
V		{test/test_contact → extra_packages/contact_alejandro/test}/acurnier_3D_1.cc
V		{test/test_contact → extra_packages/contact_alejandro/test}/acurnier_3D_1.geo
V		{test/test_contact → extra_packages/contact_alejandro/test}/acurnier_3D_2.cc
V		{test/test_contact → extra_packages/contact_alejandro/test}/acurnier_3D_2.geo
V		{test/test_contact → extra_packages/contact_alejandro/test}/acurnier_3D_3.cc
V		{test/test_contact → extra_packages/contact_alejandro/test}/acurnier_3D_3.geo
V		{test/test_contact → extra_packages/contact_alejandro/test}/hertz_2D.cc
V		{test/test_contact → extra_packages/contact_alejandro/test}/hertz_2D.geo
V		{test/test_contact → extra_packages/contact_alejandro/test}/hertz_3D.cc
V		{test/test_contact → extra_packages/contact_alejandro/test}/hertz_3D.msh
V		{test/test_contact → extra_packages/contact_alejandro/test}/material.dat
V		{test/test_contact → extra_packages/contact_alejandro/test}/offset_1slave.cc
V		{test/test_contact → extra_packages/contact_alejandro/test}/offset_1slave.geo
V		{test/test_contact → extra_packages/contact_alejandro/test}/offset_2slaves.cc
V		{test/test_contact → extra_packages/contact_alejandro/test}/offset_2slaves.geo
V		{test/test_contact → extra_packages/contact_alejandro/test}/steel.dat
V		{test/test_contact → extra_packages/contact_alejandro/test}/test_acurnier_2D_1.verified
V		{test/test_contact → extra_packages/contact_alejandro/test}/test_acurnier_2D_2.verified
V		{test/test_contact → extra_packages/contact_alejandro/test}/test_acurnier_3D_1.verified
V		{test/test_contact → extra_packages/contact_alejandro/test}/test_acurnier_3D_2.verified
V		{test/test_contact → extra_packages/contact_alejandro/test}/test_acurnier_3D_3.verified
V		{test/test_contact → extra_packages/contact_alejandro/test}/test_hertz_2D.verified
V		{test/test_contact → extra_packages/contact_alejandro/test}/test_hertz_3D.verified
V		{test/test_contact → extra_packages/contact_alejandro/test}/test_offset_1slave.verified
V		{test/test_contact → extra_packages/contact_alejandro/test}/test_offset_2slaves.verified
M		test/test_mesh_utils/test_mesh_partitionate/test_mesh_partitionate_mesh_data.cc