From 773a8b581ad6550c6a314b4c1482c3a0d9986966 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Mon, 22 Feb 2021 15:57:58 +0000
Subject: [PATCH] Fix clang compiler warnings.
---
.../transformator/TransformatorImp.h | 4 +-
.../GridReaderGenerator/GridGenerator.h | 6 +--
.../FindInterface/FindInterface.cpp | 12 ++---
.../Input/PositionReader.cpp | 54 +++++++++----------
src/gpu/VirtualFluids_GPU/Kernel/Kernel.h | 1 +
.../CheckParameterStrategy.h | 3 +-
.../Utilities/KernelFactory/KernelFactory.h | 1 +
.../Mapper/KernelMapper/KernelMapper.h | 2 +-
.../VirtualFluids_GPU/Parameter/Parameter.cpp | 2 +-
.../PreProcessor/PreProcessor.h | 1 +
.../PreProcessorFactory/PreProcessorFactory.h | 1 +
11 files changed, 46 insertions(+), 41 deletions(-)
diff --git a/src/gpu/GridGenerator/utilities/transformator/TransformatorImp.h b/src/gpu/GridGenerator/utilities/transformator/TransformatorImp.h
index f2e68bc13..89e06699f 100644
--- a/src/gpu/GridGenerator/utilities/transformator/TransformatorImp.h
+++ b/src/gpu/GridGenerator/utilities/transformator/TransformatorImp.h
@@ -41,8 +41,8 @@ public:
GRIDGENERATOR_EXPORT void transformGridToWorld(Triangle &t) const;
GRIDGENERATOR_EXPORT void transformGridToWorld(Vertex &value) const;
- GRIDGENERATOR_EXPORT void transformGridToWorld(BoundingBox &box) const;
- GRIDGENERATOR_EXPORT void transformWorldToGrid(BoundingBox &box) const;
+ GRIDGENERATOR_EXPORT void transformGridToWorld(BoundingBox &box) const override;
+ GRIDGENERATOR_EXPORT void transformWorldToGrid(BoundingBox &box) const override;
GRIDGENERATOR_EXPORT bool operator==(const TransformatorImp& trafo) const;
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
index 66b07deda..79f7f2b6a 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
@@ -30,10 +30,10 @@ public:
void allocArrays_BoundaryQs() override;
void allocArrays_OffsetScale() override;
- virtual void setDimensions();
- virtual void setBoundingBox();
+ virtual void setDimensions() override;
+ virtual void setBoundingBox() override;
- virtual void initPeriodicNeigh(std::vector<std::vector<std::vector<unsigned int> > > periodV, std::vector<std::vector<unsigned int> > periodIndex, std::string way);
+ virtual void initPeriodicNeigh(std::vector<std::vector<std::vector<unsigned int> > > periodV, std::vector<std::vector<unsigned int> > periodIndex, std::string way) override;
private:
void setPressureValues(int channelSide) const;
diff --git a/src/gpu/VirtualFluids_GPU/FindInterface/FindInterface.cpp b/src/gpu/VirtualFluids_GPU/FindInterface/FindInterface.cpp
index 7287c7687..460e46fdd 100644
--- a/src/gpu/VirtualFluids_GPU/FindInterface/FindInterface.cpp
+++ b/src/gpu/VirtualFluids_GPU/FindInterface/FindInterface.cpp
@@ -2589,17 +2589,17 @@ void interpolation(InterpolationCellCF &intCF, InterpolationCellFC &intFC,
jC = CF_Coarse[ INTERFACE_S]; jF = CF_Fine[ INTERFACE_S];
hC = CF_Coarse[ INTERFACE_T]; hF = CF_Fine[ INTERFACE_T];
- if ((needInterface[INTERFACE_W]==false))
+ if (needInterface[INTERFACE_W]==false)
{
iC = CF_NCoarse[INTERFACE_W]; iF = CF_NFine[INTERFACE_W];
xOff = (real)-0.5f;
}
- if ((needInterface[INTERFACE_S]==false))
+ if (needInterface[INTERFACE_S]==false)
{
jC = CF_NCoarse[INTERFACE_S]; jF = CF_NFine[INTERFACE_S];
yOff = (real)-0.5f;
}
- if ((needInterface[INTERFACE_T]==false))
+ if (needInterface[INTERFACE_T]==false)
{
hC = CF_NCoarse[INTERFACE_T]; hF = CF_NFine[INTERFACE_T];
zOff = (real)0.5f;
@@ -2670,7 +2670,7 @@ void interpolation(InterpolationCellCF &intCF, InterpolationCellFC &intFC,
offFC.zOffFC[intFC.kFC] = zOff;
intFC.kFC++;
}
- if ((needInterface[INTERFACE_T]==false))
+ if (needInterface[INTERFACE_T]==false)
{
iC = FC_Coarse[ INTERFACE_W]; iF = FC_Fine[ INTERFACE_W];
jC = FC_Coarse[ INTERFACE_S]; jF = FC_Fine[ INTERFACE_S];
@@ -2812,7 +2812,7 @@ void interpolation(InterpolationCellCF &intCF, InterpolationCellFC &intFC,
offFC.zOffFC[intFC.kFC] = zOff;
intFC.kFC++;
}
- if ((needInterface[INTERFACE_S]==false))
+ if (needInterface[INTERFACE_S]==false)
{
iC = FC_Coarse[ INTERFACE_W]; iF = FC_Fine[ INTERFACE_W];
jC = FC_NCoarse[INTERFACE_S]; jF = FC_NFine[INTERFACE_S];
@@ -2827,7 +2827,7 @@ void interpolation(InterpolationCellCF &intCF, InterpolationCellFC &intFC,
offFC.zOffFC[intFC.kFC] = zOff;
intFC.kFC++;
}
- if ((needInterface[INTERFACE_B]==false))
+ if (needInterface[INTERFACE_B]==false)
{
iC = FC_Coarse[ INTERFACE_W]; iF = FC_Fine[ INTERFACE_W];
jC = FC_Coarse[ INTERFACE_S]; jF = FC_Fine[ INTERFACE_S];
diff --git a/src/gpu/VirtualFluids_GPU/Input/PositionReader.cpp b/src/gpu/VirtualFluids_GPU/Input/PositionReader.cpp
index 82a4dd9ea..ec91e92e5 100644
--- a/src/gpu/VirtualFluids_GPU/Input/PositionReader.cpp
+++ b/src/gpu/VirtualFluids_GPU/Input/PositionReader.cpp
@@ -2,33 +2,33 @@
#include "basics/utilities/UbFileInputASCII.h"
-static const int E = dirE; //static const int E = 0;
-static const int W = dirW; //static const int W = 1;
-static const int N = dirN; //static const int N = 2;
-static const int S = dirS; //static const int S = 3;
-static const int T = dirT; //static const int T = 4;
-static const int B = dirB; //static const int B = 5;
-static const int NE = dirNE; //static const int NE = 6;
-static const int SW = dirSW; //static const int SW = 7;
-static const int SE = dirSE; //static const int SE = 8;
-static const int NW = dirNW; //static const int NW = 9;
-static const int TE = dirTE; //static const int TE = 10;
-static const int BW = dirBW; //static const int BW = 11;
-static const int BE = dirBE; //static const int BE = 12;
-static const int TW = dirTW; //static const int TW = 13;
-static const int TN = dirTN; //static const int TN = 14;
-static const int BS = dirBS; //static const int BS = 15;
-static const int BN = dirBN; //static const int BN = 16;
-static const int TS = dirTS; //static const int TS = 17;
-static const int TNE = dirTNE; //static const int TNE = 18;
-static const int TNW = dirTNW; //static const int TNW = 19;
-static const int TSE = dirTSE; //static const int TSE = 20;
-static const int TSW = dirTSW; //static const int TSW = 21;
-static const int BNE = dirBNE; //static const int BNE = 22;
-static const int BNW = dirBNW; //static const int BNW = 23;
-static const int BSE = dirBSE; //static const int BSE = 24;
-static const int BSW = dirBSW; //static const int BSW = 25;
-static const int ZERO = dirZERO; //static const int ZERO = 26;
+// static const int E = dirE; //static const int E = 0;
+// static const int W = dirW; //static const int W = 1;
+// static const int N = dirN; //static const int N = 2;
+// static const int S = dirS; //static const int S = 3;
+// static const int T = dirT; //static const int T = 4;
+// static const int B = dirB; //static const int B = 5;
+// static const int NE = dirNE; //static const int NE = 6;
+// static const int SW = dirSW; //static const int SW = 7;
+// static const int SE = dirSE; //static const int SE = 8;
+// static const int NW = dirNW; //static const int NW = 9;
+// static const int TE = dirTE; //static const int TE = 10;
+// static const int BW = dirBW; //static const int BW = 11;
+// static const int BE = dirBE; //static const int BE = 12;
+// static const int TW = dirTW; //static const int TW = 13;
+// static const int TN = dirTN; //static const int TN = 14;
+// static const int BS = dirBS; //static const int BS = 15;
+// static const int BN = dirBN; //static const int BN = 16;
+// static const int TS = dirTS; //static const int TS = 17;
+// static const int TNE = dirTNE; //static const int TNE = 18;
+// static const int TNW = dirTNW; //static const int TNW = 19;
+// static const int TSE = dirTSE; //static const int TSE = 20;
+// static const int TSW = dirTSW; //static const int TSW = 21;
+// static const int BNE = dirBNE; //static const int BNE = 22;
+// static const int BNW = dirBNW; //static const int BNW = 23;
+// static const int BSE = dirBSE; //static const int BSE = 24;
+// static const int BSW = dirBSW; //static const int BSW = 25;
+// static const int ZERO = dirZERO; //static const int ZERO = 26;
static const int INV_E = dirE; //= W;
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernel.h b/src/gpu/VirtualFluids_GPU/Kernel/Kernel.h
index 02846d7c1..8932dadb3 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernel.h
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernel.h
@@ -16,6 +16,7 @@
class Kernel
{
public:
+ virtual ~Kernel() = default;
virtual void run() = 0;
virtual bool checkParameter() = 0;
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/CheckParameterStrategy/CheckParameterStrategy.h b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/CheckParameterStrategy/CheckParameterStrategy.h
index 2cb2b1b42..2fcd9a081 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/CheckParameterStrategy/CheckParameterStrategy.h
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/CheckParameterStrategy/CheckParameterStrategy.h
@@ -8,7 +8,8 @@ class Parameter;
class CheckParameterStrategy
{
public:
- virtual bool checkParameter(std::shared_ptr<Parameter> para) = 0;
+ virtual ~CheckParameterStrategy() = default;
+ virtual bool checkParameter(std::shared_ptr<Parameter> para) = 0;
};
#endif
\ No newline at end of file
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactory.h b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactory.h
index b799354b7..34a16e564 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactory.h
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactory.h
@@ -17,6 +17,7 @@ class PorousMedia;
class VIRTUALFLUIDS_GPU_EXPORT KernelFactory
{
public:
+ virtual ~KernelFactory() = default;
virtual std::vector< std::shared_ptr< Kernel>> makeKernels(std::shared_ptr<Parameter> para) = 0;
virtual std::vector< std::shared_ptr< ADKernel>> makeAdvDifKernels(std::shared_ptr<Parameter> para) = 0;
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h
index c4bda81d8..c493ca8f1 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h
@@ -1,4 +1,4 @@
-#ifndef KERNEL_MAPPPER_H
+#ifndef KERNEL_MAPPER_H
#define KERNEL_MAPPER_H
#include "Utilities/EnumMapper/EnumMapperImp.h"
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
index 7aeab5900..d23d54265 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
@@ -4280,7 +4280,7 @@ void Parameter::setMultiKernelOn(bool isOn)
}
void Parameter::setMultiKernelLevel(std::vector< int> kernelLevel)
{
- this->multiKernelLevel = multiKernelLevel;
+ this->multiKernelLevel = kernelLevel;
}
void Parameter::setMultiKernel(std::vector< KernelType> kernel)
{
diff --git a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessor.h b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessor.h
index 1d64b40c5..3c7fac487 100644
--- a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessor.h
+++ b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessor.h
@@ -8,6 +8,7 @@ class Parameter;
class PreProcessor
{
public:
+ virtual ~PreProcessor() = default;
virtual void init(std::shared_ptr<Parameter> para, int level) = 0;
virtual bool checkParameter() = 0;
diff --git a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorFactory/PreProcessorFactory.h b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorFactory/PreProcessorFactory.h
index 6c43ac7dd..80413722b 100644
--- a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorFactory/PreProcessorFactory.h
+++ b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorFactory/PreProcessorFactory.h
@@ -14,6 +14,7 @@ class Parameter;
class VIRTUALFLUIDS_GPU_EXPORT PreProcessorFactory
{
public:
+ virtual ~PreProcessorFactory() = default;
virtual std::shared_ptr<PreProcessor> makePreProcessor(std::vector<PreProcessorType> preProcessorTypes, std::shared_ptr<Parameter> para) = 0;
};
--
GitLab