Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Commits on Source (2)
......@@ -25,6 +25,7 @@ misc-*,
-misc-header-include-cycle,
-misc-use-internal-linkage,
-misc-use-anonymous-namespace,
-misc-const-correctness,
modernize-*,
-modernize-use-auto,
......
......@@ -111,7 +111,7 @@ public:
for(auto & minTargetLevel : minTargetLevels)
{
const uint_t currentLevelOfBlock = minTargetLevel.first->getLevel();
const uint_t targetLevelOfBlock = currentLevelOfBlock;
uint_t targetLevelOfBlock = currentLevelOfBlock;
for(auto & aabb : aabbs)
{
......
......@@ -1877,10 +1877,10 @@ bool BlockForest::determineBlockTargetLevels( bool & additionalRefreshCycleRequi
WALBERLA_LOG_PROGRESS( "BlockForest refresh: + tell neighbors about blocks that can get merged" );
for( auto rank = ranksToRecvFrom.begin(); rank != ranksToRecvFrom.end(); ++rank )
for( auto rank: ranksToRecvFrom )
{
WALBERLA_ASSERT_UNEQUAL( *rank, process_ );
mergeBufferSystem.sendBuffer( *rank ) << intentToMerge[ process_ ];
WALBERLA_ASSERT_UNEQUAL( rank, process_ );
mergeBufferSystem.sendBuffer( rank ) << intentToMerge[ process_ ];
}
mergeBufferSystem.sendAll();
......
......@@ -63,7 +63,7 @@ shared_ptr< StructuredBlockForest > createUniformBlockGridFromConfig( const shar
}
}
WALBERLA_ABORT_NO_DEBUG_INFO( "No Configuration specified" );
return shared_ptr<StructuredBlockForest>();
return {};
}
......@@ -346,7 +346,7 @@ shared_ptr<BlockForest> createBlockForest(const math::AABB& simulationDomain,
WALBERLA_LOG_INFO_ON_ROOT( "SetupBlockForest successfully saved to file!" );
}
return shared_ptr<BlockForest>();
return {};
}
WALBERLA_MPI_SECTION()
......
......@@ -114,7 +114,7 @@ inline shared_ptr< PhantomBlock > PhantomBlockForest::getBlock( const BlockID &
auto it = blocks_.find( id );
if( it != blocks_.end() )
return it->second;
return shared_ptr< PhantomBlock >();
return {};
}
......
......@@ -699,7 +699,7 @@ void SetupBlockForest::init( const AABB& domain, const uint_t xSize, const uint_
if( !forest_.empty() ) {
for(auto & coarseBlock : forest_) {
if(coarseBlock != nullptr ) delete coarseBlock;
delete coarseBlock;
}
forest_.clear();
}
......
......@@ -422,7 +422,7 @@ inline SetupBlockForest::~SetupBlockForest() {
for(auto & coarseBlock : forest_)
{
if(coarseBlock != nullptr ) delete coarseBlock;
delete coarseBlock;
}
}
......
......@@ -177,7 +177,7 @@ private:
bool weightedBlocks() const
{
return ! std::is_same< PhantomData_T, NoPhantomData >::value;
return ! std::is_same_v< PhantomData_T, NoPhantomData >;
}
template< typename T >
......
......@@ -116,7 +116,7 @@ private:
double weight( const PhantomBlock * block ) const
{
return std::is_same< PhantomData_T, NoPhantomData >::value ? 1.0 :
return std::is_same_v< PhantomData_T, NoPhantomData > ? 1.0 :
numeric_cast< double >( block->template getData< PhantomData_T >().weight() );
}
......