From 5d1c6cabf949a99374db2a2a4c5632d5e39069b2 Mon Sep 17 00:00:00 2001
From: Nils Kohl <nils.kohl@fau.de>
Date: Fri, 5 Apr 2019 16:24:17 +0200
Subject: [PATCH] Adapted tribool to optional API change in BlockExclusion.h
---
src/mesh/blockforest/BlockExclusion.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mesh/blockforest/BlockExclusion.h b/src/mesh/blockforest/BlockExclusion.h
index 277670ab9..03c4cadac 100644
--- a/src/mesh/blockforest/BlockExclusion.h
+++ b/src/mesh/blockforest/BlockExclusion.h
@@ -103,7 +103,8 @@ void walberla::mesh::ExcludeMeshExterior<DistanceObject>::operator()( std::vecto
for( int i = chunkBegin; i < chunkEnd; ++i )
{
size_t is = numeric_cast<size_t>( i );
- if( !isIntersecting( *distanceObject_, aabb( shuffle[is] ), maxError_ ) )
+ auto intersectionDefined = isIntersecting( *distanceObject_, aabb( shuffle[is] ), maxError_ );
+ if( intersectionDefined && !intersectionDefined.value() )
excludeBlock[ shuffle[is] ] = uint8_t( 1 );
}
@@ -143,7 +144,8 @@ void walberla::mesh::ExcludeMeshInterior<DistanceObject>::operator()( std::vecto
for( int i = chunkBegin; i < chunkEnd; ++i )
{
size_t is = numeric_cast<size_t>( i );
- if( fullyCoversAABB( *distanceObject_, aabb( shuffle[is] ), maxError_ ) )
+ auto fullCoveringAABBDefined = fullyCoversAABB( *distanceObject_, aabb( shuffle[is] ), maxError_ );
+ if( fullCoveringAABBDefined && fullCoveringAABBDefined.value() )
excludeBlock[ shuffle[is] ] = uint8_t( 1 );
}
--
GitLab