diff --git a/src/basics/basics/memory/MbSmartPtrBase.h b/src/basics/basics/memory/MbSmartPtrBase.h
index bd8af59096a5edecd81b1ad8df7e876e2c28f9b9..ee81baa535b81efe6316a0b59ca74a8b98e0b6b1 100644
--- a/src/basics/basics/memory/MbSmartPtrBase.h
+++ b/src/basics/basics/memory/MbSmartPtrBase.h
@@ -28,7 +28,7 @@ class MbSmartPtrBase
    class MbSmartPtrBaseMap
    {
    private:
-      MbSmartPtrBaseMap() { }
+      MbSmartPtrBaseMap() = default;
       MbSmartPtrBaseMap( const MbSmartPtrBaseMap& );                  //no copy allowed
       const MbSmartPtrBaseMap& operator=( const MbSmartPtrBaseMap& ); //no copy allowed
 
@@ -39,8 +39,8 @@ class MbSmartPtrBase
    };
 
 protected:
-   MbSmartPtrBase() {}
-   virtual ~MbSmartPtrBase() {}
+   MbSmartPtrBase() = default;
+   virtual ~MbSmartPtrBase() = default;
    bool addRef(void* p);
 	bool releaseRef(void* p);
    bool removeFromGC(void* ptr) const;
diff --git a/src/basics/basics/transmitter/TbTransmitter.h b/src/basics/basics/transmitter/TbTransmitter.h
index 85b57baa9c995509ec8bcbb4c846be5a93a6a14a..ba00490445bc16ed7c61bd858ca47cc4969e8977 100644
--- a/src/basics/basics/transmitter/TbTransmitter.h
+++ b/src/basics/basics/transmitter/TbTransmitter.h
@@ -33,7 +33,7 @@ public:
    using value_type = T;
 
 public:
-   TbTransmitter() {}
+   TbTransmitter() = default;
    virtual ~TbTransmitter()  {  /*std::cout<<typeid(*this).name()<<" dtor"<<std::endl;*/  }
 
    virtual bool isLocalTransmitter()  const = 0;
diff --git a/src/basics/geometry3d/GbHalfSpaceKrischan3D.h b/src/basics/geometry3d/GbHalfSpaceKrischan3D.h
index 82aaa7919da6dbd190695916e1a48145bd138dbc..d3769a5f664ca060f2eeb51691fd81dd3bebc5ab 100644
--- a/src/basics/geometry3d/GbHalfSpaceKrischan3D.h
+++ b/src/basics/geometry3d/GbHalfSpaceKrischan3D.h
@@ -40,7 +40,7 @@ public:
                  , const double& p3x, const double& p3y, const double& p3z );
 
    /*=======================================================*/
-   ~GbHalfSpaceKrischan3D() override { }
+   ~GbHalfSpaceKrischan3D() override = default;
    /*=======================================================*/
    std::string getTypeID() {return "GbHalfSpaceKrischan3D"; }
    /*=============================================*/
diff --git a/src/basics/geometry3d/GbObjectGroup3D.cpp b/src/basics/geometry3d/GbObjectGroup3D.cpp
index 31debedd96176054c11d497764d8884117359e65..f96b9246aa80a4a37b51077b9956aee08c9ba4f4 100644
--- a/src/basics/geometry3d/GbObjectGroup3D.cpp
+++ b/src/basics/geometry3d/GbObjectGroup3D.cpp
@@ -13,8 +13,7 @@ GbObjectGroup3D::GbObjectGroup3D()
 }
 /*=====================================================*/
 GbObjectGroup3D::~GbObjectGroup3D()
-{
-}
+= default;
 /*=====================================================*/
 void GbObjectGroup3D::finalize()
 {
diff --git a/src/basics/geometry3d/GbQuadFaceMesh3D.h b/src/basics/geometry3d/GbQuadFaceMesh3D.h
index 0a754d75693c87976b28423c693d81125ad747b2..4a623b0f767d36a01568d489c745d606449d790d 100644
--- a/src/basics/geometry3d/GbQuadFaceMesh3D.h
+++ b/src/basics/geometry3d/GbQuadFaceMesh3D.h
@@ -33,7 +33,7 @@ public:
    class Vertex
    {
    public:
-      Vertex(){}
+      Vertex()= default;
       Vertex(float x, float y, float z)
       {
          this->x=x;
@@ -46,7 +46,7 @@ public:
    class QuadFace
    {
    public:
-      QuadFace() {}
+      QuadFace() = default;
       QuadFace(int v1, int v2, int v3, int v4)
       {
          this->vertex1=v1;
diff --git a/src/basics/geometry3d/GbVoxelMatrix3D.h b/src/basics/geometry3d/GbVoxelMatrix3D.h
index 48e72e9218605a4a3830356eac9a3255346e1505..af02aa2ad4f7d882b31b1c555dafddebe2ba2f13 100644
--- a/src/basics/geometry3d/GbVoxelMatrix3D.h
+++ b/src/basics/geometry3d/GbVoxelMatrix3D.h
@@ -32,7 +32,7 @@ public:
    GbVoxelMatrix3D();
    GbVoxelMatrix3D(int nx1, int nx2, int nx3, float initVal, double lowerThreshold = 0, double upperThreshold = 0);
    GbVoxelMatrix3D(const Matrix3D& voxelMatrix, double lowerThreshold = 0, double upperThreshold = 0);
-   ~GbVoxelMatrix3D() override {}
+   ~GbVoxelMatrix3D() override = default;
 
    void finalize() override {};
    GbVoxelMatrix3D* clone() override;
diff --git a/src/basics/geometry3d/KdTree/intersectionhandler/KdLineIntersectionHandler.h b/src/basics/geometry3d/KdTree/intersectionhandler/KdLineIntersectionHandler.h
index d52e2905cc30777326bf2ca04ed12366f3a9679b..156dd720b4719a62423efc50bd616a249fe2a516 100644
--- a/src/basics/geometry3d/KdTree/intersectionhandler/KdLineIntersectionHandler.h
+++ b/src/basics/geometry3d/KdTree/intersectionhandler/KdLineIntersectionHandler.h
@@ -19,7 +19,7 @@ namespace Kd
    {
    public:
       virtual bool intersectLine(const UbTuple<T,T,T>& n1, const UbTuple<T,T,T>& n2, Node<T>& parent, Node<T>*& child1, Node<T>*& child2) const = 0;
-      virtual ~LineIntersectionHandler() {}
+      virtual ~LineIntersectionHandler() = default;
    };
 }
 
diff --git a/src/basics/geometry3d/KdTree/intersectionhandler/KdRayIntersectionHandler.h b/src/basics/geometry3d/KdTree/intersectionhandler/KdRayIntersectionHandler.h
index 2e0740ce8633e3a7b2410411234fa5dcb9149fea..99803aa152b41033c638b84500f1f2911c6b142d 100644
--- a/src/basics/geometry3d/KdTree/intersectionhandler/KdRayIntersectionHandler.h
+++ b/src/basics/geometry3d/KdTree/intersectionhandler/KdRayIntersectionHandler.h
@@ -13,7 +13,7 @@ namespace Kd
    {
    public:
       virtual int intersectRay(const Ray<T>& ray, Node<T>& parent, Node<T>*& child1, Node<T>*& child2, std::set< UbKeys::Key3<int> >& mailbox) const = 0;
-      virtual ~RayIntersectionHandler() {}
+      virtual ~RayIntersectionHandler() = default;
    };
 }
 
diff --git a/src/basics/geometry3d/KdTree/splitalgorithms/KdSplitAlgorithm.h b/src/basics/geometry3d/KdTree/splitalgorithms/KdSplitAlgorithm.h
index d50d972ff2b5582d0ec3963763d2bd68d2fa24ed..4a8caa6975e1e3d007c9df25f6e6d65788503629 100644
--- a/src/basics/geometry3d/KdTree/splitalgorithms/KdSplitAlgorithm.h
+++ b/src/basics/geometry3d/KdTree/splitalgorithms/KdSplitAlgorithm.h
@@ -18,7 +18,7 @@ namespace Kd
    public:
       virtual SplitCandidate<T> findBestSplitCandidate(const int& level, const int& maxLevel, Node<T>& node ) const = 0;
       virtual void distributeTriFaces(const SplitCandidate<T>& candidate, std::vector<GbTriFaceMesh3D::TriFace>& triFacesForChild1, std::vector<GbTriFaceMesh3D::TriFace>& triFacesForChild2, Node<T>& node) const=0;
-      virtual ~SplitAlgorithm() {}
+      virtual ~SplitAlgorithm() = default;
    };
 }
 
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp
index ce59be23325566d36823b4c6c55d4efc203a640a..05d31244a6c568596a47d00d2bf660230855c2c5 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp
@@ -10,8 +10,7 @@ EqDensityBCAlgorithm::EqDensityBCAlgorithm()
 }
 //////////////////////////////////////////////////////////////////////////
 EqDensityBCAlgorithm::~EqDensityBCAlgorithm()
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 SPtr<BCAlgorithm> EqDensityBCAlgorithm::clone()
 {
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.cpp
index 5dcd1b7272fb7e0f604f3d8434350dd1b9c049cc..d8e86690449a935c26d410def675e9a08416f114 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.cpp
@@ -9,8 +9,7 @@ HighViscosityNoSlipBCAlgorithm::HighViscosityNoSlipBCAlgorithm()
 }
 //////////////////////////////////////////////////////////////////////////
 HighViscosityNoSlipBCAlgorithm::~HighViscosityNoSlipBCAlgorithm()
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 SPtr<BCAlgorithm> HighViscosityNoSlipBCAlgorithm::clone()
 {
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp
index 305aecd100d3e0d711dc81612d93891733f429c5..87994c7368916679adafa7ed80ade42c87ce0838 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp
@@ -10,8 +10,7 @@ NonEqDensityBCAlgorithm::NonEqDensityBCAlgorithm()
 }
 //////////////////////////////////////////////////////////////////////////
 NonEqDensityBCAlgorithm::~NonEqDensityBCAlgorithm()
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 SPtr<BCAlgorithm> NonEqDensityBCAlgorithm::clone()
 {
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.cpp
index d02daf91e9c9c967a08b4d7839a781f828b55d81..6cf262bd638900b14368011fc37f14aa8a5f5ab7 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.cpp
@@ -12,8 +12,7 @@ NonReflectingOutflowBCAlgorithm::NonReflectingOutflowBCAlgorithm()
 }
 //////////////////////////////////////////////////////////////////////////
 NonReflectingOutflowBCAlgorithm::~NonReflectingOutflowBCAlgorithm()
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 SPtr<BCAlgorithm> NonReflectingOutflowBCAlgorithm::clone()
 {
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp
index 08ad53dadd8f2446cc08f946e1f5e18ee7fea013..f61b1fcfb37e526d377869f31567dd9c7668e321 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp
@@ -9,9 +9,7 @@ SlipBCAlgorithm::SlipBCAlgorithm()
 }
 //////////////////////////////////////////////////////////////////////////
 SlipBCAlgorithm::~SlipBCAlgorithm()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 SPtr<BCAlgorithm> SlipBCAlgorithm::clone()
 {
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.cpp
index ba8b1323bb6c661f81acc2dd0fa85f22deefcb11..39c427a53e91368c9e490a183ae6c70173e0a9fd 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.cpp
@@ -11,9 +11,7 @@ ThinWallNoSlipBCAlgorithm::ThinWallNoSlipBCAlgorithm()
 }
 //////////////////////////////////////////////////////////////////////////
 ThinWallNoSlipBCAlgorithm::~ThinWallNoSlipBCAlgorithm()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 SPtr<BCAlgorithm> ThinWallNoSlipBCAlgorithm::clone()
 {
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
index 0655f1d49de773fd7eb68f3e32ebac991946f62e..7ebad4fa02b71f657a7b509759ac9cafae5b6244 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
@@ -9,9 +9,7 @@ VelocityWithDensityBCAlgorithm::VelocityWithDensityBCAlgorithm()
 }
 //////////////////////////////////////////////////////////////////////////
 VelocityWithDensityBCAlgorithm::~VelocityWithDensityBCAlgorithm()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 SPtr<BCAlgorithm> VelocityWithDensityBCAlgorithm::clone()
 {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
index bf52598b05a588edb9609a100637924828f9b609..131c2ff7b9aba9fca1c359f1b952d07d5d97fa4e 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
@@ -16,9 +16,7 @@
 using namespace std;
 
 AverageValuesCoProcessor::AverageValuesCoProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 AverageValuesCoProcessor::AverageValuesCoProcessor(SPtr<Grid3D> grid, const std::string& path,	WbWriter* const writer, 
    SPtr<UbScheduler> s, SPtr<UbScheduler> Avs, SPtr<UbScheduler> rsMeans, SPtr<UbScheduler> rsRMS, bool restart)
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.cpp
index 97a74583056ef3548e9550e0f1d76df93b7596a0..d66562b2d48b5033247433125f7855d43b24c60b 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.cpp
@@ -53,9 +53,7 @@ CalculateForcesCoProcessor::CalculateForcesCoProcessor( SPtr<Grid3D> grid, SPtr<
 }
 //////////////////////////////////////////////////////////////////////////
 CalculateForcesCoProcessor::~CalculateForcesCoProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void CalculateForcesCoProcessor::process( double step )
 {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.cpp
index c06dccb3ef008c9247e298e06ad4792a18197cb5..040d5f94438cd0c4a8c5bed33bf1a1d6824b2d8c 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.cpp
@@ -29,8 +29,7 @@ DecreaseViscosityCoProcessor::DecreaseViscosityCoProcessor(SPtr<Grid3D> grid, SP
 }
 //////////////////////////////////////////////////////////////////////////
 DecreaseViscosityCoProcessor::~DecreaseViscosityCoProcessor() 
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void DecreaseViscosityCoProcessor::process(double step)
 {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp
index 6da4749b8f3ee1b0696c359be66d8478997ffe02..f8d103396caa187a8def6296ca201e729223bcd1 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp
@@ -26,9 +26,7 @@ EmergencyExitCoProcessor::EmergencyExitCoProcessor( SPtr<Grid3D> grid, SPtr<UbSc
 }
 //////////////////////////////////////////////////////////////////////////
 EmergencyExitCoProcessor::~EmergencyExitCoProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void EmergencyExitCoProcessor::process( double step )
 {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp
index 1bdf0d57f5244f3c22d3fddbf33c3cc3d441f2cc..40a8a61f3a823866abafa6b2f1e63d4c659f11a7 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp
@@ -19,9 +19,7 @@ ForceCalculator::ForceCalculator(SPtr<Communicator> comm) : comm(comm), forceX1g
 }
 
 ForceCalculator::~ForceCalculator()
-{
-
-}
+= default;
 
 
 
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
index 84e5b810f5bfff3c80a15cf0c3f606ed2a170e99..474a4947e01e698cf13490dd516b5c45fa68c62a 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
@@ -43,8 +43,7 @@ IntegrateValuesHelper::IntegrateValuesHelper(SPtr<Grid3D> grid, SPtr<Communicato
 }
 //////////////////////////////////////////////////////////////////////////
 IntegrateValuesHelper::~IntegrateValuesHelper()
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void IntegrateValuesHelper::init(int level)
 {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h
index e3559b93b7d2e790d9328393f58e5e3b816c9e6f..ba8ec0ecfe88b67dad14eb7118c2243c6ca0ed6a 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h
@@ -26,7 +26,7 @@ public:
 enum Direction {X1, X2, X3};
 public:
    LineTimeSeriesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string& path, SPtr<GbLine3D> line, int level,SPtr<Communicator> comm);
-   ~LineTimeSeriesCoProcessor() override{}
+   ~LineTimeSeriesCoProcessor() override= default;
 
    void process(double step) override;
    void writeLine(const std::string& path);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
index eb412b499bab44a2ba340170d0dd235c1d47a00a..8ea0e64d5a937eabd5083b46dbc111a904a388ea 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
@@ -19,8 +19,7 @@ MicrophoneArrayCoProcessor::MicrophoneArrayCoProcessor(SPtr<Grid3D> grid, SPtr<U
 }
 
 MicrophoneArrayCoProcessor::~MicrophoneArrayCoProcessor()
-{
-}
+= default;
 
 void MicrophoneArrayCoProcessor::process(double step)
 {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
index ced56bb057afc1ea3bfafab577f814fe05cf2e0a..cd36bda413e1b3c4f3e14d405e992bad4cea9945 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
@@ -25,9 +25,7 @@ PressureCoefficientCoProcessor::PressureCoefficientCoProcessor(SPtr<Grid3D> grid
 }
 //////////////////////////////////////////////////////////////////////////
 PressureCoefficientCoProcessor::~PressureCoefficientCoProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void PressureCoefficientCoProcessor::process(double step)
 {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.cpp
index 6de9989b6ae2d3f86d3dcbe956824f7ccd042ad0..46399e0bd0033e6437744f5e99bb847e7134a249 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.cpp
@@ -51,8 +51,7 @@ PressureDifferenceCoProcessor::PressureDifferenceCoProcessor(SPtr<Grid3D> grid,
 }
 //////////////////////////////////////////////////////////////////////////
 PressureDifferenceCoProcessor::~PressureDifferenceCoProcessor() 
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void PressureDifferenceCoProcessor::process(double step)
 {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
index 784ada9972aea9b04b4d0f22cbd8555ee506f6d2..c36e793d3a22f4bc6557d1c5865e731f57c739de 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
@@ -42,9 +42,7 @@ ShearStressCoProcessor::ShearStressCoProcessor(SPtr<Grid3D> grid, const std::str
 }
 //////////////////////////////////////////////////////////////////////////
 ShearStressCoProcessor::~ShearStressCoProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void ShearStressCoProcessor::process( double step )
 {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.h
index 62843ab2ef3605df19036636ff5e90ad870c0089..a054fa36eb02b6dfb825472cea549f90c00c558f 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.h
@@ -25,7 +25,7 @@ class ShearStressCoProcessor: public CoProcessor
 {
 public:
    //! Default constructor
-   ShearStressCoProcessor(){}
+   ShearStressCoProcessor()= default;
    //! Constructor
    ShearStressCoProcessor(SPtr<Grid3D> grid, const std::string& path, WbWriter* const writer,
        SPtr<UbScheduler> s, SPtr<UbScheduler> rs);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
index d3b09f7ce8d96e843abd2f96986cb59fb7f0672f..88e7b5a8700c1ea10da94171959cdb002f4f51d0 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
@@ -15,9 +15,7 @@
 
 
 TimeAveragedValuesCoProcessor::TimeAveragedValuesCoProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 TimeAveragedValuesCoProcessor::TimeAveragedValuesCoProcessor(SPtr<Grid3D> grid, const std::string& path, WbWriter* const writer,
    SPtr<UbScheduler> s, SPtr<Communicator> comm, int options)
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.cpp
index ea687cfba6770d06f35539bc43407f317d6623e0..d1308a1102592f8ced9c781a7a31fa4d8fb65dd8 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.cpp
@@ -10,9 +10,7 @@ TimeDependentBCCoProcessor::TimeDependentBCCoProcessor(SPtr<Grid3D> grid, SPtr<U
 }
 //////////////////////////////////////////////////////////////////////////
 TimeDependentBCCoProcessor::~TimeDependentBCCoProcessor() 
-{
-	
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void TimeDependentBCCoProcessor::process(double step)
 {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.cpp
index c3297d04e01071c0aade09938135d1b71e418adc..8f0ff8c9975e78d639345f7c86d69bd0fbbf4788 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.cpp
@@ -45,8 +45,7 @@ TimeseriesCoProcessor::TimeseriesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler
 }
 //////////////////////////////////////////////////////////////////////////
 TimeseriesCoProcessor::~TimeseriesCoProcessor() 
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void TimeseriesCoProcessor::process(double step)
 {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.cpp
index 66f01407e46fd3e699037e395fa5b3b50367a434..0b66c12875bb7a7174f2f1501ae6c3731a257246 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.cpp
@@ -11,9 +11,7 @@ WriteGbObjectsCoProcessor::WriteGbObjectsCoProcessor(SPtr<Grid3D> grid, SPtr<UbS
 }
 //////////////////////////////////////////////////////////////////////////
 WriteGbObjectsCoProcessor::~WriteGbObjectsCoProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void WriteGbObjectsCoProcessor::process(double step)
 {
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp
index 455de36b8c054b1f0b47a78451a28adf96852f31..754cfb77b18cd290d2f8344766e18a2112273272 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp
@@ -15,9 +15,7 @@
 #include "GbObject3D.h"
 
 WriteMQFromSelectionCoProcessor::WriteMQFromSelectionCoProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 WriteMQFromSelectionCoProcessor::WriteMQFromSelectionCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
                                                                                  SPtr<GbObject3D> gbObject,
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h
index 7df84b9f514d1001b09e8057a49e27a05eee7936..a10ab7f2707b71daf4468523f10c92ddc6f04826 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h
@@ -27,7 +27,7 @@ public:
                                            SPtr<GbObject3D> gbObject,
                                            const std::string& path, WbWriter* const writer, 
                                            SPtr<LBMUnitConverter> conv, SPtr<Communicator> comm);
-   ~WriteMQFromSelectionCoProcessor() override{}
+   ~WriteMQFromSelectionCoProcessor() override= default;
 
    void process(double step) override;
 
diff --git a/src/cpu/VirtualFluidsCore/Connectors/Block3DConnectorFactory.cpp b/src/cpu/VirtualFluidsCore/Connectors/Block3DConnectorFactory.cpp
index b8889d537afdf2152c2dea7c3bfc9668a004fd9d..af4cefa6778fdf130a530b125ec2a321eae6664b 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/Block3DConnectorFactory.cpp
+++ b/src/cpu/VirtualFluidsCore/Connectors/Block3DConnectorFactory.cpp
@@ -5,12 +5,10 @@
 #include "FineToCoarseNodeSetBlock3DConnector.h"
 
 Block3DConnectorFactory::Block3DConnectorFactory()
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 Block3DConnectorFactory::~Block3DConnectorFactory()
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 SPtr<Block3DConnector> Block3DConnectorFactory::createSameLevelDirectConnector(SPtr<Block3D> from, SPtr<Block3D> to, int sendDir)
 {
diff --git a/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineBlock3DConnector.h b/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineBlock3DConnector.h
index 98199fdde3f951492c2894e2642a7010788c2923..54798eaf848c9e2550ff5c2bbc4de3b6888c8f60 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineBlock3DConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineBlock3DConnector.h
@@ -49,7 +49,7 @@ public:
       VectorTransmitterPtr sender11, VectorTransmitterPtr receiver11,
       int sendDir, InterpolationProcessorPtr iprocessor);
 
-   ~CoarseToFineBlock3DConnector() override {}
+   ~CoarseToFineBlock3DConnector() override = default;
 
    bool isLocalConnector() override;
    bool isRemoteConnector() override;
diff --git a/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h b/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h
index cd7bd1a41b0c44fc46118d147c6947098556c7c9..323d0349f26417a9b9ece9cca73289ac5e71caa8 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h
@@ -11,8 +11,8 @@
 class ConnectorFactory
 {
 public:
-   ConnectorFactory() {};
-   virtual ~ConnectorFactory() {};
+   ConnectorFactory() = default;;
+   virtual ~ConnectorFactory() = default;;
 
    virtual SPtr<Block3DConnector> createSameLevelDirectConnector(SPtr<Block3D> from, SPtr<Block3D> to, int sendDir) = 0;
    virtual SPtr<Block3DConnector> createSameLevelVectorConnector(SPtr<Block3D> block,
diff --git a/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.cpp b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.cpp
index cf6a46c8a951323da0f82611fdfddb4db509d91a..77da3c462c156e080d763d98ccd36b7d056d03d7 100644
--- a/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.cpp
+++ b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.cpp
@@ -3,8 +3,7 @@
 #include "EsoTwistD3Q27System.h"
 
 D3Q27EsoTwist3DSoA::D3Q27EsoTwist3DSoA()
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 D3Q27EsoTwist3DSoA::D3Q27EsoTwist3DSoA( const size_t& nx1, const size_t& nx2, const size_t& nx3, LBMReal value )
 {
@@ -42,9 +41,7 @@ D3Q27EsoTwist3DSoA::D3Q27EsoTwist3DSoA( const size_t& nx1, const size_t& nx2, co
 }
 //////////////////////////////////////////////////////////////////////////
 D3Q27EsoTwist3DSoA::~D3Q27EsoTwist3DSoA()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void D3Q27EsoTwist3DSoA::swap()
 {
diff --git a/src/cpu/VirtualFluidsCore/Data/VoidData3D.h b/src/cpu/VirtualFluidsCore/Data/VoidData3D.h
index 7d5e08be5fe3c867b1d1138d5368128ab4c5211c..b4a9b2ff6010c7c2997691a435329fd14156ff5d 100644
--- a/src/cpu/VirtualFluidsCore/Data/VoidData3D.h
+++ b/src/cpu/VirtualFluidsCore/Data/VoidData3D.h
@@ -7,14 +7,14 @@
 class VoidData3D : public EsoTwist3D
 {
 public:
-   VoidData3D() {};
+   VoidData3D() = default;;
    VoidData3D (size_t nx1, size_t nx2, size_t nx3, LBMReal  /*value*/) 
    {
       this->NX1 = nx1;
       this->NX2 = nx2;
       this->NX3 = nx3;
    }
-    ~VoidData3D() override {};
+    ~VoidData3D() override = default;;
     size_t getNX1() const override { return NX1;}
     size_t getNX2() const override { return NX2;}
     size_t getNX3() const override { return NX3;}
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
index cf4dff230dfeb2cbab0b584709e2334347f160d2..e4ef7b03719b0373df617f051e2916eb0e830e2e 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
@@ -53,9 +53,7 @@ D3Q27TriFaceMeshInteractor::D3Q27TriFaceMeshInteractor(SPtr<GbTriFaceMesh3D> tri
 }
 //////////////////////////////////////////////////////////////////////////
 D3Q27TriFaceMeshInteractor::~D3Q27TriFaceMeshInteractor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void D3Q27TriFaceMeshInteractor::initInteractor(const double& timeStep)
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp
index c6b130bdd52e3f88dadac3a3fe8be3d8c9973e98..b2f5cd60fe90ef92a6b5a9a40157f2ccf3d17494 100644
--- a/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp
@@ -15,9 +15,7 @@ BGKLBMKernel::BGKLBMKernel()
 }
 //////////////////////////////////////////////////////////////////////////
 BGKLBMKernel::~BGKLBMKernel(void)
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void BGKLBMKernel::initDataSet()
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
index 055b0f770219d4df04f14d21d0df43f10441a8c6..a35eb6fe7ffc7fac884c6bba851fec9035e8dcb4 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
@@ -20,9 +20,7 @@ CompressibleCumulant4thOrderViscosityLBMKernel::CompressibleCumulant4thOrderVisc
 }
 //////////////////////////////////////////////////////////////////////////
 CompressibleCumulant4thOrderViscosityLBMKernel::~CompressibleCumulant4thOrderViscosityLBMKernel(void)
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void CompressibleCumulant4thOrderViscosityLBMKernel::initDataSet()
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
index c63a971f8b74c1cacf2c0c4a7a00961c2593a230..a018f7bb91a45677a4277fcdef6197f0e39c9cda 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
@@ -22,9 +22,7 @@ CompressibleCumulantLBMKernel::CompressibleCumulantLBMKernel()
 }
 //////////////////////////////////////////////////////////////////////////
 CompressibleCumulantLBMKernel::~CompressibleCumulantLBMKernel(void)
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void CompressibleCumulantLBMKernel::initDataSet()
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
index 013303f8aed2f72f981649a415fafe7ba1cad959..60b99de306b916ad4ccb53b33db396465c9084e5 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
@@ -17,9 +17,7 @@ CompressibleOffsetInterpolationProcessor::CompressibleOffsetInterpolationProcess
 }
 //////////////////////////////////////////////////////////////////////////
 CompressibleOffsetInterpolationProcessor::~CompressibleOffsetInterpolationProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 InterpolationProcessorPtr CompressibleOffsetInterpolationProcessor::clone()
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
index 211bf2729270204e708c93ab8addbce2ad708fbc..0cb62c2dc688b3c2da9485dfcce487cfb37bad71 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
@@ -22,9 +22,7 @@ CompressibleOffsetMomentsInterpolationProcessor::CompressibleOffsetMomentsInterp
 }
 //////////////////////////////////////////////////////////////////////////
 CompressibleOffsetMomentsInterpolationProcessor::~CompressibleOffsetMomentsInterpolationProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 InterpolationProcessorPtr CompressibleOffsetMomentsInterpolationProcessor::clone()
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
index 4f3822b2be713db219bc5d68cfb1578ad9652343..2ecce9ba79267dd1d9ae2e4b2ee30eb528aa20af 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
@@ -20,9 +20,7 @@ CompressibleOffsetSquarePressureInterpolationProcessor::CompressibleOffsetSquare
 }
 //////////////////////////////////////////////////////////////////////////
 CompressibleOffsetSquarePressureInterpolationProcessor::~CompressibleOffsetSquarePressureInterpolationProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 InterpolationProcessorPtr CompressibleOffsetSquarePressureInterpolationProcessor::clone()
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
index dbeb77a1c952ec29bb2d8440d864e9d46fe93d36..4e6c88fe141556bfcd607828de1e75249b82acc8 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
@@ -19,9 +19,7 @@ IncompressibleCumulantLBMKernel::IncompressibleCumulantLBMKernel()
 }
 //////////////////////////////////////////////////////////////////////////
 IncompressibleCumulantLBMKernel::~IncompressibleCumulantLBMKernel(void)
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void IncompressibleCumulantLBMKernel::initDataSet()
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp
index c84776771f7eb6e7d14ce085cba6244f47269317..7a6ff973cf15dc0cb204c8f9e3a457c2a1436a53 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp
@@ -12,14 +12,10 @@ using namespace UbMath;
 
 //////////////////////////////////////////////////////////////////////////
 IncompressibleCumulantWithSpongeLayerLBMKernel::IncompressibleCumulantWithSpongeLayerLBMKernel()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 IncompressibleCumulantWithSpongeLayerLBMKernel::~IncompressibleCumulantWithSpongeLayerLBMKernel(void)
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void IncompressibleCumulantWithSpongeLayerLBMKernel::initDataSet()
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
index 4183c509bd095997c4603a7150c75ae76cdc3dd1..8bcab36fa93401431d5b6c67ab03fb7e0bf6951e 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
@@ -17,9 +17,7 @@ IncompressibleOffsetInterpolationProcessor::IncompressibleOffsetInterpolationPro
 }
 //////////////////////////////////////////////////////////////////////////
 IncompressibleOffsetInterpolationProcessor::~IncompressibleOffsetInterpolationProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 InterpolationProcessorPtr IncompressibleOffsetInterpolationProcessor::clone()
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp
index 66667b9519241efe9988ade6003e96f5ee35d48f..6a7256997d22e9f226d6a534a7f51801f533a59d 100644
--- a/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp
@@ -12,8 +12,7 @@ InitDensityLBMKernel::InitDensityLBMKernel()
 }
 
 InitDensityLBMKernel::~InitDensityLBMKernel()
-{
-}
+= default;
 
 void InitDensityLBMKernel::initDataSet()
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp b/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
index 5cf4998490fa8e0120bb08b6c36b7d9daaa7fa6e..0942a9f0691b67c6d1e8d7cec938aaaa494f5e45 100644
--- a/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
@@ -8,9 +8,7 @@ InterpolationHelper::InterpolationHelper(InterpolationProcessorPtr iProcessor) :
 }
 //////////////////////////////////////////////////////////////////////////
 InterpolationHelper::~InterpolationHelper()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void InterpolationHelper::interpolate8to1( D3Q27ICell& icellF, LBMReal* icellC, double  /*x1*/, double  /*x2*/, double  /*x3*/, LBMReal omega )
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp
index 4b8b746b720a494889c529682bc3ea02459e8649..8cf695fc7dd173824d63e5fad2f35d73b31bfa7a 100644
--- a/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.cpp
@@ -3,14 +3,10 @@
 
 //////////////////////////////////////////////////////////////////////////
 InterpolationProcessor::InterpolationProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 InterpolationProcessor::~InterpolationProcessor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void InterpolationProcessor::readICell(SPtr<DistributionArray3D> f, D3Q27ICell& icell, int x1, int x2, int x3) 
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp b/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp
index 0fbd8a95b84b0922af40ae818de2cfc7b74f5504..1da1a07ea4713d47c34ad75de5ba3e71fc548759 100644
--- a/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp
@@ -17,9 +17,7 @@ LBMKernelETD3Q27BGK::LBMKernelETD3Q27BGK()
 }
 //////////////////////////////////////////////////////////////////////////
 LBMKernelETD3Q27BGK::~LBMKernelETD3Q27BGK(void)
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void LBMKernelETD3Q27BGK::initDataSet()
 {
diff --git a/src/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.cpp
index cc6bfcf81043e9350bee1c16fdb1718dab5e6c1b..8e4a73a7bd7330947b99d124fb031bcebc314c3b 100644
--- a/src/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.cpp
@@ -4,14 +4,10 @@
 #include "DataSet3D.h"
 
 VoidLBMKernel::VoidLBMKernel()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 VoidLBMKernel::~VoidLBMKernel()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void VoidLBMKernel::initDataSet()
 {
diff --git a/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.cpp b/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.cpp
index 55ab9e5467c777590441661a58907b496650090f..86a8e1e72c4ca2b342bf68abfb360105554c9b44 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.cpp
+++ b/src/cpu/VirtualFluidsCore/Parallel/MetisPartitioner.cpp
@@ -19,9 +19,7 @@ MetisPartitioner::MetisPartitioner()
 }
 //////////////////////////////////////////////////////////////////////////
 MetisPartitioner::~MetisPartitioner()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 idx_t* MetisPartitioner::getMetisOptions()
 {
diff --git a/src/cpu/VirtualFluidsCore/Parallel/PriorityQueueDecompositor.h b/src/cpu/VirtualFluidsCore/Parallel/PriorityQueueDecompositor.h
index 67f1e52d440a9fbc1670f5bedd0561d38ed841e8..a5234fd9583935a155711c9fbd4521713e9a98d4 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/PriorityQueueDecompositor.h
+++ b/src/cpu/VirtualFluidsCore/Parallel/PriorityQueueDecompositor.h
@@ -36,9 +36,7 @@ public:
       }
    }
    virtual ~PriorityQueueDecompositor()
-   {
-
-   }
+   = default;
    void getDecomposition(std::vector< std::vector<T> >& prts)
    {
       for( itOb=objects.begin() ; itOb != objects.end(); itOb++)
diff --git a/src/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.cpp
index 077dadeabafdfe53548735412401aa59231f470c..c0dabd959bded6b2d1657584970623549eb50248 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.cpp
@@ -16,9 +16,7 @@ newBoundaryDensity(newBoundaryDensity)
 }
 //////////////////////////////////////////////////////////////////////////
 ChangeBoundaryDensityBlockVisitor::~ChangeBoundaryDensityBlockVisitor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void ChangeBoundaryDensityBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
 {
diff --git a/src/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.h
index 7f3d59c471f656caed1ade3074ace0cd72a80401..da666fe47ad2fdea78ee512a37f3bcba4ffc0f3c 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.h
@@ -14,7 +14,7 @@ class CheckRatioBlockVisitor : public Block3DVisitor
 public:
    CheckRatioBlockVisitor(int levelDepth, bool includeNotActiveBlocks = true);
 
-   ~CheckRatioBlockVisitor() override {}
+   ~CheckRatioBlockVisitor() override = default;
 
    bool getState();
    void resetState();
diff --git a/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp
index bc94a821fbae57735961651025eb04fc12fdb9b2..5e948fb237d900f42c0caae631a70f775a0983f2 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp
@@ -15,8 +15,7 @@ CoarsenCrossAndInsideGbObjectBlockVisitor::CoarsenCrossAndInsideGbObjectBlockVis
 }
 //////////////////////////////////////////////////////////////////////////
 CoarsenCrossAndInsideGbObjectBlockVisitor::~CoarsenCrossAndInsideGbObjectBlockVisitor()
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void CoarsenCrossAndInsideGbObjectBlockVisitor::visit(const SPtr<Grid3D> grid, SPtr<Block3D> block)
 {
diff --git a/src/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.cpp
index 6248316b5516c6162a254ba8ad9f02a94dc9d8ed..01256a40c3f54e8931312a29fac24d0ad0efafd5 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.cpp
@@ -15,8 +15,7 @@ ConnectorBlockVisitor::ConnectorBlockVisitor(SPtr<Communicator> comm, LBMReal nu
 }
 //////////////////////////////////////////////////////////////////////////
 ConnectorBlockVisitor::~ConnectorBlockVisitor(void)
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void ConnectorBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
 {
diff --git a/src/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.cpp b/src/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.cpp
index 5e24c8696403c19744d9c2c9e4941d3da5b68344..24177504ce65eb2cc34c621077a8e6108fc171f4 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.cpp
@@ -14,9 +14,7 @@ using namespace std;
 
 //////////////////////////////////////////////////////////////////////////
 CreateTransmittersHelper::CreateTransmittersHelper()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void CreateTransmittersHelper::createTransmitters(SPtr<Block3D> sblock, SPtr<Block3D> tblock, int dir, IBlock ib,
                                                         TransmitterPtr& sender, TransmitterPtr& receiver, SPtr<Communicator> comm, TransmitterType tType)
diff --git a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp
index bc6963c18563948ba36499bb9b15b199560a80ff..279714e35fba8e812b56e01b3fc5929e9285cc45 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp
@@ -22,8 +22,7 @@ InitDistributionsWithInterpolationGridVisitor::InitDistributionsWithInterpolatio
 }
 //////////////////////////////////////////////////////////////////////////
 InitDistributionsWithInterpolationGridVisitor::~InitDistributionsWithInterpolationGridVisitor()
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void InitDistributionsWithInterpolationGridVisitor::visit(SPtr<Grid3D> grid)
 {
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.cpp
index 16dcbd43e8d3c410490ed637f37a1cc03f780db1..84258830b8da1c54624bf65c515f177aec788106 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/MetisPartitioningGridVisitor.cpp
@@ -22,9 +22,7 @@ MetisPartitioningGridVisitor::MetisPartitioningGridVisitor(SPtr<Communicator> co
 }
 //////////////////////////////////////////////////////////////////////////
 MetisPartitioningGridVisitor::~MetisPartitioningGridVisitor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void MetisPartitioningGridVisitor::visit(SPtr<Grid3D> grid)
 {
diff --git a/src/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.h
index 15af7a41ac496ae21072a7206272c008eeab3129..49f34438c1db40126f7915ee3080d7352dad9337 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.h
@@ -14,7 +14,7 @@ class OverlapBlockVisitor : public Block3DVisitor
 public:
    OverlapBlockVisitor(int levelDepth, bool includeNotActiveBlocks = true);
    
-   ~OverlapBlockVisitor() override{}
+   ~OverlapBlockVisitor() override= default;
 
    bool isIterative()   { return false; }
 
diff --git a/src/cpu/VirtualFluidsCore/Visitors/RatioBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/RatioBlockVisitor.h
index 21e4daa8f5dd9b20a3ae7da29976b21cf405005a..f3f42d9cfa0613747645783f3939c1be8e3630ce 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/RatioBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/RatioBlockVisitor.h
@@ -14,7 +14,7 @@ class RatioBlockVisitor : public Block3DVisitor
 public:
    RatioBlockVisitor(int levelDepth, bool includeNotActiveBlocks = false);
 
-   ~RatioBlockVisitor() override {}
+   ~RatioBlockVisitor() override = default;
 
    bool expandsByAdaptation() { return this->expandBlocks; }
 
diff --git a/src/cpu/VirtualFluidsCore/Visitors/RatioSmoothBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/RatioSmoothBlockVisitor.h
index 3b7d095f7f645aba94971c17c7263c31914fe7e3..856e5177911d958615f91dc22033958ccd80f760 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/RatioSmoothBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/RatioSmoothBlockVisitor.h
@@ -13,7 +13,7 @@ class RatioSmoothBlockVisitor : public Block3DVisitor
 public:
    RatioSmoothBlockVisitor(int levelDepth, bool includeNotActiveBlocks = false);
 
-   ~RatioSmoothBlockVisitor() override {}
+   ~RatioSmoothBlockVisitor() override = default;
 
    bool expandsByAdaptation() { return this->expandBlocks; }
 
diff --git a/src/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.cpp b/src/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.cpp
index def2a0e11e73569200e80fa4260b2fc9a251d48a..59ffd9dfe64e3c0fa69abbc314ac673c485bbdd6 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.cpp
@@ -19,8 +19,7 @@ RefineAroundGbObjectHelper::RefineAroundGbObjectHelper(SPtr<Grid3D> grid, int re
 }
 //////////////////////////////////////////////////////////////////////////
 RefineAroundGbObjectHelper::~RefineAroundGbObjectHelper(void)
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void RefineAroundGbObjectHelper::refine()
 {
diff --git a/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp
index 0eaf38e90fd99e2d785319f95eeb5758a31e1b82..4aed0a0f47d78fb108f6eff1eabcad6700af8a1b 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp
@@ -17,8 +17,7 @@ RefineCrossAndInsideGbObjectBlockVisitor::RefineCrossAndInsideGbObjectBlockVisit
 }
 //////////////////////////////////////////////////////////////////////////
 RefineCrossAndInsideGbObjectBlockVisitor::~RefineCrossAndInsideGbObjectBlockVisitor()
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void RefineCrossAndInsideGbObjectBlockVisitor::visit(const SPtr<Grid3D> grid, SPtr<Block3D> block)
 {
diff --git a/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectHelper.cpp b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectHelper.cpp
index cff9fbfaf372d0ecb95da2b791c7d096001addce..912a551baebf49dcde72c642cb0010f68800bd3a 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectHelper.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectHelper.cpp
@@ -19,8 +19,7 @@ RefineCrossAndInsideGbObjectHelper::RefineCrossAndInsideGbObjectHelper(SPtr<Grid
 }
 //////////////////////////////////////////////////////////////////////////
 RefineCrossAndInsideGbObjectHelper::~RefineCrossAndInsideGbObjectHelper(void)
-{
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void RefineCrossAndInsideGbObjectHelper::refine()
 {
diff --git a/src/cpu/VirtualFluidsCore/Visitors/RenumberBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/RenumberBlockVisitor.h
index ff0939e017c29cfd2464e495c88b88cf37cfddc2..8740395482cb7849db37bc29dc2a478f0c2dbd86 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/RenumberBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/RenumberBlockVisitor.h
@@ -21,7 +21,7 @@ class RenumberBlockVisitor : public Block3DVisitor
 public:
    RenumberBlockVisitor();
 
-   ~RenumberBlockVisitor() override {}
+   ~RenumberBlockVisitor() override = default;
 
    void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) override;
 
diff --git a/src/cpu/VirtualFluidsCore/Visitors/RenumberGridVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/RenumberGridVisitor.h
index b403947d64d92547fb7426438d5737ee195845da..f4b27b58e5d48324fa9d198e8453a8e500d9a4fe 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/RenumberGridVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/RenumberGridVisitor.h
@@ -21,7 +21,7 @@ class RenumberGridVisitor : public Grid3DVisitor
 public:
    RenumberGridVisitor(SPtr<Communicator> com);
 
-   ~RenumberGridVisitor() override {}
+   ~RenumberGridVisitor() override = default;
 
    void visit(SPtr<Grid3D> grid) override;
 
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetForcingBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetForcingBlockVisitor.h
index d612a5f045185709e1fb5f992abc2d5e91e19ba4..ac8936a138bf476b2da25f16271822e5945fe93b 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetForcingBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetForcingBlockVisitor.h
@@ -19,7 +19,7 @@ public:
 
    SetForcingBlockVisitor(const std::string& sForcingX1, const std::string& sForcingX2, const std::string& sForcingX3);
 
-   ~SetForcingBlockVisitor() override {}
+   ~SetForcingBlockVisitor() override = default;
 
    void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) override;
 
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationDirsBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationDirsBlockVisitor.h
index 8645cf828843c75a006adaf08028cde142276024..75dafc89949bc41deef5c1f3ae9f89e31a96576a 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationDirsBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetInterpolationDirsBlockVisitor.h
@@ -14,7 +14,7 @@ class SetInterpolationDirsBlockVisitor : public Block3DVisitor
 public:
    SetInterpolationDirsBlockVisitor(std::vector<int>& dirs);
 
-   ~SetInterpolationDirsBlockVisitor() override {}
+   ~SetInterpolationDirsBlockVisitor() override = default;
 
    void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) override;
 
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetSpongeLayerBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetSpongeLayerBlockVisitor.cpp
index 076a6515c7aa27112d3b5d284b5926599b00a631..68c338d86aae39a852cf4b69d4df368b4615a024 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetSpongeLayerBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetSpongeLayerBlockVisitor.cpp
@@ -12,9 +12,7 @@ SetSpongeLayerBlockVisitor::SetSpongeLayerBlockVisitor( const mu::Parser& sponge
 }
 //////////////////////////////////////////////////////////////////////////
 SetSpongeLayerBlockVisitor::~SetSpongeLayerBlockVisitor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void SetSpongeLayerBlockVisitor::visit( SPtr<Grid3D> grid, SPtr<Block3D> block )
 {
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h
index 9fe2b4f5141197685f336a17feb0026e1dd57d75..8e40ada1222ea811498fb9984c8471e078620f1b 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.h
@@ -14,7 +14,7 @@ class SetUndefinedNodesBlockVisitor : public Block3DVisitor
 public:
    SetUndefinedNodesBlockVisitor(bool twoTypeOfConnectorsCheck=true);
 
-   ~SetUndefinedNodesBlockVisitor() override {}
+   ~SetUndefinedNodesBlockVisitor() override = default;
 
    void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) override;
 protected:
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp
index 89db17a3d7e7f1cf5e4027ba5c7b1ed452f0b1a2..bc88929681f2cbc6138a4cfdf38d94164f4662bb 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp
@@ -24,9 +24,7 @@ SpongeLayerBlockVisitor::SpongeLayerBlockVisitor(SPtr<GbCuboid3D> boundingBox, S
 }
 //////////////////////////////////////////////////////////////////////////
 SpongeLayerBlockVisitor::~SpongeLayerBlockVisitor()
-{
-
-}
+= default;
 //////////////////////////////////////////////////////////////////////////
 void SpongeLayerBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
 {
diff --git a/src/cpu/VirtualFluidsCore/Visitors/ViscosityBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/ViscosityBlockVisitor.h
index 31f5d03169aae504e914a2fd726456cc951fc42c..603a474623bda9578a7769ff015921171a7cf36b 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/ViscosityBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/ViscosityBlockVisitor.h
@@ -14,7 +14,7 @@ class ViscosityBlockVisitor : public Block3DVisitor
 public:
    ViscosityBlockVisitor(LBMReal nu);
 
-   ~ViscosityBlockVisitor() override {}
+   ~ViscosityBlockVisitor() override = default;
 
    void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) override;