From 1f7bfd01d0c53c7199a19c14515d315de09cef6b Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Wed, 22 Apr 2015 14:54:16 +0200 Subject: [PATCH] New subdirectories: geometry/ and grid/ --- dune/fufem/CMakeLists.txt | 5 ++--- dune/fufem/geometry/CMakeLists.txt | 4 ++++ dune/fufem/{ => geometry}/convexpolyhedron.hh | 4 ++-- dune/fufem/{ => geometry}/polyhedrondistance.hh | 6 +++--- dune/fufem/grid/CMakeLists.txt | 3 +++ dune/fufem/{ => grid}/hierarchic-approximation.hh | 4 ++-- dune/fufem/test/test-polyhedral-minimisation.cc | 2 +- 7 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 dune/fufem/geometry/CMakeLists.txt rename dune/fufem/{ => geometry}/convexpolyhedron.hh (90%) rename dune/fufem/{ => geometry}/polyhedrondistance.hh (97%) create mode 100644 dune/fufem/grid/CMakeLists.txt rename dune/fufem/{ => grid}/hierarchic-approximation.hh (97%) diff --git a/dune/fufem/CMakeLists.txt b/dune/fufem/CMakeLists.txt index 1b1f16f1..85d4421d 100644 --- a/dune/fufem/CMakeLists.txt +++ b/dune/fufem/CMakeLists.txt @@ -1,5 +1,7 @@ add_subdirectory(assemblers) add_subdirectory(estimators) +add_subdirectory(geometry) +add_subdirectory(grid) add_subdirectory(functions) add_subdirectory(functionspacebases) add_subdirectory(functiontools) @@ -22,7 +24,6 @@ install(FILES boundingbox.hh box.hh concept.hh - convexpolyhedron.hh dataio.hh dgindexset.hh dgpqkindexset.hh @@ -34,7 +35,6 @@ install(FILES facelocalfiniteelement.hh formatstring.hh globalintersectioniterator.hh - hierarchic-approximation.hh improvegrid.hh interval.hh lumpmatrix.hh @@ -44,7 +44,6 @@ install(FILES mappedmatrix.hh matlab_io.hh orientedsubface.hh - polyhedrondistance.hh prolongboundarypatch.hh readbitfield.hh referenceelementhelper.hh diff --git a/dune/fufem/geometry/CMakeLists.txt b/dune/fufem/geometry/CMakeLists.txt new file mode 100644 index 00000000..8cbe112e --- /dev/null +++ b/dune/fufem/geometry/CMakeLists.txt @@ -0,0 +1,4 @@ +install(FILES + convexpolyhedron.hh + polyhedrondistance.hh + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/fufem/grid) diff --git a/dune/fufem/convexpolyhedron.hh b/dune/fufem/geometry/convexpolyhedron.hh similarity index 90% rename from dune/fufem/convexpolyhedron.hh rename to dune/fufem/geometry/convexpolyhedron.hh index 5b78d25f..4dbdfffe 100644 --- a/dune/fufem/convexpolyhedron.hh +++ b/dune/fufem/geometry/convexpolyhedron.hh @@ -1,5 +1,5 @@ -#ifndef DUNE_FUFEM_CONVEXPOLYHEDRON_HH -#define DUNE_FUFEM_CONVEXPOLYHEDRON_HH +#ifndef DUNE_FUFEM_GEOMETRY_CONVEXPOLYHEDRON_HH +#define DUNE_FUFEM_GEOMETRY_CONVEXPOLYHEDRON_HH #include <dune/fufem/arithmetic.hh> diff --git a/dune/fufem/polyhedrondistance.hh b/dune/fufem/geometry/polyhedrondistance.hh similarity index 97% rename from dune/fufem/polyhedrondistance.hh rename to dune/fufem/geometry/polyhedrondistance.hh index b76e397a..f0ba119c 100644 --- a/dune/fufem/polyhedrondistance.hh +++ b/dune/fufem/geometry/polyhedrondistance.hh @@ -1,12 +1,12 @@ -#ifndef DUNE_FUFEM_POLYHEDRONDISTANCE_HH -#define DUNE_FUFEM_POLYHEDRONDISTANCE_HH +#ifndef DUNE_FUFEM_GEOMETRY_POLYHEDRONDISTANCE_HH +#define DUNE_FUFEM_GEOMETRY_POLYHEDRONDISTANCE_HH // Based on the closest point projection from dune-contact #include <dune/common/dynvector.hh> #include <dune/common/dynmatrix.hh> -#include <dune/fufem/convexpolyhedron.hh> +#include <dune/fufem/geometry/convexpolyhedron.hh> template <class Coordinate, class Matrix> void populateMatrix(ConvexPolyhedron<Coordinate> const &segment, diff --git a/dune/fufem/grid/CMakeLists.txt b/dune/fufem/grid/CMakeLists.txt new file mode 100644 index 00000000..099d642c --- /dev/null +++ b/dune/fufem/grid/CMakeLists.txt @@ -0,0 +1,3 @@ +install(FILES + hierarchic-approximation.hh + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/fufem/grid) diff --git a/dune/fufem/hierarchic-approximation.hh b/dune/fufem/grid/hierarchic-approximation.hh similarity index 97% rename from dune/fufem/hierarchic-approximation.hh rename to dune/fufem/grid/hierarchic-approximation.hh index daf61a39..e8ca38d4 100644 --- a/dune/fufem/hierarchic-approximation.hh +++ b/dune/fufem/grid/hierarchic-approximation.hh @@ -1,5 +1,5 @@ -#ifndef DUNE_FUFEM_HIERARCHIC_APPROXIMATION_HH -#define DUNE_FUFEM_HIERARCHIC_APPROXIMATION_HH +#ifndef DUNE_FUFEM_GRID_HIERARCHIC_APPROXIMATION_HH +#define DUNE_FUFEM_GRID_HIERARCHIC_APPROXIMATION_HH // Based on // dune/grid/utility/hierarchicsearch.hh diff --git a/dune/fufem/test/test-polyhedral-minimisation.cc b/dune/fufem/test/test-polyhedral-minimisation.cc index 38e37efa..960cdb2d 100644 --- a/dune/fufem/test/test-polyhedral-minimisation.cc +++ b/dune/fufem/test/test-polyhedral-minimisation.cc @@ -4,7 +4,7 @@ #include <dune/common/fvector.hh> -#include <dune/fufem/polyhedrondistance.hh> +#include <dune/fufem/geometry/polyhedrondistance.hh> int main() { using LocalVector = Dune::FieldVector<double, 2>; -- GitLab