Skip to content
Snippets Groups Projects
Commit f46102c6 authored by Christian Godenschwager's avatar Christian Godenschwager
Browse files

Fixed clang warnings

parent c02ef4d8
No related merge requests found
...@@ -98,13 +98,14 @@ inline void walberla::mesh::RefinementSelection<DistanceObject>::operator()( blo ...@@ -98,13 +98,14 @@ inline void walberla::mesh::RefinementSelection<DistanceObject>::operator()( blo
#endif #endif
for( int i = chunkBegin; i < chunkEnd; ++i ) for( int i = chunkBegin; i < chunkEnd; ++i )
{ {
const uint_t blockLevel = blocks[ shuffle[i] ]->getLevel(); const size_t ii = numeric_cast<size_t>( i );
const uint_t blockLevel = blocks[ shuffle[ii] ]->getLevel();
if( blockLevel >= level_ ) if( blockLevel >= level_ )
continue; continue;
boost::tribool intersects = intersectsSurface( *distanceObject_, blocks[ shuffle[i] ]->getAABB(), maxError_, distance_ ); boost::tribool intersects = intersectsSurface( *distanceObject_, blocks[ shuffle[ii] ]->getAABB(), maxError_, distance_ );
if( indeterminate( intersects ) || intersects ) if( indeterminate( intersects ) || intersects )
refine[ shuffle[ i ] ] = uint8_t( 1 ); refine[ shuffle[ ii ] ] = uint8_t( 1 );
} }
allReduceInplace( refine, mpi::LOGICAL_OR ); allReduceInplace( refine, mpi::LOGICAL_OR );
......
...@@ -70,7 +70,7 @@ Plane< typename MeshType::Scalar > splitFaces( const MeshType & mesh, InputItera ...@@ -70,7 +70,7 @@ Plane< typename MeshType::Scalar > splitFaces( const MeshType & mesh, InputItera
const Point direction = principalComponent( mesh, faceHandlesBegin, faceHandlesEnd, uint_t(10) ); const Point direction = principalComponent( mesh, faceHandlesBegin, faceHandlesEnd, uint_t(10) );
std::vector< Face<MeshType> > faces; std::vector< Face<MeshType> > faces;
faces.reserve( std::distance( faceHandlesBegin, faceHandlesEnd ) ); faces.reserve( numeric_cast<size_t>( std::distance( faceHandlesBegin, faceHandlesEnd ) ) );
for( auto it = faceHandlesBegin; it != faceHandlesEnd; ++it ) for( auto it = faceHandlesBegin; it != faceHandlesEnd; ++it )
faces.push_back( Face<MeshType>( mesh, *it, direction ) ); faces.push_back( Face<MeshType>( mesh, *it, direction ) );
...@@ -87,8 +87,8 @@ Plane< typename MeshType::Scalar > splitFaces( const MeshType & mesh, InputItera ...@@ -87,8 +87,8 @@ Plane< typename MeshType::Scalar > splitFaces( const MeshType & mesh, InputItera
for( ; splitElement != faces.end() && splitElement->d() <= d ; ++splitElement ) for( ; splitElement != faces.end() && splitElement->d() <= d ; ++splitElement )
; // empty body ; // empty body
lowerHalfSpaceFaces.resize( std::distance( faces.begin(), splitElement ) ); lowerHalfSpaceFaces.resize( numeric_cast<size_t>( std::distance( faces.begin(), splitElement ) ) );
upperHalfSpaceFaces.resize( std::distance( splitElement, faces.end() ) ); upperHalfSpaceFaces.resize( numeric_cast<size_t>( std::distance( splitElement, faces.end() ) ) );
std::transform( faces.begin(), splitElement, lowerHalfSpaceFaces.begin(), Face<MeshType>::toFaceHandle ); std::transform( faces.begin(), splitElement, lowerHalfSpaceFaces.begin(), Face<MeshType>::toFaceHandle );
std::transform( splitElement, faces.end(), upperHalfSpaceFaces.begin(), Face<MeshType>::toFaceHandle ); std::transform( splitElement, faces.end(), upperHalfSpaceFaces.begin(), Face<MeshType>::toFaceHandle );
...@@ -98,4 +98,4 @@ Plane< typename MeshType::Scalar > splitFaces( const MeshType & mesh, InputItera ...@@ -98,4 +98,4 @@ Plane< typename MeshType::Scalar > splitFaces( const MeshType & mesh, InputItera
} // namespace distance_bsdtree } // namespace distance_bsdtree
} // namespace mesh } // namespace mesh
} // namespace walberla } // namespace walberla
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment