diff --git a/src/basics/Core/StringUtilities/StringUtil.h b/src/basics/Core/StringUtilities/StringUtil.h index 5d458f7e4f3362fe5c10dc9ab5252266762d26f5..1927a69bc60bf2467fb09893463b3c9363191890 100644 --- a/src/basics/Core/StringUtilities/StringUtil.h +++ b/src/basics/Core/StringUtilities/StringUtil.h @@ -48,11 +48,11 @@ public: private: StringUtil() = default; - ; + StringUtil(const StringUtil &) = default; - ; + virtual ~StringUtil() = default; - ; + static bool toBool(bool &t, const std::string &input, std::ios_base &(*f)(std::ios_base &)); }; diff --git a/src/basics/basics/parallel/PbMpi.h b/src/basics/basics/parallel/PbMpi.h index 63470c2d82d35ccc22599fc3623e6e1d93354a1a..857ff7b1058b2a773a6b759bbd3dca8105db0a68 100644 --- a/src/basics/basics/parallel/PbMpi.h +++ b/src/basics/basics/parallel/PbMpi.h @@ -287,7 +287,7 @@ inline void sendStringVector(const std::vector<std::string> &v, int dest, int ta /*======================================================================*/ // send a vector of strings inline void receiveStringVector(std::vector<std::string> &v, int dest, int tag, PbMpi::Comm comm); -}; // namespace PbMpi +} // namespace PbMpi /*======================================================================*/ // send a single value of MPI_Datatype diff --git a/src/basics/basics/utilities/UbComparators.h b/src/basics/basics/utilities/UbComparators.h index bc507e456b9603d85d42f8597fe4748a135e51d2..d461e27cb8d5f6026f13b2aea363d563ebed5c5c 100644 --- a/src/basics/basics/utilities/UbComparators.h +++ b/src/basics/basics/utilities/UbComparators.h @@ -170,7 +170,7 @@ struct compareMember { // l.sort( compareConstMethods<Klasse, double, &Klasse::getVal1 >() ); //} -}; // namespace UbComparators +} // namespace UbComparators #endif // UBCOMPARATOR_H diff --git a/src/basics/basics/utilities/UbEqual.h b/src/basics/basics/utilities/UbEqual.h index b3ca9102d585faeac0b2a4e413434d4d0d759282..87955b181ea3efaad4b7f3d2ebc746271ec95bb7 100644 --- a/src/basics/basics/utilities/UbEqual.h +++ b/src/basics/basics/utilities/UbEqual.h @@ -259,7 +259,7 @@ inline bool isUbEqual(const T1 &a, const T2 &b) { using Low = typename UbEqualTrait<T1, T2>::Low; return specific_equal<Low, Low>(static_cast<Low>(a), static_cast<Low>(b)); -}; +} ////////////////////////////////////////////////////////////////////////// // UbEqual-Functor diff --git a/src/basics/basics/utilities/UbSystem.h b/src/basics/basics/utilities/UbSystem.h index 8e676811a152b176efd617a944f4e22ea538721e..0436a360c2b595115824e1b7906214621bd76314 100644 --- a/src/basics/basics/utilities/UbSystem.h +++ b/src/basics/basics/utilities/UbSystem.h @@ -530,7 +530,7 @@ struct select2nd { const result_type &operator()(const argument_type &p) const { return p.second; } }; -}; // namespace UbSystem +} // namespace UbSystem #define UB_STATIC_ASSERT(expr) static_cast<void>(sizeof(UbSystem::ub_static_assert<expr>)); // zum ueberpruefen von STATISCHEN ausdruecken waehrend der compile-zeit diff --git a/src/basics/geometry3d/GbMeshTools3D.h b/src/basics/geometry3d/GbMeshTools3D.h index 2a93319acb87011e0d63e60378e5db025c1e5a18..5c260e9c65237d2bc8d1482044edc2273fc97905 100644 --- a/src/basics/geometry3d/GbMeshTools3D.h +++ b/src/basics/geometry3d/GbMeshTools3D.h @@ -281,7 +281,7 @@ inline int triBoxOverlap(float boxcenter[3], float boxhalfsize[3], float trivert return 1; /* box and triangle overlaps */ } -}; // namespace GbMeshTools3D +} // namespace GbMeshTools3D #endif diff --git a/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h b/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h index 65307fe3a8662375092be6626179399a668388b0..3e8828639bebfabbacf62793de954afd17b86026 100644 --- a/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h +++ b/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h @@ -12,9 +12,9 @@ class ConnectorFactory { public: ConnectorFactory() = default; - ; + virtual ~ConnectorFactory() = default; - ; + virtual SPtr<Block3DConnector> createSameLevelDirectConnector(SPtr<Block3D> from, SPtr<Block3D> to, int sendDir) = 0; diff --git a/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h b/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h index 593778cd08af4dff957def1dfd837bc2430935bd..fc1c67ad129d6cd7e7f5f9c9cd50ec4c76bfe714 100644 --- a/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h +++ b/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h @@ -7,9 +7,9 @@ class DistributionArray3D { public: DistributionArray3D() = default; - ; + virtual ~DistributionArray3D() = default; - ; + virtual size_t getNX1() const = 0; virtual size_t getNX2() const = 0; diff --git a/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h b/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h index e7d9b90de4c1490fa4a7d9c3ad0c05600467aa29..319a9200cc204b0f9b869b2e52353e717a89d783 100644 --- a/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h +++ b/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h @@ -57,9 +57,9 @@ class EsoTwist3D : public DistributionArray3D { public: EsoTwist3D() = default; - ; + ~EsoTwist3D() override = default; - ; + ////////////////////////////////////////////////////////////////////////// void swap() override = 0; ////////////////////////////////////////////////////////////////////////// diff --git a/src/cpu/VirtualFluidsCore/Data/VoidData3D.h b/src/cpu/VirtualFluidsCore/Data/VoidData3D.h index bab8eca0d62670e65275034cd3b67ace2953a349..12afae57d0f88d01963b4694aca881dd18691f87 100644 --- a/src/cpu/VirtualFluidsCore/Data/VoidData3D.h +++ b/src/cpu/VirtualFluidsCore/Data/VoidData3D.h @@ -7,7 +7,7 @@ class VoidData3D : public EsoTwist3D { public: VoidData3D() = default; - ; + VoidData3D(size_t nx1, size_t nx2, size_t nx3, LBMReal /*value*/) { this->NX1 = nx1; @@ -15,7 +15,7 @@ public: this->NX3 = nx3; } ~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/Grid/BasicCalculator.cpp b/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp index e41e7372502dd7f96b387e4845ac27084321c48a..d55a59b58b026ec46b7cdc3e48aa796ec24d181a 100644 --- a/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp +++ b/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp @@ -64,7 +64,6 @@ void BasicCalculator::calculate() int maxInitLevel = maxLevel - minLevel; int straightStartLevel = minInitLevel; int internalIterations = 1 << (maxInitLevel - minInitLevel); - int forwardStartLevel; int threshold; #ifdef TIMING @@ -82,7 +81,6 @@ void BasicCalculator::calculate() for (int staggeredStep = 1; staggeredStep <= internalIterations; staggeredStep++) { - forwardStartLevel = straightStartLevel; if (staggeredStep == internalIterations) straightStartLevel = minInitLevel; else { diff --git a/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h b/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h index 6a21caab66e22a192efb591d7bba81675326f206..2d79817cc0d85a65e3d20d9736f8bf8e55c1a6c6 100644 --- a/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h +++ b/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h @@ -165,5 +165,5 @@ struct DSArraysPresence { bool isShearStressValArrayPresent; bool isRelaxationFactorPresent; }; -}; // namespace MPIIODataStructures +} // namespace MPIIODataStructures #endif \ No newline at end of file diff --git a/src/cpu/VirtualFluidsCore/Utilities/MathUtil.hpp b/src/cpu/VirtualFluidsCore/Utilities/MathUtil.hpp index 00556b842a28de2e3e49635def5f04ed451e5053..5c6fe4e8e2b4a02e733d777db9c045bc57f5b6eb 100644 --- a/src/cpu/VirtualFluidsCore/Utilities/MathUtil.hpp +++ b/src/cpu/VirtualFluidsCore/Utilities/MathUtil.hpp @@ -92,6 +92,6 @@ namespace Utilities double y = a * x + b; return y; } -}; +} #endif