From 0a8de3136e762718f9a3279a572836cbee665183 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Thu, 8 Oct 2020 11:27:21 +0200
Subject: [PATCH] Remove additional clang tidy warnings.
---
src/basics/basics/container/CbVectorPool.h | 5 +--
src/basics/basics/memory/MbSmartPtr.h | 4 +-
src/basics/basics/parallel/PbMpi.h | 3 ++
src/basics/basics/transmitter/TbTransmitter.h | 2 +-
.../basics/transmitter/TbTransmitterMpiPool.h | 2 +-
.../MPIIOMigrationBECoProcessor.cpp | 4 +-
.../CoProcessors/QCriterionCoProcessor.cpp | 4 +-
.../D3Q27TriFaceMeshInteractor.cpp | 10 ++---
...ibleCumulant4thOrderViscosityLBMKernel.cpp | 2 +-
...mpressibleOffsetInterpolationProcessor.cpp | 10 +----
...CompressibleOffsetInterpolationProcessor.h | 5 ++-
src/cpu/VirtualFluidsCore/LBM/ICell.h | 2 +-
.../LBM/IncompressibleCumulantLBMKernel.cpp | 2 +-
...ssibleCumulantWithSpongeLayerLBMKernel.cpp | 2 +-
...mpressibleOffsetInterpolationProcessor.cpp | 10 +----
...compressibleOffsetInterpolationProcessor.h | 4 +-
.../LBM/InterpolationProcessor.cpp | 42 +++++++++----------
.../Parallel/SimpleGeometricPartitioner.h | 2 +-
.../Utilities/CheckpointConverter.cpp | 2 +-
.../Visitors/MetisPartitioningGridVisitor.cpp | 2 +-
...fineCrossAndInsideGbObjectBlockVisitor.cpp | 2 +-
21 files changed, 53 insertions(+), 68 deletions(-)
diff --git a/src/basics/basics/container/CbVectorPool.h b/src/basics/basics/container/CbVectorPool.h
index 329e889e6..a02501667 100644
--- a/src/basics/basics/container/CbVectorPool.h
+++ b/src/basics/basics/container/CbVectorPool.h
@@ -406,6 +406,8 @@ public:
friend class CbVectorPool< value_type >;
+ CbVectorAllocatorPool( const CbVectorAllocatorPool& ) = delete;
+ const CbVectorAllocatorPool& operator=( const CbVectorAllocatorPool& ) = delete;
public:
/*==========================================================*/
CbVectorAllocatorPool(const typename CbVectorPool< value_type >::CbVectorKey& key, CbVectorPool<value_type>* const& ptrVectorPool)
@@ -458,9 +460,6 @@ private:
typename CbVectorPool< value_type >::Pool::size_type startIndexInPool;
CbVectorPool< value_type >* ptrVectorPool;
-
- CbVectorAllocatorPool( const CbVectorAllocatorPool& ) = delete; //no copy allowed
- const CbVectorAllocatorPool& operator=( const CbVectorAllocatorPool& ) = delete;//no copy allowed
};
diff --git a/src/basics/basics/memory/MbSmartPtr.h b/src/basics/basics/memory/MbSmartPtr.h
index 0757fb91c..5a17e45b9 100644
--- a/src/basics/basics/memory/MbSmartPtr.h
+++ b/src/basics/basics/memory/MbSmartPtr.h
@@ -9,9 +9,7 @@
#include <basics/memory/MbSmartPtrBase.h>
-#ifdef CAB_RCF
- #include <3rdParty/rcf/RcfSerializationIncludes.h>
-#endif
+#pragma clang system_header
//=====================================================
// Globale Funktion, um das Loeschen des referenzierten
diff --git a/src/basics/basics/parallel/PbMpi.h b/src/basics/basics/parallel/PbMpi.h
index 25f9d4822..93a64f4be 100644
--- a/src/basics/basics/parallel/PbMpi.h
+++ b/src/basics/basics/parallel/PbMpi.h
@@ -14,6 +14,9 @@
# error VF_MPI has to be defined
#endif
+// As we doing a lot of const-cast here we define PbMpi.h to system_header to mute clang-tidy
+#pragma clang system_header
+
//#undef SEEK_SET
//#undef SEEK_CUR
//#undef SEEK_END
diff --git a/src/basics/basics/transmitter/TbTransmitter.h b/src/basics/basics/transmitter/TbTransmitter.h
index ba0049044..61874360f 100644
--- a/src/basics/basics/transmitter/TbTransmitter.h
+++ b/src/basics/basics/transmitter/TbTransmitter.h
@@ -34,7 +34,7 @@ public:
public:
TbTransmitter() = default;
- virtual ~TbTransmitter() { /*std::cout<<typeid(*this).name()<<" dtor"<<std::endl;*/ }
+ virtual ~TbTransmitter() = default;
virtual bool isLocalTransmitter() const = 0;
virtual bool isRemoteTransmitter() const = 0;
diff --git a/src/basics/basics/transmitter/TbTransmitterMpiPool.h b/src/basics/basics/transmitter/TbTransmitterMpiPool.h
index a32325f7f..aa5a9c167 100644
--- a/src/basics/basics/transmitter/TbTransmitterMpiPool.h
+++ b/src/basics/basics/transmitter/TbTransmitterMpiPool.h
@@ -41,7 +41,7 @@ template<typename T>
class TbCbVectorMpiPool : public CbVectorPool<T>
{
public:
- typedef SPtr< TbCbVectorMpiPool< T > > MpiPoolPtr;
+ using MpiPoolPtr = SPtr< TbCbVectorMpiPool< T > >;
//////////////////////////////////////////////////////////////////////////
using MpiPoolPtrMap = std::map<std::string, MpiPoolPtr>;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
index 3f29498a1..5d864a190 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
@@ -763,7 +763,7 @@ void MPIIOMigrationBECoProcessor::blocksExchange(int tagN, int ind1, int ind2, i
SPtr<Block3D> tempBlock;
int tempRank;
- for(size_t ind = indexB - indexB; ind < indexE - indexB; ind++)
+ for(size_t ind = indexB - indexB; ind < indexE - indexB; ind++) // FIXME: both sides of operator are equivalent
{
tempBlock = grid->getBlock(indexB + int(ind));
if(!tempBlock) throw UbException(UB_EXARGS,"MPIIOMigrationBECoProcessor::blocksExchange -- null block pointer!!!" );
@@ -1245,7 +1245,7 @@ void MPIIOMigrationBECoProcessor::readBoundaryConds(int step)
SPtr<Block3D> tempBlock;
int tempRank;
- for (int ind = indexB - indexB; ind < indexE - indexB; ind++)
+ for (int ind = indexB - indexB; ind < indexE - indexB; ind++) // FIXME: both sides of operator are equivalent
{
tempBlock = grid->getBlock(indexB + ind);
tempRank = tempBlock->getRank();
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
index 909ea0210..75801803c 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
@@ -299,7 +299,7 @@ void QCriterionCoProcessor::getNeighborVelocities(int offx, int offy, int offz,
///////////////////////////////////////
////compute distribution at neighboring nodes from neighboring blocks
- if (checkInterpolation==false || neighNodeIsBC)
+ if (!checkInterpolation || neighNodeIsBC)
{
SPtr<ILBMKernel> kernelW = blockNeighW->getKernel();
SPtr<BCArray3D> bcArrayW = kernelW->getBCProcessor()->getBCArray();
@@ -362,7 +362,7 @@ void QCriterionCoProcessor::getNeighborVelocities(int offx, int offy, int offz,
computeVelocity(fW,vW,compressible);
}
- if (checkInterpolation==true)
+ if (checkInterpolation)
{
//in plus-direction data is available in current block because of ghost layers
LBMReal fE[27];
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
index 1f6dc3f2d..9bdf07cce 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
@@ -41,13 +41,13 @@ D3Q27TriFaceMeshInteractor::D3Q27TriFaceMeshInteractor(SPtr<Grid3D> /*grid*/, s
}
//////////////////////////////////////////////////////////////////////////
D3Q27TriFaceMeshInteractor::D3Q27TriFaceMeshInteractor(SPtr<GbTriFaceMesh3D> triFaceMesh, SPtr<Grid3D> grid, SPtr<BCAdapter> bcAdapter, int type)
-: D3Q27Interactor(triFaceMesh, grid, bcAdapter, type), forceshift(0.0), velocityshift(0.0), forceshiftpolicy(false), velocityshiftpolicy(false), useHalfSpace(true), regardPIOTest(true)
+: D3Q27Interactor(triFaceMesh, grid, bcAdapter, type)
{
this->stressMode = STRESSNORMAL;
}
//////////////////////////////////////////////////////////////////////////
D3Q27TriFaceMeshInteractor::D3Q27TriFaceMeshInteractor(SPtr<GbTriFaceMesh3D> triFaceMesh, SPtr<Grid3D> grid, SPtr<BCAdapter> bcAdapter, int type, Interactor3D::Accuracy a)
- : D3Q27Interactor(triFaceMesh, grid, bcAdapter, type, a), forceshift(0.0), velocityshift(0.0), forceshiftpolicy(false), velocityshiftpolicy(false), useHalfSpace(true), regardPIOTest(true)
+ : D3Q27Interactor(triFaceMesh, grid, bcAdapter, type, a)
{
this->stressMode = STRESSNORMAL;
}
@@ -57,7 +57,7 @@ D3Q27TriFaceMeshInteractor::~D3Q27TriFaceMeshInteractor()
//////////////////////////////////////////////////////////////////////////
void D3Q27TriFaceMeshInteractor::initInteractor(const double& timeStep)
{
- Interactor3D::initInteractor(timeStep);
+ Interactor3D::initInteractor(timeStep); // FIXME: refers to a member overridden in subclass
setQs(timeStep);
}
//////////////////////////////////////////////////////////////////////////
@@ -1497,7 +1497,7 @@ UbTupleDouble3 D3Q27TriFaceMeshInteractor::getForces()
// forceX2 += attribut.getFY()*area;
// forceX3 += attribut.getFZ()*area;
//}
- return UbTupleDouble3(forceX1,forceX2,forceX3);
+ return {forceX1,forceX2,forceX3};
}
//////////////////////////////////////////////////////////////////////////
UbTupleDouble3 D3Q27TriFaceMeshInteractor::getForcesTriangle()
@@ -1635,7 +1635,7 @@ UbTupleDouble3 D3Q27TriFaceMeshInteractor::getForcesTriangle()
//// forceX2 += Fy1;
//// forceX3 += Fz1;
////}
- return UbTupleDouble3(forceX1,forceX2,forceX3);
+ return {forceX1,forceX2,forceX3};
}
//////////////////////////////////////////////////////////////////////////
void D3Q27TriFaceMeshInteractor::calculateForces()
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
index a35eb6fe7..caa21b43d 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
@@ -2,7 +2,7 @@
#include "D3Q27System.h"
#include "InterpolationProcessor.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
-#include <math.h>
+#include <cmath>
#include "DataSet3D.h"
#include "LBMKernel.h"
#include "Block3D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
index 88f67d8a9..04e9fe233 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
@@ -3,21 +3,13 @@
using namespace UbMath;
-CompressibleOffsetInterpolationProcessor::CompressibleOffsetInterpolationProcessor()
-
-{
- //forcingC = 0; //9.99685e-7;
- //forcingF = 0; //forcingC*0.5;
-}
//////////////////////////////////////////////////////////////////////////
CompressibleOffsetInterpolationProcessor::CompressibleOffsetInterpolationProcessor(LBMReal omegaC, LBMReal omegaF)
: omegaC(omegaC), omegaF(omegaF)
{
}
-//////////////////////////////////////////////////////////////////////////
-CompressibleOffsetInterpolationProcessor::~CompressibleOffsetInterpolationProcessor()
-= default;
+
//////////////////////////////////////////////////////////////////////////
InterpolationProcessorPtr CompressibleOffsetInterpolationProcessor::clone()
{
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h
index d855e545c..b81277683 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h
@@ -14,9 +14,10 @@ class CompressibleOffsetInterpolationProcessor;
class CompressibleOffsetInterpolationProcessor : public InterpolationProcessor
{
public:
- CompressibleOffsetInterpolationProcessor();
+ CompressibleOffsetInterpolationProcessor() = default;
CompressibleOffsetInterpolationProcessor(LBMReal omegaC, LBMReal omegaF);
- ~CompressibleOffsetInterpolationProcessor() override;
+ ~CompressibleOffsetInterpolationProcessor() override = default;
+
InterpolationProcessorPtr clone() override;
void setOmegas(LBMReal omegaC, LBMReal omegaF) override;
void interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF) override;
diff --git a/src/cpu/VirtualFluidsCore/LBM/ICell.h b/src/cpu/VirtualFluidsCore/LBM/ICell.h
index 76922d58d..897a4134f 100644
--- a/src/cpu/VirtualFluidsCore/LBM/ICell.h
+++ b/src/cpu/VirtualFluidsCore/LBM/ICell.h
@@ -18,7 +18,7 @@ struct ICell3D
std::vector<LBMReal> BSE;
};
-ICell3D::ICell3D(int size)
+inline ICell3D::ICell3D(int size)
{
TSW.resize(size);
TNW.resize(size);
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
index 4e6c88fe1..ec4b9bbd4 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
@@ -3,7 +3,7 @@
#include "InterpolationProcessor.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include "DataSet3D.h"
-#include <math.h>
+#include <cmath>
#include "Block3D.h"
#define PROOF_CORRECTNESS
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp
index 7a6ff973c..089b505a5 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp
@@ -1,7 +1,7 @@
#include "IncompressibleCumulantWithSpongeLayerLBMKernel.h"
#include "D3Q27System.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
-#include <math.h>
+#include <cmath>
#include "DataSet3D.h"
#include "BCArray3D.h"
#include "Block3D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
index 74b0402bd..979476eb4 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
@@ -3,21 +3,13 @@
-IncompressibleOffsetInterpolationProcessor::IncompressibleOffsetInterpolationProcessor()
-
-{
- //forcingC = 0; //9.99685e-7;
- //forcingF = 0; //forcingC*0.5;
-}
//////////////////////////////////////////////////////////////////////////
IncompressibleOffsetInterpolationProcessor::IncompressibleOffsetInterpolationProcessor(LBMReal omegaC, LBMReal omegaF)
: omegaC(omegaC), omegaF(omegaF)
{
}
-//////////////////////////////////////////////////////////////////////////
-IncompressibleOffsetInterpolationProcessor::~IncompressibleOffsetInterpolationProcessor()
-= default;
+
//////////////////////////////////////////////////////////////////////////
InterpolationProcessorPtr IncompressibleOffsetInterpolationProcessor::clone()
{
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
index db1479ade..6b024d419 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
@@ -15,9 +15,9 @@ using D3Q27IncompressibleOffsetInterpolationProcessorPtr = SPtr<IncompressibleOf
class IncompressibleOffsetInterpolationProcessor : public InterpolationProcessor
{
public:
- IncompressibleOffsetInterpolationProcessor();
+ IncompressibleOffsetInterpolationProcessor() = default;
IncompressibleOffsetInterpolationProcessor(LBMReal omegaC, LBMReal omegaF);
- ~IncompressibleOffsetInterpolationProcessor() override;
+ ~IncompressibleOffsetInterpolationProcessor() override = default;
InterpolationProcessorPtr clone() override;
void setOmegas(LBMReal omegaC, LBMReal omegaF) override;
void interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF) override;
diff --git a/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp
index 8cf695fc7..60893e2b2 100644
--- a/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp
@@ -83,7 +83,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = 0;
}
//GoEast
- else if(inRange(x1+2,x2,x3) && !iCellHasSolid(bcArray, x1+1,x2,x3)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1+2,x2,x3) && !iCellHasSolid(bcArray, x1+1,x2,x3)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1+1,x2,x3);
xoff = -1;
@@ -99,7 +99,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = 0;
}
//GoNorth
- else if(inRange(x1,x2+2,x3) && !iCellHasSolid(bcArray, x1,x2+1,x3)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1,x2+2,x3) && !iCellHasSolid(bcArray, x1,x2+1,x3)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1,x2+1,x3);
xoff = 0;
@@ -115,7 +115,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = 1;
}
//GoTop
- else if(inRange(x1,x2,x3+2) && !iCellHasSolid(bcArray, x1,x2,x3+1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1,x2,x3+2) && !iCellHasSolid(bcArray, x1,x2,x3+1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1,x2,x3+1);
xoff = 0;
@@ -123,7 +123,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = -1;
}
//GoNW
- else if(inRange(x1-1,x2+2,x3) && !iCellHasSolid(bcArray, x1-1,x2+1,x3)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1-1,x2+2,x3) && !iCellHasSolid(bcArray, x1-1,x2+1,x3)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1-1,x2+1,x3);
xoff = 1;
@@ -131,7 +131,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = 0;
}
//GoNE
- else if(inRange(x1+2,x2+2,x3) && !iCellHasSolid(bcArray, x1+1,x2+1,x3)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1+2,x2+2,x3) && !iCellHasSolid(bcArray, x1+1,x2+1,x3)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1+1,x2+1,x3);
xoff = -1;
@@ -139,7 +139,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = 0;
}
//GoSW
- else if(inRange(x1-1,x2-1,x3) && !iCellHasSolid(bcArray, x1-1,x2-1,x3)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1-1,x2-1,x3) && !iCellHasSolid(bcArray, x1-1,x2-1,x3)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1-1,x2-1,x3);
xoff = 1;
@@ -147,7 +147,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = 0;
}
//GoSE
- else if(inRange(x1+2,x2-1,x3) && !iCellHasSolid(bcArray, x1+1,x2-1,x3)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1+2,x2-1,x3) && !iCellHasSolid(bcArray, x1+1,x2-1,x3)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1+1,x2-1,x3);
xoff = -1;
@@ -163,7 +163,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = 1;
}
//GoBE
- else if(inRange(x1+2,x2,x3-1) && !iCellHasSolid(bcArray, x1+1,x2,x3-1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1+2,x2,x3-1) && !iCellHasSolid(bcArray, x1+1,x2,x3-1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1+1,x2,x3-1);
xoff = -1;
@@ -179,7 +179,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = 1;
}
//GoBN
- else if(inRange(x1,x2+2,x3-1) && !iCellHasSolid(bcArray, x1,x2+1,x3-1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1,x2+2,x3-1) && !iCellHasSolid(bcArray, x1,x2+1,x3-1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1,x2+1,x3-1);
xoff = 0;
@@ -195,7 +195,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = -1;
}
//GoTE
- else if(inRange(x1+2,x2,x3+2) && !iCellHasSolid(bcArray, x1+1,x2,x3+1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1+2,x2,x3+2) && !iCellHasSolid(bcArray, x1+1,x2,x3+1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1+1,x2,x3+1);
xoff = -1;
@@ -211,7 +211,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = -1;
}
//GoTN
- else if(inRange(x1,x2+2,x3+2) && !iCellHasSolid(bcArray, x1,x2+1,x3+1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1,x2+2,x3+2) && !iCellHasSolid(bcArray, x1,x2+1,x3+1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1,x2+1,x3+1);
xoff = 0;
@@ -219,7 +219,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = -1;
}
//GoTNW
- else if(inRange(x1-1,x2+2,x3+2) && !iCellHasSolid(bcArray, x1-1,x2+1,x3+1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1-1,x2+2,x3+2) && !iCellHasSolid(bcArray, x1-1,x2+1,x3+1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1-1,x2+1,x3+1);
xoff = 1;
@@ -227,7 +227,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = -1;
}
//GoTNE
- else if(inRange(x1+2,x2+2,x3+2) && !iCellHasSolid(bcArray, x1+1,x2+1,x3+1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1+2,x2+2,x3+2) && !iCellHasSolid(bcArray, x1+1,x2+1,x3+1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1+1,x2+1,x3+1);
xoff = -1;
@@ -235,7 +235,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = -1;
}
//GoTSE
- else if(inRange(x1+2,x2-1,x3+2) && !iCellHasSolid(bcArray, x1+1,x2-1,x3+1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1+2,x2-1,x3+2) && !iCellHasSolid(bcArray, x1+1,x2-1,x3+1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1+1,x2-1,x3+1);
xoff = -1;
@@ -243,7 +243,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = -1;
}
//GoTSW
- else if(inRange(x1-1,x2-1,x3+2) && !iCellHasSolid(bcArray, x1-1,x2-1,x3+1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1-1,x2-1,x3+2) && !iCellHasSolid(bcArray, x1-1,x2-1,x3+1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1-1,x2-1,x3+1);
xoff = 1;
@@ -251,7 +251,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = -1;
}
//GoBNW
- else if(inRange(x1-1,x2+2,x3-1) && !iCellHasSolid(bcArray, x1-1,x2+1,x3-1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1-1,x2+2,x3-1) && !iCellHasSolid(bcArray, x1-1,x2+1,x3-1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1-1,x2+1,x3-1);
xoff = 1;
@@ -259,7 +259,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = 1;
}
//GoBNE
- else if(inRange(x1+2,x2+2,x3-1) && !iCellHasSolid(bcArray, x1+1,x2+1,x3-1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1+2,x2+2,x3-1) && !iCellHasSolid(bcArray, x1+1,x2+1,x3-1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1+1,x2+1,x3-1);
xoff = -1;
@@ -267,7 +267,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = 1;
}
//GoBSE
- else if(inRange(x1+2,x2-1,x3-1) && !iCellHasSolid(bcArray, x1+1,x2-1,x3-1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1+2,x2-1,x3-1) && !iCellHasSolid(bcArray, x1+1,x2-1,x3-1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1+1,x2-1,x3-1);
xoff = -1;
@@ -275,7 +275,7 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
zoff = 1;
}
//GoBSW
- else if(inRange(x1-1,x2-1,x3-1) && !iCellHasSolid(bcArray, x1-1,x2-1,x3-1)) // ist übernächster Knoten auch im Gebiet (Grundknoten bei 0,0,0
+ else if(inRange(x1-1,x2-1,x3-1) && !iCellHasSolid(bcArray, x1-1,x2-1,x3-1)) // ist �bern�chster Knoten auch im Gebiet (Grundknoten bei 0,0,0
{
readICell(f,icell,x1-1,x2-1,x3-1);
xoff = 1;
@@ -290,9 +290,9 @@ bool InterpolationProcessor::findNeighborICell(const SPtr<BCArray3D> bcArray, SP
// " by using in: "+(std::string)typeid(*this).name()+
// " or maybe you have a solid on the block boundary";
//UB_THROW(UbException(UB_EXARGS, err));
- return 0;
+ return false;
}
- return 1;
+ return true;
}
//////////////////////////////////////////////////////////////////////////
int InterpolationProcessor::iCellHowManySolids( const SPtr<BCArray3D> bcArray, int x1, int x2, int x3 )
diff --git a/src/cpu/VirtualFluidsCore/Parallel/SimpleGeometricPartitioner.h b/src/cpu/VirtualFluidsCore/Parallel/SimpleGeometricPartitioner.h
index 9573e778c..b7b62c1dd 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/SimpleGeometricPartitioner.h
+++ b/src/cpu/VirtualFluidsCore/Parallel/SimpleGeometricPartitioner.h
@@ -25,7 +25,7 @@ public:
int p = numberOfProcess;
if (p == 1)
- return UbTupleInt3(1, 1, 1);
+ return {1, 1, 1};
double a = pow(p*pow(x,3.0)/xyz,1.0/3.0);
double b = pow(p*pow(y,3.0)/xyz,1.0/3.0);
diff --git a/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp b/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
index 2c1d31e0e..fe58829b1 100644
--- a/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
+++ b/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
@@ -6,7 +6,7 @@
#include "Grid3D.h"
#include "Communicator.h"
#include "CoordinateTransformation3D.h"
-#include <stdio.h>
+#include <cstdio>
#define BLOCK_SIZE 1024
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.cpp
index 84258830b..23f3260e9 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.cpp
@@ -1,7 +1,7 @@
#if defined VF_METIS && defined VF_MPI
#include "MetisPartitioningGridVisitor.h"
-#include <math.h>
+#include <cmath>
#include "Block3D.h"
#include "Grid3D.h"
#include "Communicator.h"
diff --git a/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp
index 3b72cfd4d..cb503f368 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp
@@ -11,7 +11,7 @@ RefineCrossAndInsideGbObjectBlockVisitor::RefineCrossAndInsideGbObjectBlockVisit
}
//////////////////////////////////////////////////////////////////////////
RefineCrossAndInsideGbObjectBlockVisitor::RefineCrossAndInsideGbObjectBlockVisitor(SPtr<GbObject3D> geoObject, int refineLevel)
- : Block3DVisitor(0,refineLevel-1), geoObject(geoObject), notActive(true)
+ : Block3DVisitor(0,refineLevel-1), geoObject(geoObject)
{
}
--
GitLab