From 0c3a478761d4c36bf01bae35e9d17a01abc30c45 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Thu, 8 Oct 2020 09:48:03 +0200
Subject: [PATCH] Modernize use inclass initialization.
---
3rdParty/metis/metis-5.1.1/include/metis.h | 2 ++
src/basics/basics/utilities/UbFileInput.h | 4 +--
src/basics/basics/utilities/UbFileOutput.h | 4 +--
src/basics/geometry3d/GbCylinder3D.cpp | 4 +--
src/basics/geometry3d/GbCylinder3D.h | 6 ++--
src/basics/geometry3d/GbTriFaceMesh3D.cpp | 9 ++----
src/basics/geometry3d/GbTriFaceMesh3D.h | 20 ++++++------
src/basics/geometry3d/GbVoxelMatrix3D.cpp | 14 +--------
src/basics/geometry3d/GbVoxelMatrix3D.h | 24 +++++++-------
.../geometry3d/KdTree/KdSplitCandidate.h | 31 ++++++++-----------
.../KdTree/KdSplitCandidateManager.h | 7 ++---
.../Connectors/D3Q27ETCFOffVectorConnector.h | 2 +-
.../D3Q27TriFaceMeshInteractor.cpp | 2 +-
.../Interactors/D3Q27TriFaceMeshInteractor.h | 12 +++----
src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.h | 2 +-
...ssibleCumulant4thOrderViscosityLBMKernel.h | 2 +-
.../LBM/CompressibleCumulantLBMKernel.h | 2 +-
...mpressibleOffsetInterpolationProcessor.cpp | 2 +-
...CompressibleOffsetInterpolationProcessor.h | 2 +-
...bleOffsetMomentsInterpolationProcessor.cpp | 2 +-
...sibleOffsetMomentsInterpolationProcessor.h | 2 +-
...etSquarePressureInterpolationProcessor.cpp | 2 +-
...fsetSquarePressureInterpolationProcessor.h | 2 +-
.../LBM/IncompressibleCumulantLBMKernel.h | 2 +-
...ressibleCumulantWithSpongeLayerLBMKernel.h | 2 +-
...mpressibleOffsetInterpolationProcessor.cpp | 2 +-
...compressibleOffsetInterpolationProcessor.h | 2 +-
.../LBM/LBMKernelETD3Q27BGK.h | 2 +-
...rsenCrossAndInsideGbObjectBlockVisitor.cpp | 2 +-
...oarsenCrossAndInsideGbObjectBlockVisitor.h | 2 +-
.../Visitors/RefineAroundGbObjectHelper.h | 2 +-
...fineCrossAndInsideGbObjectBlockVisitor.cpp | 2 +-
...RefineCrossAndInsideGbObjectBlockVisitor.h | 2 +-
33 files changed, 79 insertions(+), 100 deletions(-)
diff --git a/3rdParty/metis/metis-5.1.1/include/metis.h b/3rdParty/metis/metis-5.1.1/include/metis.h
index 90f5163c1..3f2e81ca5 100644
--- a/3rdParty/metis/metis-5.1.1/include/metis.h
+++ b/3rdParty/metis/metis-5.1.1/include/metis.h
@@ -10,6 +10,8 @@
#ifndef _METIS_H_
#define _METIS_H_
+#pragma clang system_header
+
/****************************************************************************
* A set of defines that can be modified by the user
*****************************************************************************/
diff --git a/src/basics/basics/utilities/UbFileInput.h b/src/basics/basics/utilities/UbFileInput.h
index 2c57b175f..a15d656bc 100644
--- a/src/basics/basics/utilities/UbFileInput.h
+++ b/src/basics/basics/utilities/UbFileInput.h
@@ -36,7 +36,7 @@ public:
enum FILETYPE {ASCII, BINARY};
public:
- UbFileInput() : filename(""), commentindicator('C') { }
+ UbFileInput() : filename("") { }
virtual ~UbFileInput() { infile.close(); }
virtual bool operator!() { return !(infile); }
@@ -89,7 +89,7 @@ public:
protected:
std::ifstream infile;
std::string filename;
- char commentindicator;
+ char commentindicator{'C'};
};
#endif //UBFILEINPUT_H
diff --git a/src/basics/basics/utilities/UbFileOutput.h b/src/basics/basics/utilities/UbFileOutput.h
index 2ee5ac92f..6cb2d4bbb 100644
--- a/src/basics/basics/utilities/UbFileOutput.h
+++ b/src/basics/basics/utilities/UbFileOutput.h
@@ -35,7 +35,7 @@ public:
enum FILETYPE {ASCII, BINARY};
public:
- UbFileOutput() : filename(""), commentindicator('C') { }
+ UbFileOutput() : filename("") { }
UbFileOutput(const std::string& filename) : filename(filename), commentindicator('C') { }
virtual ~UbFileOutput() { outfile.flush();outfile.close(); }
@@ -87,7 +87,7 @@ public:
protected:
std::ofstream outfile;
std::string filename;
- char commentindicator;
+ char commentindicator{'C'};
};
#endif //UBFILEOUTPUT_H
diff --git a/src/basics/geometry3d/GbCylinder3D.cpp b/src/basics/geometry3d/GbCylinder3D.cpp
index 1bfae6b34..6aa121a5e 100644
--- a/src/basics/geometry3d/GbCylinder3D.cpp
+++ b/src/basics/geometry3d/GbCylinder3D.cpp
@@ -9,9 +9,7 @@ using namespace std;
// Konstruktor
/*==========================================================*/
GbCylinder3D::GbCylinder3D()
- : minX1(0.0) , minX2(0.0) , minX3(0.0)
- , maxX1(0.0) , maxX2(0.0) , maxX3(0.0)
- , centerX1(0.0), centerX2(0.0), centerX3(0.0)
+
{
this->setName("cylinder");
GbPoint3D* p1 = new GbPoint3D();
diff --git a/src/basics/geometry3d/GbCylinder3D.h b/src/basics/geometry3d/GbCylinder3D.h
index 2528834e5..bf8e19a28 100644
--- a/src/basics/geometry3d/GbCylinder3D.h
+++ b/src/basics/geometry3d/GbCylinder3D.h
@@ -112,9 +112,9 @@ protected:
GbLine3D* mLine;
double mRad;
- double minX1, minX2, minX3;
- double maxX1, maxX2, maxX3;
- double centerX1, centerX2, centerX3;
+ double minX1{0.0}, minX2{0.0}, minX3{0.0};
+ double maxX1{0.0}, maxX2{0.0}, maxX3{0.0};
+ double centerX1{0.0}, centerX2{0.0}, centerX3{0.0};
int cylinderType;
diff --git a/src/basics/geometry3d/GbTriFaceMesh3D.cpp b/src/basics/geometry3d/GbTriFaceMesh3D.cpp
index 3a6b7652f..6ac4146ee 100644
--- a/src/basics/geometry3d/GbTriFaceMesh3D.cpp
+++ b/src/basics/geometry3d/GbTriFaceMesh3D.cpp
@@ -22,12 +22,9 @@ using namespace std;
GbTriFaceMesh3D::GbTriFaceMesh3D()
: GbObject3D()
- , buildVertTriRelationMap(false)
- , kdTree(NULL)
- , transX1(0.0)
- , transX2(0.0)
- , transX3(0.0)
- , transferViaFilename(false)
+ ,
+ kdTree(NULL)
+
{
this->setName("CAB_GbTriFaceMesh3D");
diff --git a/src/basics/geometry3d/GbTriFaceMesh3D.h b/src/basics/geometry3d/GbTriFaceMesh3D.h
index f4e0c8929..1aed8f915 100644
--- a/src/basics/geometry3d/GbTriFaceMesh3D.h
+++ b/src/basics/geometry3d/GbTriFaceMesh3D.h
@@ -46,7 +46,7 @@ public:
class Vertex
{
public:
- Vertex() : x(0.0), y(0.0), z(0.0) { }
+ Vertex() { }
Vertex(const float& x, const float& y, const float& z) : x(x), y(y),z(z) { }
Vertex(Vertex* vert)
{
@@ -94,14 +94,14 @@ public:
}
public:
- float x, y, z;
+ float x{0.0}, y{0.0}, z{0.0};
};
//////////////////////////////////////////////////////////////////////////
class TriFace
{
public:
TriFace()
- : v1(-1), v2(-1), v3(-1), nx(0.0), ny(0.0), nz(0.0)
+
{
}
@@ -207,8 +207,8 @@ public:
}
public:
- int v1, v2, v3;
- float nx, ny, nz;
+ int v1{-1}, v2{-1}, v3{-1};
+ float nx{0.0}, ny{0.0}, nz{0.0};
};
public:
@@ -301,10 +301,10 @@ protected:
std::vector<TriFace>* triangles;
//for transfer
std::string filename;
- bool transferViaFilename;
- double transX1;
- double transX2;
- double transX3;
+ bool transferViaFilename{false};
+ double transX1{0.0};
+ double transX2{0.0};
+ double transX3{0.0};
double x1min;
double x1max;
@@ -318,7 +318,7 @@ protected:
bool consistent;
- bool buildVertTriRelationMap;
+ bool buildVertTriRelationMap{false};
std::multimap<Vertex*,TriFace*> relationVertTris;
Kd::Tree< double >* kdTree;
diff --git a/src/basics/geometry3d/GbVoxelMatrix3D.cpp b/src/basics/geometry3d/GbVoxelMatrix3D.cpp
index 45a5adcc1..4f1d5b56c 100644
--- a/src/basics/geometry3d/GbVoxelMatrix3D.cpp
+++ b/src/basics/geometry3d/GbVoxelMatrix3D.cpp
@@ -42,19 +42,7 @@ GbVoxelMatrix3D::GbVoxelMatrix3D(int nx1, int nx2, int nx3, float initVal, doubl
/*=======================================================*/
GbVoxelMatrix3D::GbVoxelMatrix3D()
: GbObject3D()
- , minX1(0.0)
- , minX2(0.0)
- , minX3(0.0)
- , nodesX1(0)
- , nodesX2(0)
- , nodesX3(0)
- , lowerThreshold(0.0)
- , upperThreshold(0.0)
- , deltaX1(1.0)
- , deltaX2(1.0)
- , deltaX3(1.0)
- , transferViaFilename(false)
- , addSurfaceTriangleSetFlag(true)
+
{
this->setName("VoxelMatrix3D");
}
diff --git a/src/basics/geometry3d/GbVoxelMatrix3D.h b/src/basics/geometry3d/GbVoxelMatrix3D.h
index af02aa2ad..69af1e547 100644
--- a/src/basics/geometry3d/GbVoxelMatrix3D.h
+++ b/src/basics/geometry3d/GbVoxelMatrix3D.h
@@ -159,21 +159,21 @@ protected:
protected:
//for transfer
std::string filename;
- bool transferViaFilename;
+ bool transferViaFilename{false};
- bool addSurfaceTriangleSetFlag;
+ bool addSurfaceTriangleSetFlag{true};
- int nodesX1;
- int nodesX2;
- int nodesX3;
- double lowerThreshold, upperThreshold;
+ int nodesX1{0};
+ int nodesX2{0};
+ int nodesX3{0};
+ double lowerThreshold{0.0}, upperThreshold{0.0};
- double minX1;
- double minX2;
- double minX3;
- double deltaX1;
- double deltaX2;
- double deltaX3;
+ double minX1{0.0};
+ double minX2{0.0};
+ double minX3{0.0};
+ double deltaX1{1.0};
+ double deltaX2{1.0};
+ double deltaX3{1.0};
Matrix3D voxelMatrix;
diff --git a/src/basics/geometry3d/KdTree/KdSplitCandidate.h b/src/basics/geometry3d/KdTree/KdSplitCandidate.h
index 9fe19c065..0b532b819 100644
--- a/src/basics/geometry3d/KdTree/KdSplitCandidate.h
+++ b/src/basics/geometry3d/KdTree/KdSplitCandidate.h
@@ -10,16 +10,11 @@ namespace Kd
{
public:
SplitCandidate()
- : axis(0)
- , position(0.0)
- , starting(0)
- , ending(0)
- , np_left(false)
- , np_right(false)
- , Cn(0.0)
- , nr(0)
- , nl(0)
- , isValid(false)
+ :
+ position(0.0)
+ ,
+ Cn(0.0)
+
{
}
@@ -51,17 +46,17 @@ namespace Kd
/* ======================================================================================= */
public:
- int axis;
+ int axis{0};
T Cn;
T position;
- int nl;
- int nr;
+ int nl{0};
+ int nr{0};
int np;
- int starting;
- int ending;
- bool np_left;
- bool np_right;
- bool isValid;
+ int starting{0};
+ int ending{0};
+ bool np_left{false};
+ bool np_right{false};
+ bool isValid{false};
};
}
diff --git a/src/basics/geometry3d/KdTree/KdSplitCandidateManager.h b/src/basics/geometry3d/KdTree/KdSplitCandidateManager.h
index 0139434eb..7c5d707b8 100644
--- a/src/basics/geometry3d/KdTree/KdSplitCandidateManager.h
+++ b/src/basics/geometry3d/KdTree/KdSplitCandidateManager.h
@@ -15,8 +15,7 @@ namespace Kd
{
public:
SplitCandidateManager()
- : objects_starting_outside_left(0)
- , objects_fully_outside_node(0)
+
{
}
@@ -63,8 +62,8 @@ namespace Kd
/* ======================================================================================= */
public:
- int objects_starting_outside_left;
- int objects_fully_outside_node;
+ int objects_starting_outside_left{0};
+ int objects_fully_outside_node{0};
private:
std::map<T, SplitCandidate<T> > splitCandidates;
diff --git a/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.h b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.h
index d7ba85b09..96c8627fe 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.h
@@ -44,7 +44,7 @@ template< typename VectorTransmitter >
class D3Q27ETCFOffVectorConnector : public Block3DConnector
{
public:
- typedef typename VectorTransmitter::value_type vector_type;
+ using vector_type = typename VectorTransmitter::value_type;
using VectorTransmitterPtr = SPtr<VectorTransmitter>;
public:
D3Q27ETCFOffVectorConnector(SPtr<Block3D> block,
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
index e4ef7b037..1f6dc3f2d 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
@@ -30,7 +30,7 @@
using namespace std;
D3Q27TriFaceMeshInteractor::D3Q27TriFaceMeshInteractor()
-: D3Q27Interactor(), forceshift(0.0), velocityshift(0.0), forceshiftpolicy(false), velocityshiftpolicy(false), useHalfSpace(true), regardPIOTest(true)
+: D3Q27Interactor()
{
this->stressMode = STRESSNORMAL;
}
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.h b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.h
index 84ac491b9..70e1b2d25 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.h
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.h
@@ -80,12 +80,12 @@ public:
protected:
int stressMode;
- double forceshift;
- double velocityshift;
- bool forceshiftpolicy;
- bool velocityshiftpolicy;
- bool useHalfSpace;
- bool regardPIOTest;
+ double forceshift{0.0};
+ double velocityshift{0.0};
+ bool forceshiftpolicy{false};
+ bool velocityshiftpolicy{false};
+ bool useHalfSpace{true};
+ bool regardPIOTest{true};
void reinitWithStoredQs(const double& timeStep);
// bool reinitWithStoredQsFlag;
diff --git a/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.h
index 6a45748f2..0118352ba 100644
--- a/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.h
@@ -11,7 +11,7 @@ class BGKLBMKernel : public LBMKernel
{
public:
BGKLBMKernel();
- ~BGKLBMKernel(void) override;
+ ~BGKLBMKernel() override;
void calculate(int step)override;
SPtr<LBMKernel> clone()override;
double getCalculationTime() override;
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h
index 4acff84c1..2cdd9c5b3 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h
@@ -18,7 +18,7 @@ public:
enum Parameter{NORMAL, MAGIC};
public:
CompressibleCumulant4thOrderViscosityLBMKernel();
- ~CompressibleCumulant4thOrderViscosityLBMKernel(void) override;
+ ~CompressibleCumulant4thOrderViscosityLBMKernel() override;
void calculate(int step) override;
SPtr<LBMKernel> clone() override;
double getCalculationTime() override;
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.h
index a31ed59dd..802a70770 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.h
@@ -18,7 +18,7 @@ public:
enum Parameter{NORMAL, MAGIC};
public:
CompressibleCumulantLBMKernel();
- ~CompressibleCumulantLBMKernel(void) override;
+ ~CompressibleCumulantLBMKernel() override;
void calculate(int step) override;
SPtr<LBMKernel> clone() override;
double getCalculationTime() override;
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
index 60b99de30..88f67d8a9 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
@@ -4,7 +4,7 @@
using namespace UbMath;
CompressibleOffsetInterpolationProcessor::CompressibleOffsetInterpolationProcessor()
- : omegaC(0.0), omegaF(0.0)
+
{
//forcingC = 0; //9.99685e-7;
//forcingF = 0; //forcingC*0.5;
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h
index d29a20497..d855e545c 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.h
@@ -26,7 +26,7 @@ public:
//LBMReal forcingC, forcingF;
protected:
private:
- LBMReal omegaC, omegaF;
+ LBMReal omegaC{0.0}, omegaF{0.0};
LBMReal a0, ax, ay, az, axx, ayy, azz, axy, axz, ayz, b0, bx, by, bz, bxx, byy, bzz, bxy, bxz, byz, c0, cx, cy, cz, cxx, cyy, czz, cxy, cxz, cyz, axyz, bxyz, cxyz;
LBMReal xoff, yoff, zoff;
LBMReal xoff_sq, yoff_sq, zoff_sq;
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
index 0cb62c2dc..54d3b32b2 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
@@ -4,7 +4,7 @@
using namespace UbMath;
CompressibleOffsetMomentsInterpolationProcessor::CompressibleOffsetMomentsInterpolationProcessor()
- : omegaC(0.0), omegaF(0.0)
+
{
this->bulkViscosity = 0.0;
this->shearViscosity = 0.0;
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.h
index e5492f159..bee108e64 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.h
@@ -26,7 +26,7 @@ public:
void setBulkViscosity(LBMReal shearViscosity, LBMReal bulkViscosity);
protected:
private:
- LBMReal omegaC, omegaF;
+ LBMReal omegaC{0.0}, omegaF{0.0};
LBMReal a0, ax, ay, az, axx, ayy, azz, axy, axz, ayz, b0, bx, by, bz, bxx, byy, bzz, bxy, bxz, byz, c0, cx, cy, cz, cxx, cyy, czz, cxy, cxz, cyz, axyz, bxyz, cxyz;
LBMReal xoff, yoff, zoff;
LBMReal xoff_sq, yoff_sq, zoff_sq;
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
index 2ecce9ba7..3436dd584 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
@@ -4,7 +4,7 @@
using namespace UbMath;
CompressibleOffsetSquarePressureInterpolationProcessor::CompressibleOffsetSquarePressureInterpolationProcessor()
- : omegaC(0.0), omegaF(0.0)
+
{
this->bulkOmegaToOmega = false;
this->OxxPyyPzzC = one;
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.h
index b00d38395..e456668af 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.h
@@ -26,7 +26,7 @@ public:
void setBulkOmegaToOmega(bool value);
protected:
private:
- LBMReal omegaC, omegaF;
+ LBMReal omegaC{0.0}, omegaF{0.0};
LBMReal a0, ax, ay, az, axx, ayy, azz, axy, axz, ayz, b0, bx, by, bz, bxx, byy, bzz, bxy, bxz, byz, c0, cx, cy, cz, cxx, cyy, czz, cxy, cxz, cyz, axyz, bxyz, cxyz;
LBMReal xoff, yoff, zoff;
LBMReal xoff_sq, yoff_sq, zoff_sq;
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.h
index f614d9453..d7c3c78a6 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.h
@@ -20,7 +20,7 @@ public:
enum Parameter{NORMAL, MAGIC};
public:
IncompressibleCumulantLBMKernel();
- ~IncompressibleCumulantLBMKernel(void) override;
+ ~IncompressibleCumulantLBMKernel() override;
void calculate(int step) override;
SPtr<LBMKernel> clone() override;
double getCalculationTime() override;
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.h
index ab7ef611e..2747cdc76 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.h
@@ -21,7 +21,7 @@ class IncompressibleCumulantWithSpongeLayerLBMKernel : public IncompressibleCum
{
public:
IncompressibleCumulantWithSpongeLayerLBMKernel();
- ~IncompressibleCumulantWithSpongeLayerLBMKernel(void) override;
+ ~IncompressibleCumulantWithSpongeLayerLBMKernel() override;
SPtr<LBMKernel> clone() override;
void calculate(int step) override;
void initRelaxFactor(int vdir, double vL1, double vdx, double vSP);
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
index 8bcab36fa..74b0402bd 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
@@ -4,7 +4,7 @@
IncompressibleOffsetInterpolationProcessor::IncompressibleOffsetInterpolationProcessor()
- : omegaC(0.0), omegaF(0.0)
+
{
//forcingC = 0; //9.99685e-7;
//forcingF = 0; //forcingC*0.5;
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
index 079cae864..db1479ade 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
@@ -27,7 +27,7 @@ public:
//LBMReal forcingC, forcingF;
protected:
private:
- LBMReal omegaC, omegaF;
+ LBMReal omegaC{0.0}, omegaF{0.0};
LBMReal a0, ax, ay, az, axx, ayy, azz, axy, axz, ayz, b0, bx, by, bz, bxx, byy, bzz, bxy, bxz, byz, c0, cx, cy, cz, cxx, cyy, czz, cxy, cxz, cyz, axyz, bxyz, cxyz;
LBMReal xoff, yoff, zoff;
LBMReal xoff_sq, yoff_sq, zoff_sq;
diff --git a/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.h b/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.h
index 56c5c033a..09e495c23 100644
--- a/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.h
+++ b/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.h
@@ -11,7 +11,7 @@ class LBMKernelETD3Q27BGK : public LBMKernel
{
public:
LBMKernelETD3Q27BGK();
- ~LBMKernelETD3Q27BGK(void) override;
+ ~LBMKernelETD3Q27BGK() override;
void calculate(int step)override;
SPtr<LBMKernel> clone()override;
double getCalculationTime() override;
diff --git a/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp
index 5e948fb23..e8eaa11d4 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp
@@ -4,7 +4,7 @@
#include <geometry3d/GbObject3D.h>
CoarsenCrossAndInsideGbObjectBlockVisitor::CoarsenCrossAndInsideGbObjectBlockVisitor()
- : Block3DVisitor(), notActive(true)
+ : Block3DVisitor()
{
}
//////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.h
index 905492608..a62e6dc8d 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.h
@@ -26,7 +26,7 @@ public:
//////////////////////////////////////////////////////////////////////////
protected:
SPtr<GbObject3D> geoObject;
- bool notActive;
+ bool notActive{true};
int coarseLevel;
};
diff --git a/src/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.h b/src/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.h
index 3c21476a8..76a7bb385 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/RefineAroundGbObjectHelper.h
@@ -20,7 +20,7 @@ public:
//! \param startDistance start distance from geometry for refinement
//! \param stopDistance stop distance from geometry for refinement
RefineAroundGbObjectHelper(SPtr<Grid3D> grid, int maxRefineLevel, SPtr<D3Q27TriFaceMeshInteractor> objectIter, double startDistance, double stopDistance, SPtr<Communicator> comm);
- virtual ~RefineAroundGbObjectHelper(void);
+ virtual ~RefineAroundGbObjectHelper();
//! start refinement
void refine();
private:
diff --git a/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp
index 4aed0a0f4..3b72cfd4d 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.cpp
@@ -6,7 +6,7 @@
RefineCrossAndInsideGbObjectBlockVisitor::RefineCrossAndInsideGbObjectBlockVisitor()
-: Block3DVisitor() , notActive(true)
+: Block3DVisitor()
{
}
//////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.h
index d8b5b1888..07e3e3b70 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/RefineCrossAndInsideGbObjectBlockVisitor.h
@@ -27,7 +27,7 @@ public:
void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) override;
protected:
SPtr<GbObject3D> geoObject;
- bool notActive;
+ bool notActive{true};
};
#endif
--
GitLab