From aa1e27f7f34147f4559babc318f87ee64034598f Mon Sep 17 00:00:00 2001
From: Daniel Bauer <daniel.j.bauer@fau.de>
Date: Mon, 4 Apr 2022 14:41:39 +0200
Subject: [PATCH] add missing include
---
src/geometry/initializer/BoundaryFromMesh.h | 4 ++--
src/geometry/initializer/BoundaryFromMesh.impl.h | 15 +++++++--------
src/mesh/boundary/ColorToBoundaryMapper.h | 1 +
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/geometry/initializer/BoundaryFromMesh.h b/src/geometry/initializer/BoundaryFromMesh.h
index e0060d328..858ba0389 100644
--- a/src/geometry/initializer/BoundaryFromMesh.h
+++ b/src/geometry/initializer/BoundaryFromMesh.h
@@ -64,8 +64,8 @@ public:
shared_ptr<mesh::DistanceOctree<Mesh_T>> distanceOctree,
const uint_t numGhostLayers );
- void init( mesh::ColorToBoundaryMapper<Mesh_T> & colorToBoundaryMapper,
- FlagUID fluidFlagID );
+ void init( const mesh::ColorToBoundaryMapper<Mesh_T> & colorToBoundaryMapper,
+ const FlagUID fluidFlagID );
void init( BlockStorage & blockStorage, const Config::BlockHandle & blockHandle ) override;
diff --git a/src/geometry/initializer/BoundaryFromMesh.impl.h b/src/geometry/initializer/BoundaryFromMesh.impl.h
index 977aeef23..58dffdb8d 100644
--- a/src/geometry/initializer/BoundaryFromMesh.impl.h
+++ b/src/geometry/initializer/BoundaryFromMesh.impl.h
@@ -32,7 +32,6 @@ namespace initializer {
namespace internal {
-// TODO: move this to central place
//**********************************************************************************************************************
/*! A small helper class that makes it possible to use mesh::boundary::BoundarySetup
* to operate directly on the flag field instead of on a boundary handling.
@@ -141,18 +140,18 @@ BoundaryFromMesh<FlagField_T, Mesh_T>::BoundaryFromMesh(
//*******************************************************************************************************************
template<typename FlagField_T, typename Mesh_T>
void BoundaryFromMesh<FlagField_T, Mesh_T>::init(
- mesh::ColorToBoundaryMapper<Mesh_T> & colorToBoundaryMapper,
- FlagUID fluidFlagID )
+ const mesh::ColorToBoundaryMapper<Mesh_T> & colorToBoundaryMapper,
+ const FlagUID fluidFlagID )
{
using namespace internal;
- boundarySetup_.setFlag<FlagField_T>(flagFieldID_, fluidFlagID, mesh::BoundarySetup::OUTSIDE);
+ boundarySetup_.setFlag<FlagField_T>( flagFieldID_, fluidFlagID, mesh::BoundarySetup::OUTSIDE );
- boundaryLocation_ = colorToBoundaryMapper.addBoundaryInfoToMesh(*mesh_);
+ boundaryLocation_ = colorToBoundaryMapper.addBoundaryInfoToMesh( *mesh_ );
boundarySetup_.setBoundaries<FlagFieldBoundaryHandling<FlagField_T>>(
flagFieldBoundarHandlingID_,
- makeBoundaryLocationFunction(distanceOctree_, boundaryLocation_),
+ makeBoundaryLocationFunction( distanceOctree_, boundaryLocation_ ),
mesh::BoundarySetup::INSIDE );
}
@@ -160,8 +159,8 @@ template<typename FlagField_T, typename Mesh_T>
void BoundaryFromMesh<FlagField_T, Mesh_T>::init(
BlockStorage &, const Config::BlockHandle & blockHandle )
{
- mesh::ColorToBoundaryMapper< Mesh_T > colorToBoundaryMapper{ blockHandle.getBlock( "ColorToBoundaryMapper") };
- FlagUID fluidFlag = FlagUID{ blockHandle.getParameter< std::string >( "fluidFlag") };
+ mesh::ColorToBoundaryMapper< Mesh_T > colorToBoundaryMapper{ blockHandle.getBlock( "ColorToBoundaryMapper" ) };
+ FlagUID fluidFlag = FlagUID{ blockHandle.getParameter< std::string >( "fluidFlag" ) };
init( colorToBoundaryMapper, fluidFlag );
}
diff --git a/src/mesh/boundary/ColorToBoundaryMapper.h b/src/mesh/boundary/ColorToBoundaryMapper.h
index c6ba36e6f..4731a67fd 100644
--- a/src/mesh/boundary/ColorToBoundaryMapper.h
+++ b/src/mesh/boundary/ColorToBoundaryMapper.h
@@ -26,6 +26,7 @@
#include "core/config/Config.h"
#include "core/DataTypes.h"
#include "core/debug/CheckFunctions.h"
+#include "core/math/Vector3.h"
#include <map>
--
GitLab