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

Authored by richart on Feb 27 2015, 15:50.

Description

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

Committed

richart

Feb 27 2015, 15:50

Pushed

Parents

Branches

Unknown

Tags

Unknown

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

	Commit			Author	Details	Committed
	f9e32ccbcdc7			Lucas Frérot	Added vim temporary files to .gitignore	Feb 27 2015
	face17120e14			Lucas Frérot	Changed structure of geometry module	Feb 27 2015

		Path
M		.gitignore
M		packages/00_core.cmake
V		packages/{80_cgal.cmake → cgal.cmake}
V		packages/{cgal.cmake ← 80_cgal.cmake}
M		src/common/aka_config.hh.in
D		src/geometry/cgal_point.cc
D		src/geometry/cgal_point.hh
D		src/geometry/cgal_segment.cc
D		src/geometry/cgal_segment.hh
D		src/geometry/cgal_triangle.cc
D		src/geometry/cgal_triangle.hh
P		src/geometry/geometrical_primitive.hh Deleted after being copied to multiple locations: src/geometry/mesh_abstract_constructor.cc src/geometry/mesh_tree_container.hh
P		src/geometry/mesh_abstract_constructor.cc Copied from src/geometry/geometrical_primitive.hh
V		src/geometry/{mesh_abstract_constructor.hh ← point.hh}
A		src/geometry/mesh_tree_constructor.hh
A		src/geometry/mesh_tree_constructor_tmpl.hh
P		src/geometry/mesh_tree_container.cc Copied from test/test_model/test_structural_mechanics_model/test_structural_mechanics_model_bernoulli_beam_12_10_13.cc
V		src/geometry/{mesh_tree_container.hh ← geometrical_primitive.hh}
D		src/geometry/point.cc
V		src/geometry/{point.hh → mesh_abstract_constructor.hh}
D		src/geometry/segment.cc
V		src/geometry/{segment.hh → tree_type_helper.hh}
V		src/geometry/{tree_type_helper.hh ← segment.hh}
D		src/geometry/triangle.cc
D		src/geometry/triangle.hh
M		test/CMakeLists.txt
A	(dir)	test/test_geometry/
P		test/test_geometry/CMakeLists.txt Copied from test/test_io/test_dumper/CMakeLists.txt
A		test/test_geometry/mesh.geo
A		test/test_geometry/test_geometry_intersection.cc