Merging with the trunk
cf3f4b736487
Actions

Authored by richart on Jun 17 2014, 14:38.

Description

Merging with the trunk

Committed

richart

Jun 17 2014, 14:38

Pushed

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
47485bcb17de	Aragón Alejandro M	Up-to-date contact implementation	Jun 17 2014
8908eeca0d1b	anciaux	correct some small compilation problems	Jun 16 2014
092c87981180	anciaux	add the parse arguments stuff	Jun 16 2014

				Path
	M			CMakeLists.txt
	M			doc/manual/manual.tex
	M			packages/00_documentation_doxygen.cmake
	M			packages/20_cohesive_element.cmake
	M			packages/20_contact.cmake
	M			packages/80_nlopt.cmake
	M			packages/90_blas.cmake
	M			src/common/aka_ball.hh
	M			src/common/aka_common.cc
	M			src/common/aka_common.hh
	M			src/common/aka_geometry.hh
	M			src/common/aka_optimize.hh
	M			src/common/aka_plane.hh
	M			src/common/aka_point.hh
	M			src/common/aka_polytope.hh
	M			src/common/aka_timer.hh
	M			src/common/aka_typelist.hh
	M			src/contact/contact_common.hh
	M			src/model/implicit_contact_manager.hh
	M			src/model/model_manager.hh
	D			src/model/ns_contact_manager.hh
	M			src/model/solid_mechanics/solid_mechanics_model.hh
	M			src/model/structural_mechanics/structural_mechanics_model.cc
	M			test/test_contact/hertz_2D.cc
	M			test/test_contact/hertz_3D.cc
	M			test/test_contact/test_hertz_3D.verified