From 39912c8c595099c6bc6e621c2cb825ef54b4a902 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Fri, 2 Oct 2020 11:14:46 +0200
Subject: [PATCH] Add overrides and default destructors.
---
.../BoundaryConditions/BCAlgorithm.h | 4 ++--
.../BoundaryConditions/NoSlipBCAlgorithm.cpp | 5 ----
.../BoundaryConditions/NoSlipBCAlgorithm.h | 5 ++--
.../VelocityBCAlgorithm.cpp | 4 ----
.../BoundaryConditions/VelocityBCAlgorithm.h | 5 ++--
.../LBM/CumulantK17LBMKernel.h | 4 ++--
src/cpu/VirtualFluidsCore/LBM/ILBMKernel.h | 2 +-
src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp | 5 ----
src/cpu/VirtualFluidsCore/LBM/LBMKernel.h | 23 ++++++++-----------
9 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h
index d7bb9c043..45a06b56b 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 677eb3ef7..b5b8e54c1 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 b2dfa7b39..163ec5ae8 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 595907b59..b9cf0a48f 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 f4d62f536..fedd86982 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 49a8da4ac..033bf6409 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 d2a657fb1..7b9ba145f 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 7be2e79a5..ec1bb4049 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 ba7b5d9cc..c8b9bc4eb 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;
--
GitLab