From 13721534ef2acc6713e69db6e497050e96908f5c Mon Sep 17 00:00:00 2001 From: Lukas Werner <lks.werner@fau.de> Date: Fri, 17 Apr 2020 09:48:10 +0200 Subject: [PATCH] Extracted essential mesh functionality into new module mesh_common --- .../ComplexGeometry/ComplexGeometry.cpp | 18 +++++++++--------- .../MeshDistance/MeshDistanceBenchmark.cpp | 10 +++++----- apps/tutorials/lbm/04_LBComplexGeometry.cpp | 18 +++++++++--------- src/mesh/CMakeLists.txt | 2 +- src/mesh/MeshConversion.h | 4 ++-- src/mesh/blockforest/BlockExclusion.h | 2 +- .../blockforest/BlockForestInitialization.h | 4 ++-- src/mesh/blockforest/RefinementSelection.h | 2 +- src/mesh/boundary/BoundaryUIDFaceDataSource.h | 2 +- src/mesh/mesh_module.dox | 13 +++++++++++++ src/mesh/pe/communication/ConvexPolyhedron.cpp | 2 +- src/mesh/pe/raytracing/Intersects.h | 4 ++-- src/mesh/pe/rigid_body/ConvexPolyhedron.cpp | 4 ++-- src/mesh/pe/rigid_body/ConvexPolyhedron.h | 2 +- .../pe/rigid_body/ConvexPolyhedronFactory.cpp | 6 +++--- src/mesh/pe/tesselation/Box.h | 2 +- src/mesh/pe/tesselation/ConvexPolyhedron.h | 4 ++-- src/mesh/pe/vtk/CommonDataSources.h | 2 +- src/mesh/pe/vtk/PeVTKMeshWriter.h | 4 ++-- src/mesh/python/Exports.impl.h | 14 +++++++------- src/mesh_common/CMakeLists.txt | 9 +++++++++ .../DistanceComputations.h | 8 ++++---- src/{mesh => mesh_common}/DistanceFunction.h | 2 +- .../MatrixVectorOperations.h | 0 src/{mesh => mesh_common}/MeshIO.h | 0 src/{mesh => mesh_common}/MeshOperations.h | 2 +- .../OpenMeshBufferTypeExtensions.h | 0 src/{mesh => mesh_common}/PolyMeshes.h | 2 +- src/{mesh => mesh_common}/QHull.h | 8 ++++---- src/{mesh => mesh_common}/TriangleMeshes.h | 0 .../distance_octree/BranchNode.h | 6 +++--- .../distance_octree/DistanceOctree.h | 2 +- .../distance_octree/LeafNode.h | 2 +- .../distance_octree/Node.h | 2 +- .../vtk/CommonDataSources.h | 0 src/{mesh => mesh_common}/vtk/CommonFilters.h | 0 .../vtk/DistributedVTKMeshWriter.h | 0 src/{mesh => mesh_common}/vtk/VTKMeshWriter.h | 2 +- tests/mesh/DistributedMeshVTKTest.cpp | 12 ++++++------ tests/mesh/MatrixVectorOperationsTest.cpp | 2 +- tests/mesh/MeshAABBIntersectionTest.cpp | 8 ++++---- tests/mesh/MeshAABBSelectionTest.cpp | 8 ++++---- tests/mesh/MeshBlockExclusionTest.cpp | 10 +++++----- tests/mesh/MeshContainmentOctreeTest.cpp | 14 +++++++------- tests/mesh/MeshConversionTest.cpp | 2 +- tests/mesh/MeshDistanceCompareTest.cpp | 8 ++++---- tests/mesh/MeshDistanceOctreeTest.cpp | 10 +++++----- tests/mesh/MeshDistancePlausibilityTest.cpp | 16 ++++++++-------- tests/mesh/MeshInitilizationTest.cpp | 10 +++++----- tests/mesh/MeshMarshalling.cpp | 4 ++-- tests/mesh/MeshOperationsTest.cpp | 10 +++++----- tests/mesh/MeshPeRaytracing.cpp | 2 +- tests/mesh/MeshVTKTest.cpp | 12 ++++++------ tests/mesh/NumericIntegrationTest.cpp | 10 +++++----- .../mesh/OpenMeshBufferTypeExtensionsTest.cpp | 2 +- tests/mesh/PeVTKMeshWriterTest.cpp | 2 +- tests/mesh/QHullTest.cpp | 8 ++++---- 57 files changed, 168 insertions(+), 146 deletions(-) create mode 100644 src/mesh_common/CMakeLists.txt rename src/{mesh => mesh_common}/DistanceComputations.h (99%) rename src/{mesh => mesh_common}/DistanceFunction.h (97%) rename src/{mesh => mesh_common}/MatrixVectorOperations.h (100%) rename src/{mesh => mesh_common}/MeshIO.h (100%) rename src/{mesh => mesh_common}/MeshOperations.h (99%) rename src/{mesh => mesh_common}/OpenMeshBufferTypeExtensions.h (100%) rename src/{mesh => mesh_common}/PolyMeshes.h (97%) rename src/{mesh => mesh_common}/QHull.h (98%) rename src/{mesh => mesh_common}/TriangleMeshes.h (100%) rename src/{mesh => mesh_common}/distance_octree/BranchNode.h (99%) rename src/{mesh => mesh_common}/distance_octree/DistanceOctree.h (99%) rename src/{mesh => mesh_common}/distance_octree/LeafNode.h (99%) rename src/{mesh => mesh_common}/distance_octree/Node.h (98%) rename src/{mesh => mesh_common}/vtk/CommonDataSources.h (100%) rename src/{mesh => mesh_common}/vtk/CommonFilters.h (100%) rename src/{mesh => mesh_common}/vtk/DistributedVTKMeshWriter.h (100%) rename src/{mesh => mesh_common}/vtk/VTKMeshWriter.h (99%) diff --git a/apps/benchmarks/ComplexGeometry/ComplexGeometry.cpp b/apps/benchmarks/ComplexGeometry/ComplexGeometry.cpp index e8d56f6c3..95678fab1 100644 --- a/apps/benchmarks/ComplexGeometry/ComplexGeometry.cpp +++ b/apps/benchmarks/ComplexGeometry/ComplexGeometry.cpp @@ -54,25 +54,25 @@ #include "geometry/mesh/TriangleMeshIO.h" #include "geometry/InitBoundaryHandling.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/MeshOperations.h" -#include "mesh/DistanceComputations.h" -#include "mesh/DistanceFunction.h" -#include "mesh/MeshIO.h" -#include "mesh/MatrixVectorOperations.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/DistanceFunction.h" +#include "mesh_common/MeshIO.h" +#include "mesh_common/MatrixVectorOperations.h" +#include "mesh_common/distance_octree/DistanceOctree.h" +#include "mesh_common/vtk/VTKMeshWriter.h" +#include "mesh_common/vtk/CommonDataSources.h" #include "mesh/blockforest/BlockForestInitialization.h" #include "mesh/blockforest/BlockWorkloadMemory.h" #include "mesh/blockforest/BlockExclusion.h" #include "mesh/blockforest/RefinementSelection.h" -#include "mesh/distance_octree/DistanceOctree.h" #include "mesh/boundary/BoundarySetup.h" #include "mesh/boundary/BoundaryInfo.h" #include "mesh/boundary/BoundaryLocation.h" #include "mesh/boundary/BoundaryLocationFunction.h" #include "mesh/boundary/BoundaryUIDFaceDataSource.h" #include "mesh/boundary/ColorToBoundaryMapper.h" -#include "mesh/vtk/VTKMeshWriter.h" -#include "mesh/vtk/CommonDataSources.h" #include "stencil/D3Q19.h" diff --git a/apps/benchmarks/MeshDistance/MeshDistanceBenchmark.cpp b/apps/benchmarks/MeshDistance/MeshDistanceBenchmark.cpp index ec2212242..5d2f225f4 100644 --- a/apps/benchmarks/MeshDistance/MeshDistanceBenchmark.cpp +++ b/apps/benchmarks/MeshDistance/MeshDistanceBenchmark.cpp @@ -28,11 +28,11 @@ #include "geometry/mesh/TriangleMesh.h" #include "geometry/mesh/TriangleMeshIO.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/MeshOperations.h" -#include "mesh/DistanceComputations.h" -#include "mesh/distance_octree/DistanceOctree.h" -#include "mesh/MeshIO.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/distance_octree/DistanceOctree.h" +#include "mesh_common/MeshIO.h" #include <random> diff --git a/apps/tutorials/lbm/04_LBComplexGeometry.cpp b/apps/tutorials/lbm/04_LBComplexGeometry.cpp index fdab4509e..9b02de05a 100644 --- a/apps/tutorials/lbm/04_LBComplexGeometry.cpp +++ b/apps/tutorials/lbm/04_LBComplexGeometry.cpp @@ -33,12 +33,15 @@ #include "lbm/all.h" -#include "mesh/DistanceComputations.h" -#include "mesh/DistanceFunction.h" -#include "mesh/MatrixVectorOperations.h" -#include "mesh/MeshIO.h" -#include "mesh/MeshOperations.h" -#include "mesh/TriangleMeshes.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/DistanceFunction.h" +#include "mesh_common/MatrixVectorOperations.h" +#include "mesh_common/MeshIO.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/distance_octree/DistanceOctree.h" +#include "mesh_common/vtk/CommonDataSources.h" +#include "mesh_common/vtk/VTKMeshWriter.h" #include "mesh/blockforest/BlockExclusion.h" #include "mesh/blockforest/BlockForestInitialization.h" #include "mesh/boundary/BoundaryInfo.h" @@ -47,9 +50,6 @@ #include "mesh/boundary/BoundarySetup.h" #include "mesh/boundary/BoundaryUIDFaceDataSource.h" #include "mesh/boundary/ColorToBoundaryMapper.h" -#include "mesh/distance_octree/DistanceOctree.h" -#include "mesh/vtk/CommonDataSources.h" -#include "mesh/vtk/VTKMeshWriter.h" #include "timeloop/all.h" diff --git a/src/mesh/CMakeLists.txt b/src/mesh/CMakeLists.txt index b91e3a28b..87241c4af 100644 --- a/src/mesh/CMakeLists.txt +++ b/src/mesh/CMakeLists.txt @@ -5,6 +5,6 @@ ################################################################################################### waLBerla_add_module( DEPENDS blockforest boundary core domain_decomposition - python_coupling field geometry pe stencil vtk BUILD_ONLY_IF_FOUND OpenMesh ) + python_coupling field geometry pe stencil ../mesh_common/vtk mesa_pd mesh_common ) ################################################################################################### diff --git a/src/mesh/MeshConversion.h b/src/mesh/MeshConversion.h index af2fd73d6..99aba1e62 100644 --- a/src/mesh/MeshConversion.h +++ b/src/mesh/MeshConversion.h @@ -20,8 +20,8 @@ //====================================================================================================================== #pragma once -#include "TriangleMeshes.h" -#include "MatrixVectorOperations.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/MatrixVectorOperations.h" #include "geometry/mesh/TriangleMesh.h" diff --git a/src/mesh/blockforest/BlockExclusion.h b/src/mesh/blockforest/BlockExclusion.h index 03c4cadac..a15acfb85 100644 --- a/src/mesh/blockforest/BlockExclusion.h +++ b/src/mesh/blockforest/BlockExclusion.h @@ -21,7 +21,7 @@ #pragma once -#include "mesh/MeshOperations.h" +#include "mesh_common/MeshOperations.h" #include "blockforest/SetupBlockForest.h" diff --git a/src/mesh/blockforest/BlockForestInitialization.h b/src/mesh/blockforest/BlockForestInitialization.h index 1c39d1c2e..12e9a2e23 100644 --- a/src/mesh/blockforest/BlockForestInitialization.h +++ b/src/mesh/blockforest/BlockForestInitialization.h @@ -22,8 +22,8 @@ #pragma once #include "BlockExclusion.h" -#include "mesh/MeshOperations.h" -#include "mesh/distance_octree/DistanceOctree.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/distance_octree/DistanceOctree.h" #include "blockforest/StructuredBlockForest.h" #include "blockforest/SetupBlockForest.h" diff --git a/src/mesh/blockforest/RefinementSelection.h b/src/mesh/blockforest/RefinementSelection.h index 1055d203f..13bd0a3db 100644 --- a/src/mesh/blockforest/RefinementSelection.h +++ b/src/mesh/blockforest/RefinementSelection.h @@ -21,7 +21,7 @@ #pragma once -#include "mesh/MeshOperations.h" +#include "mesh_common/MeshOperations.h" #include "blockforest/SetupBlockForest.h" #include "blockforest/Types.h" diff --git a/src/mesh/boundary/BoundaryUIDFaceDataSource.h b/src/mesh/boundary/BoundaryUIDFaceDataSource.h index cdcbc0182..e3159c841 100644 --- a/src/mesh/boundary/BoundaryUIDFaceDataSource.h +++ b/src/mesh/boundary/BoundaryUIDFaceDataSource.h @@ -26,7 +26,7 @@ #include "core/DataTypes.h" #include "core/debug/CheckFunctions.h" -#include "mesh/vtk/VTKMeshWriter.h" +#include "mesh_common/vtk/VTKMeshWriter.h" namespace walberla { namespace mesh { diff --git a/src/mesh/mesh_module.dox b/src/mesh/mesh_module.dox index 2c83c8a50..830bfc633 100644 --- a/src/mesh/mesh_module.dox +++ b/src/mesh/mesh_module.dox @@ -25,6 +25,19 @@ namespace mesh { /** \defgroup mesh mesh - surface meshes in waLBerla +\section meshmodulelayout How is the mesh module laid out? + +More precisely, the mesh module consists of two modules - the mesh_common module, providing basic mesh support, and the mesh module, which includes +deep integration of meshes into waLBerla. Both operate in the same "mesh" namespace. + +\subsection mesh_common mesh_common - Essentials +The mesh_common module consists of an OpenMesh wrapper (detailed further down), VTK output, distance octree, +IO handling, arithmetic operations (i.e. calculation of inertia tensor), and MPI extensions. + +\subsection mesh mesh - waLBerla integrations +To enable the usage of meshes in certain parts of waLBerla, the more waLBerla-specific "mesh" module contains extensions +for the BlockForest, boundaries, the Physics engine, python and conversion to the waLBerla-own TriangleMesh geometry. + \section meshhandling How are meshes handled in the mesh module? \subsection openmesh OpenMesh diff --git a/src/mesh/pe/communication/ConvexPolyhedron.cpp b/src/mesh/pe/communication/ConvexPolyhedron.cpp index 1709c495f..e7b81879b 100644 --- a/src/mesh/pe/communication/ConvexPolyhedron.cpp +++ b/src/mesh/pe/communication/ConvexPolyhedron.cpp @@ -23,7 +23,7 @@ #include "core/mpi/BufferDataTypeExtensions.h" -#include "mesh/OpenMeshBufferTypeExtensions.h" +#include "mesh_common/OpenMeshBufferTypeExtensions.h" #include "pe/communication/Marshalling.h" diff --git a/src/mesh/pe/raytracing/Intersects.h b/src/mesh/pe/raytracing/Intersects.h index 52761d65e..f9c772ff4 100644 --- a/src/mesh/pe/raytracing/Intersects.h +++ b/src/mesh/pe/raytracing/Intersects.h @@ -20,9 +20,9 @@ #pragma once -#include <mesh/MatrixVectorOperations.h> +#include <mesh_common/MatrixVectorOperations.h> #include <mesh/pe/rigid_body/ConvexPolyhedron.h> -#include <mesh/TriangleMeshes.h> +#include <mesh_common/TriangleMeshes.h> #include <pe/raytracing/Intersects.h> namespace walberla { diff --git a/src/mesh/pe/rigid_body/ConvexPolyhedron.cpp b/src/mesh/pe/rigid_body/ConvexPolyhedron.cpp index 62ce1d1c5..ed500565e 100644 --- a/src/mesh/pe/rigid_body/ConvexPolyhedron.cpp +++ b/src/mesh/pe/rigid_body/ConvexPolyhedron.cpp @@ -27,8 +27,8 @@ #include "core/math/Matrix3.h" #include "core/debug/Debug.h" -#include "mesh/MeshOperations.h" -#include "mesh/QHull.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/QHull.h" #include "pe/Materials.h" diff --git a/src/mesh/pe/rigid_body/ConvexPolyhedron.h b/src/mesh/pe/rigid_body/ConvexPolyhedron.h index 10e6f62a7..fcd74b627 100644 --- a/src/mesh/pe/rigid_body/ConvexPolyhedron.h +++ b/src/mesh/pe/rigid_body/ConvexPolyhedron.h @@ -25,7 +25,7 @@ // Includes //************************************************************************************************* -#include "mesh/TriangleMeshes.h" +#include "mesh_common/TriangleMeshes.h" #include "mesh/pe/Types.h" #include "core/DataTypes.h" diff --git a/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.cpp b/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.cpp index 4229a58f1..eb8fdfa7c 100644 --- a/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.cpp +++ b/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.cpp @@ -27,9 +27,9 @@ #include "core/debug/Debug.h" #include "mesh/pe/rigid_body/ConvexPolyhedron.h" -#include "mesh/MeshOperations.h" -#include "mesh/QHull.h" -#include "mesh/TriangleMeshes.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/QHull.h" +#include "mesh_common/TriangleMeshes.h" #include <vector> diff --git a/src/mesh/pe/tesselation/Box.h b/src/mesh/pe/tesselation/Box.h index 242e52a92..1ac2182e4 100644 --- a/src/mesh/pe/tesselation/Box.h +++ b/src/mesh/pe/tesselation/Box.h @@ -21,7 +21,7 @@ #pragma once -#include "mesh/MatrixVectorOperations.h" +#include "mesh_common/MatrixVectorOperations.h" #include "pe/rigidbody/Box.h" diff --git a/src/mesh/pe/tesselation/ConvexPolyhedron.h b/src/mesh/pe/tesselation/ConvexPolyhedron.h index 1d8a44b97..347eebbba 100644 --- a/src/mesh/pe/tesselation/ConvexPolyhedron.h +++ b/src/mesh/pe/tesselation/ConvexPolyhedron.h @@ -22,8 +22,8 @@ #pragma once #include "mesh/pe/rigid_body/ConvexPolyhedron.h" -#include "mesh/MatrixVectorOperations.h" -#include "mesh/TriangleMeshes.h" +#include "mesh_common/MatrixVectorOperations.h" +#include "mesh_common/TriangleMeshes.h" namespace walberla { namespace mesh { diff --git a/src/mesh/pe/vtk/CommonDataSources.h b/src/mesh/pe/vtk/CommonDataSources.h index bf86f2cdd..0cdb62a23 100644 --- a/src/mesh/pe/vtk/CommonDataSources.h +++ b/src/mesh/pe/vtk/CommonDataSources.h @@ -26,7 +26,7 @@ #include "core/debug/CheckFunctions.h" #include "core/mpi/MPIManager.h" -#include "mesh/MatrixVectorOperations.h" +#include "mesh_common/MatrixVectorOperations.h" #include <OpenMesh/Core/Mesh/Status.hh> diff --git a/src/mesh/pe/vtk/PeVTKMeshWriter.h b/src/mesh/pe/vtk/PeVTKMeshWriter.h index 72685c362..9c414c8b9 100644 --- a/src/mesh/pe/vtk/PeVTKMeshWriter.h +++ b/src/mesh/pe/vtk/PeVTKMeshWriter.h @@ -25,8 +25,8 @@ #include "domain_decomposition/BlockStorage.h" -#include "mesh/vtk/DistributedVTKMeshWriter.h" -#include "mesh/vtk/CommonDataSources.h" +#include "mesh_common/vtk/DistributedVTKMeshWriter.h" +#include "mesh_common/vtk/CommonDataSources.h" #include "pe/rigidbody/BodyStorage.h" #include "pe/rigidbody/RigidBody.h" diff --git a/src/mesh/python/Exports.impl.h b/src/mesh/python/Exports.impl.h index 7b1fcba05..4c68eb850 100644 --- a/src/mesh/python/Exports.impl.h +++ b/src/mesh/python/Exports.impl.h @@ -44,14 +44,14 @@ # pragma warning( pop ) #endif -#include "mesh/MeshIO.h" -#include "mesh/distance_octree/DistanceOctree.h" -#include "mesh/DistanceComputations.h" -#include "mesh/DistanceFunction.h" -#include "mesh/MeshOperations.h" -#include "mesh/TriangleMeshes.h" +#include "mesh_common/MeshIO.h" +#include "mesh_common/distance_octree/DistanceOctree.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/DistanceFunction.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/TriangleMeshes.h" #include "mesh/boundary/BoundarySetup.h" -#include "mesh/vtk/VTKMeshWriter.h" +#include "mesh_common/vtk/VTKMeshWriter.h" using namespace boost::python; diff --git a/src/mesh_common/CMakeLists.txt b/src/mesh_common/CMakeLists.txt new file mode 100644 index 000000000..de3b9e33c --- /dev/null +++ b/src/mesh_common/CMakeLists.txt @@ -0,0 +1,9 @@ +################################################################################################### +# +# Module mesh_common +# +################################################################################################### + +waLBerla_add_module( DEPENDS core vtk BUILD_ONLY_IF_FOUND OpenMesh ) + +################################################################################################### diff --git a/src/mesh/DistanceComputations.h b/src/mesh_common/DistanceComputations.h similarity index 99% rename from src/mesh/DistanceComputations.h rename to src/mesh_common/DistanceComputations.h index 6df23c078..997546f1e 100644 --- a/src/mesh/DistanceComputations.h +++ b/src/mesh_common/DistanceComputations.h @@ -26,8 +26,8 @@ #include "core/math/GenericAABB.h" #include "core/math/Matrix3.h" -#include "mesh/MatrixVectorOperations.h" -#include "mesh/TriangleMeshes.h" +#include "mesh_common/MatrixVectorOperations.h" +#include "mesh_common/TriangleMeshes.h" #include <OpenMesh/Core/Utils/PropertyManager.hh> @@ -200,8 +200,8 @@ protected: template< typename MeshType > void TriangleDistance<MeshType>::computeNormals() { - // J. Bærentzen and H. Aanæs. Signed distance computation using the angle weighted pseudonormal. - // Visualization and Computer Graphics, IEEE Transactions on, 11(3):243–253, 2005. + // J. B�rentzen and H. Aan�s. Signed distance computation using the angle weighted pseudonormal. + // Visualization and Computer Graphics, IEEE Transactions on, 11(3):243�253, 2005. static_assert( MeshType::IsTriMesh == 1, "computeNormals only works with triangular meshes!" ); diff --git a/src/mesh/DistanceFunction.h b/src/mesh_common/DistanceFunction.h similarity index 97% rename from src/mesh/DistanceFunction.h rename to src/mesh_common/DistanceFunction.h index 3ad98451c..86691cdf4 100644 --- a/src/mesh/DistanceFunction.h +++ b/src/mesh_common/DistanceFunction.h @@ -21,7 +21,7 @@ //====================================================================================================================== #include "core/math/Vector3.h" -#include "mesh/MatrixVectorOperations.h" +#include "mesh_common/MatrixVectorOperations.h" namespace walberla { diff --git a/src/mesh/MatrixVectorOperations.h b/src/mesh_common/MatrixVectorOperations.h similarity index 100% rename from src/mesh/MatrixVectorOperations.h rename to src/mesh_common/MatrixVectorOperations.h diff --git a/src/mesh/MeshIO.h b/src/mesh_common/MeshIO.h similarity index 100% rename from src/mesh/MeshIO.h rename to src/mesh_common/MeshIO.h diff --git a/src/mesh/MeshOperations.h b/src/mesh_common/MeshOperations.h similarity index 99% rename from src/mesh/MeshOperations.h rename to src/mesh_common/MeshOperations.h index 03a00f219..d659d0d48 100644 --- a/src/mesh/MeshOperations.h +++ b/src/mesh_common/MeshOperations.h @@ -22,7 +22,7 @@ #pragma once #include "MatrixVectorOperations.h" -#include "TriangleMeshes.h" +#include "mesh_common/TriangleMeshes.h" #include "core/math/GenericAABB.h" #include "core/Optional.h" diff --git a/src/mesh/OpenMeshBufferTypeExtensions.h b/src/mesh_common/OpenMeshBufferTypeExtensions.h similarity index 100% rename from src/mesh/OpenMeshBufferTypeExtensions.h rename to src/mesh_common/OpenMeshBufferTypeExtensions.h diff --git a/src/mesh/PolyMeshes.h b/src/mesh_common/PolyMeshes.h similarity index 97% rename from src/mesh/PolyMeshes.h rename to src/mesh_common/PolyMeshes.h index 414320e32..dc2e1f3f7 100644 --- a/src/mesh/PolyMeshes.h +++ b/src/mesh_common/PolyMeshes.h @@ -21,7 +21,7 @@ #pragma once -#include "TriangleMeshes.h" +#include "mesh_common/TriangleMeshes.h" #include <OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh> diff --git a/src/mesh/QHull.h b/src/mesh_common/QHull.h similarity index 98% rename from src/mesh/QHull.h rename to src/mesh_common/QHull.h index 81c4d0b09..160d3e8a0 100644 --- a/src/mesh/QHull.h +++ b/src/mesh_common/QHull.h @@ -24,10 +24,10 @@ #include "core/DataTypes.h" #include "core/math/Vector3.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/MatrixVectorOperations.h" -#include "mesh/vtk/VTKMeshWriter.h" -#include "mesh/vtk/CommonDataSources.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/MatrixVectorOperations.h" +#include "mesh_common/vtk/VTKMeshWriter.h" +#include "mesh_common/vtk/CommonDataSources.h" #include "vtk/VTKOutput.h" #include "vtk/PointDataSource.h" diff --git a/src/mesh/TriangleMeshes.h b/src/mesh_common/TriangleMeshes.h similarity index 100% rename from src/mesh/TriangleMeshes.h rename to src/mesh_common/TriangleMeshes.h diff --git a/src/mesh/distance_octree/BranchNode.h b/src/mesh_common/distance_octree/BranchNode.h similarity index 99% rename from src/mesh/distance_octree/BranchNode.h rename to src/mesh_common/distance_octree/BranchNode.h index 90004dd73..cf2c2b192 100644 --- a/src/mesh/distance_octree/BranchNode.h +++ b/src/mesh_common/distance_octree/BranchNode.h @@ -25,9 +25,9 @@ #include "core/debug/Debug.h" -#include "mesh/DistanceComputations.h" -#include "mesh/MatrixVectorOperations.h" -#include "mesh/MeshOperations.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/MatrixVectorOperations.h" +#include "mesh_common/MeshOperations.h" #include <algorithm> #include <iterator> diff --git a/src/mesh/distance_octree/DistanceOctree.h b/src/mesh_common/distance_octree/DistanceOctree.h similarity index 99% rename from src/mesh/distance_octree/DistanceOctree.h rename to src/mesh_common/distance_octree/DistanceOctree.h index 4a0a8fd6d..2c34b9c6c 100644 --- a/src/mesh/distance_octree/DistanceOctree.h +++ b/src/mesh_common/distance_octree/DistanceOctree.h @@ -25,7 +25,7 @@ #include "LeafNode.h" #include "BranchNode.h" -#include "mesh/DistanceComputations.h" +#include "mesh_common/DistanceComputations.h" #include "core/DataTypes.h" #include "core/Abort.h" diff --git a/src/mesh/distance_octree/LeafNode.h b/src/mesh_common/distance_octree/LeafNode.h similarity index 99% rename from src/mesh/distance_octree/LeafNode.h rename to src/mesh_common/distance_octree/LeafNode.h index fc18d2567..c5a652775 100644 --- a/src/mesh/distance_octree/LeafNode.h +++ b/src/mesh_common/distance_octree/LeafNode.h @@ -23,7 +23,7 @@ #include "Node.h" -#include "mesh/DistanceComputations.h" +#include "mesh_common/DistanceComputations.h" namespace walberla { namespace mesh { diff --git a/src/mesh/distance_octree/Node.h b/src/mesh_common/distance_octree/Node.h similarity index 98% rename from src/mesh/distance_octree/Node.h rename to src/mesh_common/distance_octree/Node.h index 6a7b918da..5ba5f4ee0 100644 --- a/src/mesh/distance_octree/Node.h +++ b/src/mesh_common/distance_octree/Node.h @@ -23,7 +23,7 @@ #include "core/math/GenericAABB.h" -#include "mesh/MeshOperations.h" +#include "mesh_common/MeshOperations.h" namespace walberla { namespace mesh { diff --git a/src/mesh/vtk/CommonDataSources.h b/src/mesh_common/vtk/CommonDataSources.h similarity index 100% rename from src/mesh/vtk/CommonDataSources.h rename to src/mesh_common/vtk/CommonDataSources.h diff --git a/src/mesh/vtk/CommonFilters.h b/src/mesh_common/vtk/CommonFilters.h similarity index 100% rename from src/mesh/vtk/CommonFilters.h rename to src/mesh_common/vtk/CommonFilters.h diff --git a/src/mesh/vtk/DistributedVTKMeshWriter.h b/src/mesh_common/vtk/DistributedVTKMeshWriter.h similarity index 100% rename from src/mesh/vtk/DistributedVTKMeshWriter.h rename to src/mesh_common/vtk/DistributedVTKMeshWriter.h diff --git a/src/mesh/vtk/VTKMeshWriter.h b/src/mesh_common/vtk/VTKMeshWriter.h similarity index 99% rename from src/mesh/vtk/VTKMeshWriter.h rename to src/mesh_common/vtk/VTKMeshWriter.h index 129c456a1..1cbac3eed 100644 --- a/src/mesh/vtk/VTKMeshWriter.h +++ b/src/mesh_common/vtk/VTKMeshWriter.h @@ -21,7 +21,7 @@ #pragma once -#include "mesh/MeshOperations.h" +#include "mesh_common/MeshOperations.h" #include "core/math/Vector3.h" #include "core/mpi/MPIManager.h" diff --git a/tests/mesh/DistributedMeshVTKTest.cpp b/tests/mesh/DistributedMeshVTKTest.cpp index e69aad05e..ac3e1cc28 100644 --- a/tests/mesh/DistributedMeshVTKTest.cpp +++ b/tests/mesh/DistributedMeshVTKTest.cpp @@ -23,12 +23,12 @@ #include "core/logging/Logging.h" #include "core/mpi/Environment.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/MeshOperations.h" -#include "mesh/MeshIO.h" -#include "mesh/vtk/DistributedVTKMeshWriter.h" -#include "mesh/vtk/CommonDataSources.h" -#include "mesh/vtk/CommonFilters.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/MeshIO.h" +#include "mesh_common/vtk/DistributedVTKMeshWriter.h" +#include "mesh_common/vtk/CommonDataSources.h" +#include "mesh_common/vtk/CommonFilters.h" namespace walberla { diff --git a/tests/mesh/MatrixVectorOperationsTest.cpp b/tests/mesh/MatrixVectorOperationsTest.cpp index 6c9ae6977..d7b7ced1c 100644 --- a/tests/mesh/MatrixVectorOperationsTest.cpp +++ b/tests/mesh/MatrixVectorOperationsTest.cpp @@ -22,7 +22,7 @@ #include "core/debug/TestSubsystem.h" #include "core/mpi/Environment.h" -#include "mesh/MatrixVectorOperations.h" +#include "mesh_common/MatrixVectorOperations.h" namespace walberla { namespace mesh { diff --git a/tests/mesh/MeshAABBIntersectionTest.cpp b/tests/mesh/MeshAABBIntersectionTest.cpp index 2ae15e994..45f38ecc6 100644 --- a/tests/mesh/MeshAABBIntersectionTest.cpp +++ b/tests/mesh/MeshAABBIntersectionTest.cpp @@ -25,10 +25,10 @@ #include "core/mpi/Environment.h" #include "core/Optional.h" -#include "mesh/MeshIO.h" -#include "mesh/MeshOperations.h" -#include "mesh/DistanceComputations.h" -#include "mesh/TriangleMeshes.h" +#include "mesh_common/MeshIO.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/TriangleMeshes.h" #include <random> diff --git a/tests/mesh/MeshAABBSelectionTest.cpp b/tests/mesh/MeshAABBSelectionTest.cpp index df5b67b53..94bdad9a2 100644 --- a/tests/mesh/MeshAABBSelectionTest.cpp +++ b/tests/mesh/MeshAABBSelectionTest.cpp @@ -26,10 +26,10 @@ #include "geometry/mesh/TriangleMesh.h" #include "geometry/mesh/TriangleMeshIO.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/DistanceComputations.h" -#include "mesh/MeshIO.h" -#include "mesh/MeshOperations.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/MeshIO.h" +#include "mesh_common/MeshOperations.h" #include <random> diff --git a/tests/mesh/MeshBlockExclusionTest.cpp b/tests/mesh/MeshBlockExclusionTest.cpp index 996fdb877..d3cb21efb 100644 --- a/tests/mesh/MeshBlockExclusionTest.cpp +++ b/tests/mesh/MeshBlockExclusionTest.cpp @@ -30,14 +30,14 @@ #include "geometry/mesh/TriangleMesh.h" #include "geometry/mesh/TriangleMeshIO.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/MeshOperations.h" -#include "mesh/DistanceComputations.h" -#include "mesh/MeshIO.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/MeshIO.h" #include "mesh/blockforest/BlockExclusion.h" -#include "mesh/distance_octree/DistanceOctree.h" +#include "mesh_common/distance_octree/DistanceOctree.h" #include <vector> #include <string> diff --git a/tests/mesh/MeshContainmentOctreeTest.cpp b/tests/mesh/MeshContainmentOctreeTest.cpp index 40f542ddb..ff656b25a 100644 --- a/tests/mesh/MeshContainmentOctreeTest.cpp +++ b/tests/mesh/MeshContainmentOctreeTest.cpp @@ -27,13 +27,13 @@ #include "geometry/mesh/TriangleMesh.h" #include "geometry/mesh/TriangleMeshIO.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/MeshOperations.h" -#include "mesh/DistanceComputations.h" -#include "mesh/MeshIO.h" -#include "mesh/distance_octree/DistanceOctree.h" -#include "mesh/vtk/VTKMeshWriter.h" -#include "mesh/vtk/CommonDataSources.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/MeshIO.h" +#include "mesh_common/distance_octree/DistanceOctree.h" +#include "mesh_common/vtk/VTKMeshWriter.h" +#include "mesh_common/vtk/CommonDataSources.h" #include <random> diff --git a/tests/mesh/MeshConversionTest.cpp b/tests/mesh/MeshConversionTest.cpp index 718f46f75..38f0bcca1 100644 --- a/tests/mesh/MeshConversionTest.cpp +++ b/tests/mesh/MeshConversionTest.cpp @@ -26,7 +26,7 @@ #include "geometry/mesh/TriangleMeshIO.h" #include "mesh/MeshConversion.h" -#include "mesh/MeshIO.h" +#include "mesh_common/MeshIO.h" namespace walberla { namespace mesh { diff --git a/tests/mesh/MeshDistanceCompareTest.cpp b/tests/mesh/MeshDistanceCompareTest.cpp index 4067a28e8..d565f87ca 100644 --- a/tests/mesh/MeshDistanceCompareTest.cpp +++ b/tests/mesh/MeshDistanceCompareTest.cpp @@ -27,10 +27,10 @@ #include "geometry/mesh/TriangleMesh.h" #include "geometry/mesh/TriangleMeshIO.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/MeshOperations.h" -#include "mesh/DistanceComputations.h" -#include "mesh/MeshIO.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/MeshIO.h" #include <random> diff --git a/tests/mesh/MeshDistanceOctreeTest.cpp b/tests/mesh/MeshDistanceOctreeTest.cpp index 3d849c3f6..00e597faf 100644 --- a/tests/mesh/MeshDistanceOctreeTest.cpp +++ b/tests/mesh/MeshDistanceOctreeTest.cpp @@ -26,11 +26,11 @@ #include "geometry/mesh/TriangleMesh.h" #include "geometry/mesh/TriangleMeshIO.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/MeshOperations.h" -#include "mesh/DistanceComputations.h" -#include "mesh/distance_octree/DistanceOctree.h" -#include "mesh/MeshIO.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/distance_octree/DistanceOctree.h" +#include "mesh_common/MeshIO.h" #include <random> diff --git a/tests/mesh/MeshDistancePlausibilityTest.cpp b/tests/mesh/MeshDistancePlausibilityTest.cpp index e0fd1a276..8b7ccb585 100644 --- a/tests/mesh/MeshDistancePlausibilityTest.cpp +++ b/tests/mesh/MeshDistancePlausibilityTest.cpp @@ -33,14 +33,14 @@ #include "geometry/mesh/TriangleMesh.h" #include "geometry/mesh/TriangleMeshIO.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/MeshOperations.h" -#include "mesh/DistanceComputations.h" -#include "mesh/distance_octree/DistanceOctree.h" -#include "mesh/MeshIO.h" -#include "mesh/vtk/VTKMeshWriter.h" -#include "mesh/vtk/CommonDataSources.h" -#include "mesh/vtk/CommonFilters.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/distance_octree/DistanceOctree.h" +#include "mesh_common/MeshIO.h" +#include "mesh_common/vtk/VTKMeshWriter.h" +#include "mesh_common/vtk/CommonDataSources.h" +#include "mesh_common/vtk/CommonFilters.h" #include "stencil/D3Q27.h" diff --git a/tests/mesh/MeshInitilizationTest.cpp b/tests/mesh/MeshInitilizationTest.cpp index 7deeee253..e3460d3ce 100644 --- a/tests/mesh/MeshInitilizationTest.cpp +++ b/tests/mesh/MeshInitilizationTest.cpp @@ -31,17 +31,17 @@ #include "geometry/mesh/TriangleMesh.h" #include "geometry/mesh/TriangleMeshIO.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/MeshOperations.h" -#include "mesh/DistanceComputations.h" -#include "mesh/MeshIO.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/MeshIO.h" #include "mesh/blockforest/BlockForestInitialization.h" #include "mesh/blockforest/BlockWorkloadMemory.h" #include "mesh/blockforest/BlockExclusion.h" #include "mesh/blockforest/RefinementSelection.h" -#include "mesh/distance_octree/DistanceOctree.h" +#include "mesh_common/distance_octree/DistanceOctree.h" #include <cmath> #include <vector> diff --git a/tests/mesh/MeshMarshalling.cpp b/tests/mesh/MeshMarshalling.cpp index cc62c6a63..53977eb96 100644 --- a/tests/mesh/MeshMarshalling.cpp +++ b/tests/mesh/MeshMarshalling.cpp @@ -22,8 +22,8 @@ #include "mesh/pe/rigid_body/ConvexPolyhedron.h" #include "mesh/pe/rigid_body/ConvexPolyhedronFactory.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/QHull.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/QHull.h" #include "mesh/pe/Types.h" #include "pe/rigidbody/Squirmer.h" #include "pe/rigidbody/UnionFactory.h" diff --git a/tests/mesh/MeshOperationsTest.cpp b/tests/mesh/MeshOperationsTest.cpp index 91af5d0bf..6cceae10e 100644 --- a/tests/mesh/MeshOperationsTest.cpp +++ b/tests/mesh/MeshOperationsTest.cpp @@ -31,11 +31,11 @@ #include "geometry/mesh/TriangleMesh.h" #include "geometry/mesh/TriangleMeshIO.h" -#include "mesh/MeshOperations.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/DistanceComputations.h" -#include "mesh/MeshIO.h" -#include "mesh/distance_octree/DistanceOctree.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/MeshIO.h" +#include "mesh_common/distance_octree/DistanceOctree.h" namespace walberla { diff --git a/tests/mesh/MeshPeRaytracing.cpp b/tests/mesh/MeshPeRaytracing.cpp index 038c78a34..e1cdc6598 100644 --- a/tests/mesh/MeshPeRaytracing.cpp +++ b/tests/mesh/MeshPeRaytracing.cpp @@ -26,7 +26,7 @@ #include <core/math/Vector3.h> #include <mesh/pe/raytracing/Intersects.h> #include <mesh/pe/rigid_body/ConvexPolyhedron.h> -#include <mesh/QHull.h> +#include <mesh_common/QHull.h> #include <pe/Materials.h> #include <pe/raytracing/Intersects.h> #include <pe/rigidbody/Box.h> diff --git a/tests/mesh/MeshVTKTest.cpp b/tests/mesh/MeshVTKTest.cpp index ce69aa0df..c602adc9d 100644 --- a/tests/mesh/MeshVTKTest.cpp +++ b/tests/mesh/MeshVTKTest.cpp @@ -23,12 +23,12 @@ #include "core/logging/Logging.h" #include "core/mpi/Environment.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/MeshOperations.h" -#include "mesh/MeshIO.h" -#include "mesh/vtk/VTKMeshWriter.h" -#include "mesh/vtk/CommonDataSources.h" -#include "mesh/vtk/CommonFilters.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/MeshIO.h" +#include "mesh_common/vtk/VTKMeshWriter.h" +#include "mesh_common/vtk/CommonDataSources.h" +#include "mesh_common/vtk/CommonFilters.h" #include <vector> #include <string> diff --git a/tests/mesh/NumericIntegrationTest.cpp b/tests/mesh/NumericIntegrationTest.cpp index fe706b743..7f393ee0c 100644 --- a/tests/mesh/NumericIntegrationTest.cpp +++ b/tests/mesh/NumericIntegrationTest.cpp @@ -31,11 +31,11 @@ #include "geometry/mesh/TriangleMesh.h" #include "geometry/mesh/TriangleMeshIO.h" -#include "mesh/MeshOperations.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/DistanceComputations.h" -#include "mesh/MeshIO.h" -#include "mesh/distance_octree/DistanceOctree.h" +#include "mesh_common/MeshOperations.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/DistanceComputations.h" +#include "mesh_common/MeshIO.h" +#include "mesh_common/distance_octree/DistanceOctree.h" namespace walberla { diff --git a/tests/mesh/OpenMeshBufferTypeExtensionsTest.cpp b/tests/mesh/OpenMeshBufferTypeExtensionsTest.cpp index 69bde20ba..06b9b25e8 100644 --- a/tests/mesh/OpenMeshBufferTypeExtensionsTest.cpp +++ b/tests/mesh/OpenMeshBufferTypeExtensionsTest.cpp @@ -24,7 +24,7 @@ #include "core/mpi/SendBuffer.h" #include "core/mpi/RecvBuffer.h" -#include "mesh/OpenMeshBufferTypeExtensions.h" +#include "mesh_common/OpenMeshBufferTypeExtensions.h" #include <OpenMesh/Core/Mesh/Handles.hh> #include <OpenMesh/Core/Geometry/VectorT.hh> diff --git a/tests/mesh/PeVTKMeshWriterTest.cpp b/tests/mesh/PeVTKMeshWriterTest.cpp index 7e7b26e13..07a288a53 100644 --- a/tests/mesh/PeVTKMeshWriterTest.cpp +++ b/tests/mesh/PeVTKMeshWriterTest.cpp @@ -29,7 +29,7 @@ #include <mesh/pe/DefaultTesselation.h> #include <mesh/pe/rigid_body/ConvexPolyhedronFactory.h> #include <mesh/pe/communication/ConvexPolyhedron.h> -#include <mesh/PolyMeshes.h> +#include <mesh_common/PolyMeshes.h> #include <blockforest/Initialization.h> #include <core/Abort.h> diff --git a/tests/mesh/QHullTest.cpp b/tests/mesh/QHullTest.cpp index 5e17b97e8..f78677d80 100644 --- a/tests/mesh/QHullTest.cpp +++ b/tests/mesh/QHullTest.cpp @@ -26,10 +26,10 @@ #include "core/math/Constants.h" #include "core/math/Utility.h" -#include "mesh/TriangleMeshes.h" -#include "mesh/QHull.h" -#include "mesh/vtk/VTKMeshWriter.h" -#include "mesh/vtk/CommonDataSources.h" +#include "mesh_common/TriangleMeshes.h" +#include "mesh_common/QHull.h" +#include "mesh_common/vtk/VTKMeshWriter.h" +#include "mesh_common/vtk/CommonDataSources.h" #include "vtk/VTKOutput.h" #include "vtk/PointDataSource.h" -- GitLab