From 0ce300f7b2ec1cd2b0630fa843d3d4b0663da1f4 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Wed, 7 Oct 2020 09:40:45 +0200
Subject: [PATCH] Make destructors default.
---
cpu.cmake | 1 +
.../Core/Input/ConfigFileReader/ConfigFileReader.cpp | 8 ++------
src/basics/Core/Input/ConfigInput/ConfigInput.cpp | 4 +---
src/basics/Core/Logger/Logger.cpp | 4 +---
src/basics/Core/Logger/implementations/LoggerImp.cpp | 4 +---
src/basics/Core/StringUtilities/StringUtil.h | 6 +++---
src/basics/basics/container/CbVector.h | 4 ++--
src/basics/basics/utilities/UbException.h | 2 +-
src/basics/basics/utilities/UbInfinity.h | 2 +-
src/basics/basics/utilities/UbLogger.h | 3 +--
src/basics/basics/utilities/UbObservable.h | 3 +--
src/basics/basics/utilities/UbObserver.h | 4 ++--
src/basics/basics/utilities/UbScheduler.h | 2 +-
src/basics/basics/utilities/UbTiming.h | 4 ++--
src/basics/basics/utilities/UbTuple.h | 6 +++---
src/basics/basics/writer/WbWriter.h | 4 +---
src/basics/geometry3d/GbPoint3D.h | 2 +-
src/basics/geometry3d/GbSystem3D.h | 2 +-
src/cpu/VirtualFluidsCore/BoundaryConditions/BCAdapter.h | 2 +-
.../VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp | 4 ++--
.../VirtualFluidsCore/BoundaryConditions/BCProcessor.cpp | 8 ++------
.../BoundaryConditions/BoundaryConditions.h | 2 +-
src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.cpp | 7 ++-----
.../CoProcessors/NUPSCounterCoProcessor.cpp | 3 +--
.../CoProcessors/WriteBlocksCoProcessor.cpp | 3 +--
.../CoProcessors/WriteBoundaryConditionsCoProcessor.cpp | 4 +---
.../CoProcessors/WriteBoundaryConditionsCoProcessor.h | 2 +-
.../WriteMacroscopicQuantitiesCoProcessor.cpp | 4 +---
.../CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h | 2 +-
src/cpu/VirtualFluidsCore/Connectors/Block3DConnector.h | 2 +-
.../VirtualFluidsCore/Connectors/LocalBlock3DConnector.h | 2 +-
.../Data/D3Q27EsoTwist3DSplittedVector.cpp | 7 ++-----
src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h | 4 ++--
src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h | 4 ++--
src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp | 4 +---
src/cpu/VirtualFluidsCore/Grid/Block3D.cpp | 3 +--
src/cpu/VirtualFluidsCore/Grid/Calculator.cpp | 4 +---
src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp | 4 +---
src/cpu/VirtualFluidsCore/Interactors/Interactor3D.cpp | 3 +--
.../VirtualFluidsCore/Interactors/InteractorsHelper.cpp | 4 +---
src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp | 4 +---
src/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h | 2 +-
src/cpu/VirtualFluidsCore/Parallel/Communicator.h | 6 +++---
src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp | 6 ++----
src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h | 3 +--
.../Visitors/BoundaryConditionsBlockVisitor.cpp | 4 +---
src/cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.h | 2 +-
src/cpu/VirtualFluidsCore/Visitors/Grid3DVisitor.h | 4 ++--
.../VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.h | 2 +-
.../Visitors/SetConnectorsBlockVisitor.cpp | 3 +--
.../VirtualFluidsCore/Visitors/SetKernelBlockVisitor.h | 2 +-
.../Visitors/SetSolidBlocksBlockVisitor.h | 2 +-
52 files changed, 70 insertions(+), 117 deletions(-)
diff --git a/cpu.cmake b/cpu.cmake
index d829a720c..d7cfe39b9 100644
--- a/cpu.cmake
+++ b/cpu.cmake
@@ -1,4 +1,5 @@
+
add_subdirectory(${VF_THIRD_DIR}/MuParser)
add_subdirectory(src/cpu/VirtualFluidsCore)
diff --git a/src/basics/Core/Input/ConfigFileReader/ConfigFileReader.cpp b/src/basics/Core/Input/ConfigFileReader/ConfigFileReader.cpp
index 1053a7f5f..4bdf8669b 100644
--- a/src/basics/Core/Input/ConfigFileReader/ConfigFileReader.cpp
+++ b/src/basics/Core/Input/ConfigFileReader/ConfigFileReader.cpp
@@ -13,14 +13,10 @@ BASICS_EXPORT std::shared_ptr<ConfigFileReader> ConfigFileReader::getNewInstance
}
ConfigFileReader::ConfigFileReader()
-{
-
-}
+= default;
BASICS_EXPORT ConfigFileReader::~ConfigFileReader()
-{
-
-}
+= default;
BASICS_EXPORT std::shared_ptr<ConfigData> ConfigFileReader::readConfigFile(const std::string &filePath) const
{
diff --git a/src/basics/Core/Input/ConfigInput/ConfigInput.cpp b/src/basics/Core/Input/ConfigInput/ConfigInput.cpp
index ce8ea0401..58f681b27 100644
--- a/src/basics/Core/Input/ConfigInput/ConfigInput.cpp
+++ b/src/basics/Core/Input/ConfigInput/ConfigInput.cpp
@@ -37,9 +37,7 @@ namespace input
}
ConfigInput::~ConfigInput()
- {
-
- }
+ = default;
bool ConfigInput::hasValue(const std::string &key) const
{
diff --git a/src/basics/Core/Logger/Logger.cpp b/src/basics/Core/Logger/Logger.cpp
index 95c577bfd..f7a9b2a1e 100644
--- a/src/basics/Core/Logger/Logger.cpp
+++ b/src/basics/Core/Logger/Logger.cpp
@@ -23,9 +23,7 @@ namespace logging {
}
logging::Logger::~Logger()
- {
-
- }
+ = default;
void Logger::addStreamToList(std::ostream* stream)
{
diff --git a/src/basics/Core/Logger/implementations/LoggerImp.cpp b/src/basics/Core/Logger/implementations/LoggerImp.cpp
index b06523afb..48ad23a30 100644
--- a/src/basics/Core/Logger/implementations/LoggerImp.cpp
+++ b/src/basics/Core/Logger/implementations/LoggerImp.cpp
@@ -17,9 +17,7 @@ logging::LoggerImp::LoggerImp(std::ostream* stream) : logging::Logger(stream)
}
logging::LoggerImp::~LoggerImp()
-{
-
-}
+= default;
logging::Logger& logging::LoggerImp::operator<<(const Level &level)
{
diff --git a/src/basics/Core/StringUtilities/StringUtil.h b/src/basics/Core/StringUtilities/StringUtil.h
index e860418cb..63ee9e965 100644
--- a/src/basics/Core/StringUtilities/StringUtil.h
+++ b/src/basics/Core/StringUtilities/StringUtil.h
@@ -37,9 +37,9 @@ public:
static BASICS_EXPORT bool endsWith(const std::string &input, const std::string &end);
private:
- StringUtil() {};
- StringUtil(const StringUtil&) {};
- virtual ~StringUtil() {};
+ StringUtil() = default;;
+ StringUtil(const StringUtil&) = default;;
+ virtual ~StringUtil() = default;;
static bool toBool(bool &t, const std::string &input, std::ios_base &(*f)(std::ios_base&));
};
diff --git a/src/basics/basics/container/CbVector.h b/src/basics/basics/container/CbVector.h
index cf4b9296b..e6b07f8f5 100644
--- a/src/basics/basics/container/CbVector.h
+++ b/src/basics/basics/container/CbVector.h
@@ -222,8 +222,8 @@ public:
using size_type = typename CbVector<value_type>::size_type;
public:
- CbVectorAllocator() {}
- virtual ~CbVectorAllocator() {}
+ CbVectorAllocator() = default;
+ virtual ~CbVectorAllocator() = default;
virtual bool alloc(CbVector< value_type >& vec, const size_type& dataSize, const value_type& value=value_type()) = 0;
virtual bool resize(CbVector< value_type >& vec, const size_type& dataSize, const value_type& value=value_type()) = 0;
diff --git a/src/basics/basics/utilities/UbException.h b/src/basics/basics/utilities/UbException.h
index 3ac995112..35c40eed7 100644
--- a/src/basics/basics/utilities/UbException.h
+++ b/src/basics/basics/utilities/UbException.h
@@ -109,7 +109,7 @@ public:
}
//////////////////////////////////////////////////////////////////////////
//destructor
- ~UbException() throw() override { }
+ ~UbException() throw() override = default;
//////////////////////////////////////////////////////////////////////////
//virtual public methods
//returns exception-string
diff --git a/src/basics/basics/utilities/UbInfinity.h b/src/basics/basics/utilities/UbInfinity.h
index 229a14b23..460c439ec 100644
--- a/src/basics/basics/utilities/UbInfinity.h
+++ b/src/basics/basics/utilities/UbInfinity.h
@@ -69,7 +69,7 @@ class UbNegInfinity
return UbLimits<T>::ninf() == rhs;
}
protected:
- inline UbNegInfinity() {}
+ inline UbNegInfinity() = default;
private:
UbNegInfinity( const UbNegInfinity& ninf ); //copy constructor (private & undefined)
diff --git a/src/basics/basics/utilities/UbLogger.h b/src/basics/basics/utilities/UbLogger.h
index 40ea42a48..2d315fb81 100644
--- a/src/basics/basics/utilities/UbLogger.h
+++ b/src/basics/basics/utilities/UbLogger.h
@@ -138,8 +138,7 @@ private:
//////////////////////////////////////////////////////////////////////////
template <typename OutputPolicy>
UbLogger<OutputPolicy>::UbLogger()
-{
-}
+= default;
/*==========================================================*/
template <typename OutputPolicy>
std::ostringstream& UbLogger<OutputPolicy>::get(const LogLevel& level)
diff --git a/src/basics/basics/utilities/UbObservable.h b/src/basics/basics/utilities/UbObservable.h
index 56967b904..27fc51dca 100644
--- a/src/basics/basics/utilities/UbObservable.h
+++ b/src/basics/basics/utilities/UbObservable.h
@@ -77,8 +77,7 @@ protected:
Usually this constructor is used in extended classes.
*/
UbObservable()
- {
- }
+ = default;
UbObservable(const UbObservable& src)
{
diff --git a/src/basics/basics/utilities/UbObserver.h b/src/basics/basics/utilities/UbObserver.h
index 0f2db5270..dab5d28c0 100644
--- a/src/basics/basics/utilities/UbObserver.h
+++ b/src/basics/basics/utilities/UbObserver.h
@@ -50,11 +50,11 @@ class UbObserver
{
protected:
- UbObserver(){}
+ UbObserver()= default;
public:
- virtual ~UbObserver(){}
+ virtual ~UbObserver()= default;
/*======================================================================*/
/* Methods */
diff --git a/src/basics/basics/utilities/UbScheduler.h b/src/basics/basics/utilities/UbScheduler.h
index cc4f6a50f..ae199b9d8 100644
--- a/src/basics/basics/utilities/UbScheduler.h
+++ b/src/basics/basics/utilities/UbScheduler.h
@@ -100,7 +100,7 @@ public:
this->addSchedule(schedule);
}
/*==========================================================*/
- virtual ~UbScheduler() {}
+ virtual ~UbScheduler() = default;
/*==========================================================*/
inline void addSchedule(const UbSchedule& schedule)
{
diff --git a/src/basics/basics/utilities/UbTiming.h b/src/basics/basics/utilities/UbTiming.h
index 55ba93cbe..71e95ce6a 100644
--- a/src/basics/basics/utilities/UbTiming.h
+++ b/src/basics/basics/utilities/UbTiming.h
@@ -64,7 +64,7 @@ public:
this->name = name;
}
/*==========================================================*/
- virtual ~UbTiming() {}
+ virtual ~UbTiming() = default;
/*==========================================================*/
virtual void initTiming()
{
@@ -236,7 +236,7 @@ public:
}
/*==========================================================*/
- virtual ~UbTimer() {}
+ virtual ~UbTimer() = default;
/*==========================================================*/
double getLapTime() const { return this->lapTime; }
std::vector<double> getLapTimes() const { return this->lapTimes; }
diff --git a/src/basics/basics/utilities/UbTuple.h b/src/basics/basics/utilities/UbTuple.h
index a75581ade..f081f2e9e 100644
--- a/src/basics/basics/utilities/UbTuple.h
+++ b/src/basics/basics/utilities/UbTuple.h
@@ -467,7 +467,7 @@ public:
using BaseT = UbDuo<P1, typename UbTuple<P2, P3, P4, P5, P6, P7, P8, UbNullT>::BaseT>;
// constructor:
- UbTuple() {}
+ UbTuple() = default;
UbTuple( typename UbTypeOp<P1>::RefConstT a1,
typename UbTypeOp<P2>::RefConstT a2,
typename UbTypeOp<P3>::RefConstT a3 = UbNullT(),
@@ -497,7 +497,7 @@ public:
using BaseT = UbDuo<P1, P2>;
// constructor:
- UbTuple() {}
+ UbTuple() = default;
UbTuple( typename UbTypeOp<P1>::RefConstT a1,
typename UbTypeOp<P2>::RefConstT a2,
typename UbTypeOp<UbNullT>::RefConstT = UbNullT(),
@@ -528,7 +528,7 @@ public:
using BaseT = UbDuo<P1, void>;
// constructor:
- UbTuple() {}
+ UbTuple() = default;
UbTuple( typename UbTypeOp<P1>::RefConstT a1,
typename UbTypeOp<UbNullT>::RefConstT = UbNullT(),
typename UbTypeOp<UbNullT>::RefConstT = UbNullT(),
diff --git a/src/basics/basics/writer/WbWriter.h b/src/basics/basics/writer/WbWriter.h
index 510c160a9..2775452dd 100644
--- a/src/basics/basics/writer/WbWriter.h
+++ b/src/basics/basics/writer/WbWriter.h
@@ -50,9 +50,7 @@ class WbWriter
public:
//////////////////////////////////////////////////////////////////////////
virtual ~WbWriter()
- {
-
- }
+ = default;
//////////////////////////////////////////////////////////////////////////
//rein virtuelle Methoden
diff --git a/src/basics/geometry3d/GbPoint3D.h b/src/basics/geometry3d/GbPoint3D.h
index 9a8fc2da2..be1a58625 100644
--- a/src/basics/geometry3d/GbPoint3D.h
+++ b/src/basics/geometry3d/GbPoint3D.h
@@ -50,7 +50,7 @@ public:
GbPoint3D();
GbPoint3D(const double& x1, const double& x2, const double& x3);
GbPoint3D(GbPoint3D *point);
- ~GbPoint3D() override {}
+ ~GbPoint3D() override = default;
GbPoint3D* clone() override {return new GbPoint3D(this);}
void finalize() override {}
diff --git a/src/basics/geometry3d/GbSystem3D.h b/src/basics/geometry3d/GbSystem3D.h
index bfe97c3d0..cb1c3905f 100644
--- a/src/basics/geometry3d/GbSystem3D.h
+++ b/src/basics/geometry3d/GbSystem3D.h
@@ -112,7 +112,7 @@ namespace GbSystem3D
public:
PointSet3(int n);
PointSet3(const std::vector<GbPoint3D>& points);
- ~PointSet3(){}
+ ~PointSet3()= default;
void add(const GbPoint3D& point);
void addUnequal(const GbPoint3D& point);
void add(const std::vector<GbPoint3D>& p);
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAdapter.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAdapter.h
index a34f899ae..a58eab737 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAdapter.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAdapter.h
@@ -58,7 +58,7 @@ public:
, algorithmType(-1)
{
}
- virtual ~BCAdapter() {}
+ virtual ~BCAdapter() = default;
//methods
bool isTimeDependent() { return((this->type & TIMEDEPENDENT) == TIMEDEPENDENT); }
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp
index 76094ba5b..c0d93da3a 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.cpp
@@ -40,7 +40,7 @@ const int BCArray3D::INTERFACEFC = -4;
const int BCArray3D::UNDEFINED = -5;
//////////////////////////////////////////////////////////////////////////
-BCArray3D::BCArray3D() {}
+BCArray3D::BCArray3D() = default;
//////////////////////////////////////////////////////////////////////////
BCArray3D::BCArray3D(std::size_t nx1, std::size_t nx2, std::size_t nx3)
{
@@ -52,7 +52,7 @@ BCArray3D::BCArray3D(std::size_t nx1, std::size_t nx2, std::size_t nx3, int val)
bcindexmatrix.resize(nx1, nx2, nx3, val);
}
//////////////////////////////////////////////////////////////////////////
-BCArray3D::~BCArray3D() {}
+BCArray3D::~BCArray3D() = default;
//////////////////////////////////////////////////////////////////////////
void BCArray3D::resize(std::size_t nx1, std::size_t nx2, std::size_t nx3)
{
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.cpp
index 9f4d9eab1..305d0b73d 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.cpp
@@ -39,9 +39,7 @@
#include "BCAlgorithm.h"
BCProcessor::BCProcessor()
-{
-
-}
+= default;
//////////////////////////////////////////////////////////////////////////
BCProcessor::BCProcessor(SPtr<ILBMKernel> kernel)
{
@@ -50,9 +48,7 @@ BCProcessor::BCProcessor(SPtr<ILBMKernel> kernel)
}
//////////////////////////////////////////////////////////////////////////
BCProcessor::~BCProcessor()
-{
-
-}
+= default;
//////////////////////////////////////////////////////////////////////////
SPtr<BCProcessor> BCProcessor::clone(SPtr<ILBMKernel> kernel)
{
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
index 64cf4067a..981624ce7 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
@@ -73,7 +73,7 @@ public:
for(int fdir=D3Q27System::FSTARTDIR; fdir<=D3Q27System::FENDDIR; fdir++)
q[fdir] = -999.;
}
- virtual ~BoundaryConditions() {}
+ virtual ~BoundaryConditions() = default;
virtual bool isEmpty() { return (noslipBoundaryFlags&slipBoundaryFlags&velocityBoundaryFlags&densityBoundaryFlags)==0;}
virtual bool hasBoundaryCondition()
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.cpp
index cd74e2322..081aac982 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.cpp
@@ -37,8 +37,7 @@
#include "UbScheduler.h"
CoProcessor::CoProcessor()
-{
-}
+= default;
CoProcessor::CoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s): grid(grid), scheduler(s)
{
@@ -46,7 +45,5 @@ CoProcessor::CoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s): grid(grid), sc
}
CoProcessor::~CoProcessor()
-{
-
-}
+= default;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.cpp
index e881706ca..43652ec72 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.cpp
@@ -66,8 +66,7 @@ NUPSCounterCoProcessor::NUPSCounterCoProcessor(SPtr<Grid3D> grid, SPtr<UbSchedul
}
//////////////////////////////////////////////////////////////////////////
NUPSCounterCoProcessor::~NUPSCounterCoProcessor()
-{
-}
+= default;
//////////////////////////////////////////////////////////////////////////
void NUPSCounterCoProcessor::process(double step)
{
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp
index f2843380f..5c6870b18 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp
@@ -52,8 +52,7 @@ WriteBlocksCoProcessor::WriteBlocksCoProcessor(SPtr<Grid3D> grid, SPtr<UbSchedul
}
//////////////////////////////////////////////////////////////////////////
WriteBlocksCoProcessor::~WriteBlocksCoProcessor()
-{
-}
+= default;
//////////////////////////////////////////////////////////////////////////
void WriteBlocksCoProcessor::process(double step)
{
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
index 5f2c8f089..0f19edb4b 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
@@ -50,9 +50,7 @@
using namespace std;
WriteBoundaryConditionsCoProcessor::WriteBoundaryConditionsCoProcessor()
-{
-
-}
+= default;
//////////////////////////////////////////////////////////////////////////
WriteBoundaryConditionsCoProcessor::WriteBoundaryConditionsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
const std::string& path, WbWriter* const writer, SPtr<Communicator> comm)
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
index 6d8d0d9f2..b89db187d 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
@@ -61,7 +61,7 @@ public:
//! \param writer is WbWriter object
//! \param comm is Communicator object
WriteBoundaryConditionsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string& path, WbWriter* const writer, SPtr<Communicator> comm);
- ~WriteBoundaryConditionsCoProcessor() override {}
+ ~WriteBoundaryConditionsCoProcessor() override = default;
void process(double step) override;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
index 5a5edcd0c..31bb9ec70 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
@@ -47,9 +47,7 @@
#include "BCArray3D.h"
WriteMacroscopicQuantitiesCoProcessor::WriteMacroscopicQuantitiesCoProcessor()
-{
-
-}
+= default;
//////////////////////////////////////////////////////////////////////////
WriteMacroscopicQuantitiesCoProcessor::WriteMacroscopicQuantitiesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
const std::string& path, WbWriter* const writer,
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
index 9ce47ba63..816999a71 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
@@ -66,7 +66,7 @@ public:
WriteMacroscopicQuantitiesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
const std::string& path, WbWriter* const writer,
SPtr<LBMUnitConverter> conv, SPtr<Communicator> comm);
- ~WriteMacroscopicQuantitiesCoProcessor() override{}
+ ~WriteMacroscopicQuantitiesCoProcessor() override= default;
void process(double step) override;
diff --git a/src/cpu/VirtualFluidsCore/Connectors/Block3DConnector.h b/src/cpu/VirtualFluidsCore/Connectors/Block3DConnector.h
index 0ac8932fe..bffa38f7d 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/Block3DConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/Block3DConnector.h
@@ -48,7 +48,7 @@ class Block3DConnector
public:
Block3DConnector() : sendDir(-1) {}
Block3DConnector(const int& sendDir) : sendDir(sendDir) {}
- virtual ~Block3DConnector() {}
+ virtual ~Block3DConnector() = default;
//!Iniitializes connector
virtual void init()=0;
//!Synchronizes the send-buffer length
diff --git a/src/cpu/VirtualFluidsCore/Connectors/LocalBlock3DConnector.h b/src/cpu/VirtualFluidsCore/Connectors/LocalBlock3DConnector.h
index d7aa81e47..5db3fca28 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/LocalBlock3DConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/LocalBlock3DConnector.h
@@ -49,7 +49,7 @@ public:
{
}
- ~LocalBlock3DConnector() override {}
+ ~LocalBlock3DConnector() override = default;
void sendTransmitterDataSize() override {}
void receiveTransmitterDataSize() override {}
void init() override = 0;
diff --git a/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp
index 85af639e9..bfc92b6ac 100644
--- a/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp
+++ b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp
@@ -35,8 +35,7 @@
#include "EsoTwistD3Q27System.h"
D3Q27EsoTwist3DSplittedVector::D3Q27EsoTwist3DSplittedVector()
-{
-}
+= default;
//////////////////////////////////////////////////////////////////////////
D3Q27EsoTwist3DSplittedVector::D3Q27EsoTwist3DSplittedVector( size_t nx1, size_t nx2, size_t nx3, LBMReal value )
{
@@ -51,9 +50,7 @@ D3Q27EsoTwist3DSplittedVector::D3Q27EsoTwist3DSplittedVector( size_t nx1, size_t
}
//////////////////////////////////////////////////////////////////////////
D3Q27EsoTwist3DSplittedVector::~D3Q27EsoTwist3DSplittedVector()
-{
-
-}
+= default;
//////////////////////////////////////////////////////////////////////////
void D3Q27EsoTwist3DSplittedVector::swap()
{
diff --git a/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h b/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h
index 02c76fff0..8fcc8f97b 100644
--- a/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h
+++ b/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h
@@ -40,8 +40,8 @@
class DistributionArray3D
{
public:
- DistributionArray3D() {};
- virtual ~DistributionArray3D(){};
+ DistributionArray3D() = default;;
+ virtual ~DistributionArray3D()= default;;
//! get number of nodes for x1 direction
virtual size_t getNX1() const = 0;
//! get number of nodes for x2 direction
diff --git a/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h b/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h
index 224d9bbfb..39637f12d 100644
--- a/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h
+++ b/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h
@@ -45,8 +45,8 @@
class EsoTwist3D : public DistributionArray3D
{
public:
- EsoTwist3D(){};
- ~EsoTwist3D() override{};
+ EsoTwist3D()= default;;
+ ~EsoTwist3D() override= default;;
//////////////////////////////////////////////////////////////////////////
void swap() override = 0;
//////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp b/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
index 0af807fcf..d4266e8d9 100644
--- a/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
+++ b/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
@@ -55,9 +55,7 @@ BasicCalculator::BasicCalculator(SPtr<Grid3D> grid, SPtr<UbScheduler> additional
}
//////////////////////////////////////////////////////////////////////////
BasicCalculator::~BasicCalculator()
-{
-
-}
+= default;
//////////////////////////////////////////////////////////////////////////
void BasicCalculator::calculate()
{
diff --git a/src/cpu/VirtualFluidsCore/Grid/Block3D.cpp b/src/cpu/VirtualFluidsCore/Grid/Block3D.cpp
index 9ea9a8410..8c44f2e60 100644
--- a/src/cpu/VirtualFluidsCore/Grid/Block3D.cpp
+++ b/src/cpu/VirtualFluidsCore/Grid/Block3D.cpp
@@ -69,8 +69,7 @@ Block3D::Block3D(int x1, int x2, int x3, int level)
}
//////////////////////////////////////////////////////////////////////////
Block3D::~Block3D()
-{
-}
+= default;
//////////////////////////////////////////////////////////////////////////
bool Block3D::operator==(const Block3D& src) const
{
diff --git a/src/cpu/VirtualFluidsCore/Grid/Calculator.cpp b/src/cpu/VirtualFluidsCore/Grid/Calculator.cpp
index 45de9261c..c6d1f78e4 100644
--- a/src/cpu/VirtualFluidsCore/Grid/Calculator.cpp
+++ b/src/cpu/VirtualFluidsCore/Grid/Calculator.cpp
@@ -76,9 +76,7 @@ Calculator::Calculator(SPtr<Grid3D> grid, SPtr<UbScheduler> additionalGhostLayer
}
//////////////////////////////////////////////////////////////////////////
Calculator::~Calculator()
-{
-
-}
+= default;
//////////////////////////////////////////////////////////////////////////
void Calculator::addCoProcessor(SPtr<CoProcessor> coProcessor)
{
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp
index 7e5b48229..4ae4124e5 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp
@@ -84,9 +84,7 @@ D3Q27Interactor::D3Q27Interactor(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid
}
//////////////////////////////////////////////////////////////////////////
D3Q27Interactor::~D3Q27Interactor()
-{
-
-}
+= default;
//////////////////////////////////////////////////////////////////////////
void D3Q27Interactor::initRayVectors()
{
diff --git a/src/cpu/VirtualFluidsCore/Interactors/Interactor3D.cpp b/src/cpu/VirtualFluidsCore/Interactors/Interactor3D.cpp
index c05fc12ef..31fe0f868 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/Interactor3D.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/Interactor3D.cpp
@@ -86,8 +86,7 @@ Interactor3D::Interactor3D(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid, int
}
//////////////////////////////////////////////////////////////////////////
Interactor3D::~Interactor3D()
-{
-}
+= default;
//////////////////////////////////////////////////////////////////////////
bool Interactor3D::arePointsInsideGeoObject(double minX1, double minX2, double minX3, double maxX1, double maxX2, double maxX3, double delta)
{
diff --git a/src/cpu/VirtualFluidsCore/Interactors/InteractorsHelper.cpp b/src/cpu/VirtualFluidsCore/Interactors/InteractorsHelper.cpp
index 0411b4f19..d645fa1bf 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/InteractorsHelper.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/InteractorsHelper.cpp
@@ -47,9 +47,7 @@ InteractorsHelper::InteractorsHelper(SPtr<Grid3D> grid) :grid(grid)
}
//////////////////////////////////////////////////////////////////////////
InteractorsHelper::~InteractorsHelper()
-{
-
-}
+= default;
//////////////////////////////////////////////////////////////////////////
void InteractorsHelper::addInteractor( SPtr<Interactor3D> interactor )
{
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp
index 072d8cd90..f510d9f58 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp
@@ -51,9 +51,7 @@ CumulantK17LBMKernel::CumulantK17LBMKernel()
}
//////////////////////////////////////////////////////////////////////////
CumulantK17LBMKernel::~CumulantK17LBMKernel(void)
-{
-
-}
+= default;
//////////////////////////////////////////////////////////////////////////
void CumulantK17LBMKernel::initDataSet()
{
diff --git a/src/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h b/src/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h
index ae17171f4..58f5aedba 100644
--- a/src/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h
+++ b/src/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h
@@ -97,7 +97,7 @@ public:
}
- virtual ~LBMUnitConverter() {}
+ virtual ~LBMUnitConverter() = default;
double getRefRhoLb() { return refRhoLb; }
diff --git a/src/cpu/VirtualFluidsCore/Parallel/Communicator.h b/src/cpu/VirtualFluidsCore/Parallel/Communicator.h
index e14dec62b..d6488a7a8 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/Communicator.h
+++ b/src/cpu/VirtualFluidsCore/Parallel/Communicator.h
@@ -43,7 +43,7 @@
class Communicator
{
public:
- virtual ~Communicator(){}
+ virtual ~Communicator()= default;
static SPtr<Communicator> getInstance();
virtual int getProcessID() = 0;
virtual int getNumberOfProcesses() = 0;
@@ -51,8 +51,8 @@ public:
virtual int getRoot() = 0;
virtual int getProcessRoot() = 0;
protected:
- Communicator(){}
- Communicator( const Communicator& ){}
+ Communicator()= default;
+ Communicator( const Communicator& )= default;
static SPtr<Communicator> instance;
};
diff --git a/src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp b/src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp
index fcc20a4cd..c28a802c9 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp
+++ b/src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp
@@ -34,12 +34,10 @@
#include "NullCommunicator.h"
NullCommunicator::NullCommunicator()
-{
-}
+= default;
//////////////////////////////////////////////////////////////////////////
NullCommunicator::~NullCommunicator()
-{
-}
+= default;
//////////////////////////////////////////////////////////////////////////
SPtr<Communicator> NullCommunicator::getInstance()
{
diff --git a/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h
index f333f521c..e1e50969c 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/Block3DVisitor.h
@@ -52,8 +52,7 @@ public:
}
virtual ~Block3DVisitor()
- {
- }
+ = default;
virtual void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) = 0;
diff --git a/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
index e75d09c2c..7f1e57b24 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
@@ -49,9 +49,7 @@ Block3DVisitor(0, Grid3DSystem::MAXLEVEL)
}
//////////////////////////////////////////////////////////////////////////
BoundaryConditionsBlockVisitor::~BoundaryConditionsBlockVisitor()
-{
-
-}
+= default;
//////////////////////////////////////////////////////////////////////////
void BoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
{
diff --git a/src/cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.h
index 8f78f1986..65db6fa10 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/GenBlocksGridVisitor.h
@@ -48,7 +48,7 @@ class GenBlocksGridVisitor : public Grid3DVisitor
{
public:
GenBlocksGridVisitor(SPtr<GbObject3D> boundingBox);
- ~GenBlocksGridVisitor() override{}
+ ~GenBlocksGridVisitor() override= default;
void visit(SPtr<Grid3D> grid) override;
diff --git a/src/cpu/VirtualFluidsCore/Visitors/Grid3DVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/Grid3DVisitor.h
index 2d836daf7..5484ac442 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/Grid3DVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/Grid3DVisitor.h
@@ -43,8 +43,8 @@ class Grid3D;
class Grid3DVisitor
{
public:
- Grid3DVisitor() {}
- virtual ~Grid3DVisitor() {}
+ Grid3DVisitor() = default;
+ virtual ~Grid3DVisitor() = default;
virtual void visit(SPtr<Grid3D> grid) = 0;
};
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.h
index 0091c9bdb..5db362a3b 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetBcBlocksBlockVisitor.h
@@ -47,7 +47,7 @@ class SetBcBlocksBlockVisitor : public Block3DVisitor
{
public:
SetBcBlocksBlockVisitor(SPtr<Interactor3D> interactor);
- ~SetBcBlocksBlockVisitor() override {}
+ ~SetBcBlocksBlockVisitor() override = default;
void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) override;
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
index 414579d1c..85171b549 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
@@ -42,8 +42,7 @@ SetConnectorsBlockVisitor::SetConnectorsBlockVisitor(SPtr<Communicator> comm, bo
}
//////////////////////////////////////////////////////////////////////////
SetConnectorsBlockVisitor::~SetConnectorsBlockVisitor(void)
-{
-}
+= default;
//////////////////////////////////////////////////////////////////////////
void SetConnectorsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
{
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.h
index d323cb5f5..af0b0b96b 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.h
@@ -50,7 +50,7 @@ public:
enum Action { NewKernel, ChangeKernel, ChangeKernelWithData};
SetKernelBlockVisitor(SPtr<LBMKernel> kernel, LBMReal nue, SetKernelBlockVisitor::Action action = SetKernelBlockVisitor::NewKernel);
- ~SetKernelBlockVisitor() override {}
+ ~SetKernelBlockVisitor() override = default;
void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) override;
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.h
index 3630deee4..fe5456be9 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.h
@@ -47,7 +47,7 @@ class SetSolidBlocksBlockVisitor : public Block3DVisitor
{
public:
SetSolidBlocksBlockVisitor(SPtr<Interactor3D> interactor);
- ~SetSolidBlocksBlockVisitor() override {}
+ ~SetSolidBlocksBlockVisitor() override = default;
void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) override;
--
GitLab