diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h
index d7bb9c0432e714cc0334487a7ef7838085dac8e2..45a06b56b72786dee4506b74421008f91ec536be 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h
@@ -59,7 +59,7 @@ public:
public:
BCAlgorithm();
- virtual ~BCAlgorithm() {}
+ virtual ~BCAlgorithm() = default;
virtual void addDistributions(SPtr<DistributionArray3D> distributions) = 0;
void setNodeIndex(int x1, int x2, int x3);
@@ -89,7 +89,7 @@ protected:
typedef void(*CalcMacrosFct)(const LBMReal* const& /*f[27]*/, LBMReal& /*rho*/, LBMReal& /*vx1*/, LBMReal& /*vx2*/, LBMReal& /*vx3*/);
typedef LBMReal(*CalcFeqForDirFct)(const int& /*direction*/, const LBMReal& /*(d)rho*/, const LBMReal& /*vx1*/, const LBMReal& /*vx2*/, const LBMReal& /*vx3*/);
- typedef void(*CalcFeqFct)(LBMReal* const& /*feq/*[27]*/, const LBMReal& /*rho*/, const LBMReal& /*vx1*/, const LBMReal& /*vx2*/, const LBMReal& /*vx3*/);
+ typedef void(*CalcFeqFct)(LBMReal* const& /*feq[27]*/, const LBMReal& /*rho*/, const LBMReal& /*vx1*/, const LBMReal& /*vx2*/, const LBMReal& /*vx3*/);
CalcFeqForDirFct calcFeqsForDirFct ;
CalcMacrosFct calcMacrosFct;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.cpp
index 677eb3ef7105db64e784bf369323d2815b33c961..b5b8e54c1f968327366ed8bae81fb978682f1920 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.cpp
@@ -39,11 +39,6 @@ NoSlipBCAlgorithm::NoSlipBCAlgorithm()
{
BCAlgorithm::type = BCAlgorithm::NoSlipBCAlgorithm;
BCAlgorithm::preCollision = false;
-}
-//////////////////////////////////////////////////////////////////////////
-NoSlipBCAlgorithm::~NoSlipBCAlgorithm()
-{
-
}
//////////////////////////////////////////////////////////////////////////
SPtr<BCAlgorithm> NoSlipBCAlgorithm::clone()
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.h
index b2dfa7b39f9128c117c0338b09e6c2da013d5402..163ec5ae89deb614481ecc73fddb436a4086f404 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.h
@@ -44,9 +44,8 @@ class NoSlipBCAlgorithm : public BCAlgorithm
{
public:
NoSlipBCAlgorithm();
- virtual ~NoSlipBCAlgorithm();
- SPtr<BCAlgorithm> clone();
- void addDistributions(SPtr<DistributionArray3D> distributions);
+ SPtr<BCAlgorithm> clone() override;
+ void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
private:
};
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.cpp
index 595907b5982ff6c1c1f53257b0850fd72450d798..b9cf0a48f744995f90deff8f1307a31a367ed64d 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.cpp
@@ -41,10 +41,6 @@ VelocityBCAlgorithm::VelocityBCAlgorithm()
BCAlgorithm::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-VelocityBCAlgorithm::~VelocityBCAlgorithm()
-{
-}
-//////////////////////////////////////////////////////////////////////////
SPtr<BCAlgorithm> VelocityBCAlgorithm::clone()
{
SPtr<BCAlgorithm> bc(new VelocityBCAlgorithm());
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.h
index f4d62f5367f1219fa782684232004de2a8244af0..fedd86982d400da5458d216640d8bbd634087ffe 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.h
@@ -44,9 +44,8 @@ class VelocityBCAlgorithm : public BCAlgorithm
{
public:
VelocityBCAlgorithm();
- ~VelocityBCAlgorithm();
- SPtr<BCAlgorithm> clone();
- void addDistributions(SPtr<DistributionArray3D> distributions);
+ SPtr<BCAlgorithm> clone() override;
+ void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
};
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
index 49a8da4ac360b2bda8c8071f43d2b8d537e42522..033bf64091b8f6a86f9575c32369de97a6f10693 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
@@ -53,8 +53,8 @@ class CumulantK17LBMKernel : public LBMKernel
public:
CumulantK17LBMKernel();
virtual ~CumulantK17LBMKernel(void);
- virtual void calculate(int step);
- virtual SPtr<LBMKernel> clone();
+ virtual void calculate(int step) override;
+ virtual SPtr<LBMKernel> clone() override;
protected:
inline void forwardInverseChimeraWithK(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2, LBMReal Kinverse, LBMReal K);
diff --git a/src/cpu/VirtualFluidsCore/LBM/ILBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/ILBMKernel.h
index d2a657fb1945c274f8d2287f85ffc7f0980bdf57..7b9ba145f09de1f86e07c15816ccda0b9d3043b3 100644
--- a/src/cpu/VirtualFluidsCore/LBM/ILBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/ILBMKernel.h
@@ -43,7 +43,7 @@ class DataSet3D;
class ILBMKernel
{
public:
- virtual ~ILBMKernel() {};
+ virtual ~ILBMKernel() = default;
virtual void calculate(int step) = 0;
virtual void swapDistributions() = 0;
diff --git a/src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp
index 7be2e79a54e42db046c70020196389b8065c51dd..ec1bb4049181b613542fc66953a8f0e34859182a 100644
--- a/src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp
@@ -50,11 +50,6 @@ LBMKernel::LBMKernel() : ghostLayerWidth(1),
this->nx[0] = 0;
this->nx[1] = 0;
this->nx[2] = 0;
-}
-//////////////////////////////////////////////////////////////////////////
-LBMKernel::~LBMKernel()
-{
-
}
//////////////////////////////////////////////////////////////////////////
void LBMKernel::setBCProcessor(SPtr<BCProcessor> bcp)
diff --git a/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h
index ba7b5d9ccd7d6b831c39f964b6f8c6ca354ab579..c8b9bc4ebc94170538b282720f59f05b2d2122d6 100644
--- a/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h
@@ -52,23 +52,20 @@ public:
typedef std::numeric_limits<LBMReal> LBMRealLim;
public:
LBMKernel();
- virtual ~LBMKernel();
virtual SPtr<LBMKernel> clone() = 0;
- virtual void calculate(int step) = 0;
+ void setBCProcessor(SPtr<BCProcessor> bcp) override;
+ SPtr<BCProcessor> getBCProcessor() const override;
- void setBCProcessor(SPtr<BCProcessor> bcp);
- SPtr<BCProcessor> getBCProcessor() const;
-
- void setCollisionFactor(double collFactor);
- double getCollisionFactor() const;
+ void setCollisionFactor(double collFactor) override;
+ double getCollisionFactor() const override;
void setGhostLayerWidth(int witdh);
- int getGhostLayerWidth() const;
+ int getGhostLayerWidth() const override;
void setDataSet(SPtr<DataSet3D> dataSet);
- SPtr<DataSet3D> getDataSet() const;
+ SPtr<DataSet3D> getDataSet() const override;
void setForcingX1(LBMReal forcingX1);
void setForcingX2(LBMReal forcingX2);
@@ -84,13 +81,13 @@ public:
void setIndex(int x1, int x2, int x3);
- LBMReal getDeltaT() const;
+ LBMReal getDeltaT() const override;
void setDeltaT(LBMReal dt);
- bool getCompressible() const;
+ bool getCompressible() const override;
void setCompressible(bool val);
- bool getWithForcing() const;
+ bool getWithForcing() const override;
void setWithForcing(bool val);
bool getWithSpongeLayer() const;
@@ -102,7 +99,7 @@ public:
void setBlock(SPtr<Block3D> block);
SPtr<Block3D> getBlock() const;
- bool isInsideOfDomain(const int &x1, const int &x2, const int &x3) const;
+ bool isInsideOfDomain(const int &x1, const int &x2, const int &x3) const override;
void swapDistributions() override;