diff --git a/src/basics/geometry3d/GbTriFaceMesh3D.h b/src/basics/geometry3d/GbTriFaceMesh3D.h
index 1aed8f915e5722b122790262e5560a7179cd7c35..eff53d4e22e71400066524e3a3340fb1a9154081 100644
--- a/src/basics/geometry3d/GbTriFaceMesh3D.h
+++ b/src/basics/geometry3d/GbTriFaceMesh3D.h
@@ -46,7 +46,7 @@ public:
class Vertex
{
public:
- Vertex() { }
+ Vertex() = default;
Vertex(const float& x, const float& y, const float& z) : x(x), y(y),z(z) { }
Vertex(Vertex* vert)
{
@@ -102,9 +102,7 @@ public:
public:
TriFace()
- {
-
- }
+ = default;
TriFace(const int& v1, const int& v2, const int& v3)
: v1(v1), v2(v2), v3(v3), nx(0.0), ny(0.0), nz(0.0)
{
diff --git a/src/basics/geometry3d/KdTree/KdSplitCandidateManager.h b/src/basics/geometry3d/KdTree/KdSplitCandidateManager.h
index 7c5d707b8b6616ad0a1c08801869ba22f4d458e5..f107bac602c658527f943c13c1dacd64a9cc506c 100644
--- a/src/basics/geometry3d/KdTree/KdSplitCandidateManager.h
+++ b/src/basics/geometry3d/KdTree/KdSplitCandidateManager.h
@@ -16,9 +16,7 @@ namespace Kd
public:
SplitCandidateManager()
- {
-
- }
+ = default;
/* ======================================================================================= */
SplitCandidate<T>& operator[] (const std::size_t& i)
{
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp
index 0a7a57a6753960fc0c1174925494ed311fc6ea72..dcdfd989d1dbd1c011769e1d573d282de9a80511 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp
@@ -6,7 +6,7 @@ using namespace std;
/*==========================================================*/
DensityBCAdapter::DensityBCAdapter(const double& dens, const double& startTime, const double& endTime )
{
- this->densBCs.push_back( BCFunction(dens,startTime,endTime) );
+ this->densBCs.emplace_back(dens,startTime,endTime );
this->init();
}
/*==========================================================*/
@@ -24,7 +24,7 @@ DensityBCAdapter::DensityBCAdapter(const std::vector< BCFunction >& densBCs)
/*==========================================================*/
DensityBCAdapter::DensityBCAdapter(const mu::Parser& function, const double& startTime, const double& endTime )
{
- this->densBCs.push_back(BCFunction(function,startTime,endTime));
+ this->densBCs.emplace_back(function,startTime,endTime);
this->init();
}
/*==========================================================*/
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
index 131c2ff7b9aba9fca1c359f1b952d07d5d97fa4e..3cc990b9683de12169d1af26b2d5defd9e10f67c 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
@@ -250,17 +250,17 @@ void AverageValuesCoProcessor::addData(const SPtr<Block3D> block)
//Diese Daten werden geschrieben:
datanames.resize(0);
- datanames.push_back("AvVx");
- datanames.push_back("AvVy");
- datanames.push_back("AvVz");
- datanames.push_back("AvVxx");
- datanames.push_back("AvVyy");
- datanames.push_back("AvVzz");
- datanames.push_back("AvVxy");
- datanames.push_back("AvVxz");
- datanames.push_back("AvVyz");
- datanames.push_back("AvP");
- datanames.push_back("AvPrms");
+ datanames.emplace_back("AvVx");
+ datanames.emplace_back("AvVy");
+ datanames.emplace_back("AvVz");
+ datanames.emplace_back("AvVxx");
+ datanames.emplace_back("AvVyy");
+ datanames.emplace_back("AvVzz");
+ datanames.emplace_back("AvVxy");
+ datanames.emplace_back("AvVxz");
+ datanames.emplace_back("AvVyz");
+ datanames.emplace_back("AvP");
+ datanames.emplace_back("AvPrms");
data.resize(datanames.size());
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
index 474a4947e01e698cf13490dd516b5c45fa68c62a..93802d6fcdcdb4d29a6f962318ea490df3ad7cc1 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
@@ -102,7 +102,7 @@ void IntegrateValuesHelper::init(int level)
{
if (!bcArray->isSolid(ix1, ix2, ix3) && !bcArray->isUndefined(ix1, ix2, ix3))
{
- cn.nodes.push_back(UbTupleInt3(ix1, ix2, ix3));
+ cn.nodes.emplace_back(ix1, ix2, ix3);
numFluids++;
}
else if (bcArray->isSolid(ix1, ix2, ix3))
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
index cd36bda413e1b3c4f3e14d405e992bad4cea9945..417f713a7c1e7ad111f7f8c95322613a0bbc12c6 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
@@ -139,7 +139,7 @@ void PressureCoefficientCoProcessor::writeValues(int step)
if (comm->getProcessID() == comm->getRoot())
{
datanames.resize(0);
- datanames.push_back("rho");
+ datanames.emplace_back("rho");
data.resize(datanames.size());
std::ofstream ostr;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
index b53487f6b5100d3fc8145f404a924940cd6e7b54..909ea021045ee149fef0619853b2d75945f32be2 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
@@ -107,8 +107,8 @@ void QCriterionCoProcessor::addData(const SPtr<Block3D> block)
//Diese Daten werden geschrieben:
datanames.resize(0);
- datanames.push_back("q");
- datanames.push_back("scaleFactor");
+ datanames.emplace_back("q");
+ datanames.emplace_back("scaleFactor");
data.resize(datanames.size());
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
index c36e793d3a22f4bc6557d1c5865e731f57c739de..5487936b53f3b370198e60e076527e749c499d43 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
@@ -244,8 +244,8 @@ void ShearStressCoProcessor::addData()
{
//Diese Daten werden geschrieben:
datanames.resize(0);
- datanames.push_back("y^plus");
- datanames.push_back("u_tau");
+ datanames.emplace_back("y^plus");
+ datanames.emplace_back("u_tau");
//datanames.push_back("yPlusFD");
data.resize(datanames.size());
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
index 88e7b5a8700c1ea10da94171959cdb002f4f51d0..b3a92e95f5632c771c06725f3b9891e83f66f294 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
@@ -225,45 +225,45 @@ void TimeAveragedValuesCoProcessor::addData(const SPtr<Block3D> block)
//Diese Daten werden geschrieben:
datanames.resize(0);
- datanames.push_back("level");
- datanames.push_back("Rho");
+ datanames.emplace_back("level");
+ datanames.emplace_back("Rho");
if ((options&Density) == Density)
{
- datanames.push_back("taRho");
- datanames.push_back("taRhoF");
+ datanames.emplace_back("taRho");
+ datanames.emplace_back("taRhoF");
}
if ((options&Velocity) == Velocity)
{
- datanames.push_back("taVx");
- datanames.push_back("taVy");
- datanames.push_back("taVz");
+ datanames.emplace_back("taVx");
+ datanames.emplace_back("taVy");
+ datanames.emplace_back("taVz");
}
if ((options&Fluctuations) == Fluctuations)
{
- datanames.push_back("taVxx");
- datanames.push_back("taVyy");
- datanames.push_back("taVzz");
- datanames.push_back("taVxy");
- datanames.push_back("taVxz");
- datanames.push_back("taVyz");
- datanames.push_back("taVyz");
+ datanames.emplace_back("taVxx");
+ datanames.emplace_back("taVyy");
+ datanames.emplace_back("taVzz");
+ datanames.emplace_back("taVxy");
+ datanames.emplace_back("taVxz");
+ datanames.emplace_back("taVyz");
+ datanames.emplace_back("taVyz");
}
if ((options&Triplecorrelations) == Triplecorrelations)
{
- datanames.push_back("taVxxx");
- datanames.push_back("taVxxy");
- datanames.push_back("taVxxz");
- datanames.push_back("taVyyy");
- datanames.push_back("taVyyx");
- datanames.push_back("taVyyz");
- datanames.push_back("taVzzz");
- datanames.push_back("taVzzx");
- datanames.push_back("taVzzy");
- datanames.push_back("taVxyz");
+ datanames.emplace_back("taVxxx");
+ datanames.emplace_back("taVxxy");
+ datanames.emplace_back("taVxxz");
+ datanames.emplace_back("taVyyy");
+ datanames.emplace_back("taVyyx");
+ datanames.emplace_back("taVyyz");
+ datanames.emplace_back("taVzzz");
+ datanames.emplace_back("taVzzx");
+ datanames.emplace_back("taVzzy");
+ datanames.emplace_back("taVxyz");
}
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp
index 2eab0a349d1e660fd0fe798b7dc3f0c345bab19c..9f1a383c259f26d6dc9e4e357ff11d9d46d74845 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp
@@ -113,7 +113,7 @@ void TurbulenceIntensityCoProcessor::addData(const SPtr<Block3D> block)
//Diese Daten werden geschrieben:
datanames.resize(0);
- datanames.push_back("TI");
+ datanames.emplace_back("TI");
data.resize(datanames.size());
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp
index 754cfb77b18cd290d2f8344766e18a2112273272..0f53b97a4acedd5ebc286f3f3e3a596bc40cb211 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp
@@ -134,12 +134,12 @@ void WriteMQFromSelectionCoProcessor::addDataMQ(SPtr<Block3D> block)
//Diese Daten werden geschrieben:
datanames.resize(0);
- datanames.push_back("Rho");
- datanames.push_back("Vx");
- datanames.push_back("Vy");
- datanames.push_back("Vz");
+ datanames.emplace_back("Rho");
+ datanames.emplace_back("Vx");
+ datanames.emplace_back("Vy");
+ datanames.emplace_back("Vz");
//datanames.push_back("Press");
- datanames.push_back("Level");
+ datanames.emplace_back("Level");
//datanames.push_back("BlockID");
@@ -200,9 +200,9 @@ void WriteMQFromSelectionCoProcessor::addDataMQ(SPtr<Block3D> block)
int index = 0;
nodeNumbers(ix1, ix2, ix3) = nr++;
- nodes.push_back(UbTupleFloat3(float(worldCoordinates[0]),
+ nodes.emplace_back(float(worldCoordinates[0]),
float(worldCoordinates[1]),
- float(worldCoordinates[2])));
+ float(worldCoordinates[2]));
distributions->getDistribution(f, ix1, ix2, ix3);
calcMacros(f, rho, vx1, vx2, vx3);
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
index a018f7bb91a45677a4277fcdef6197f0e39c9cda..b01159e580d9b551430741ce890d0fed32b91710 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
@@ -2,7 +2,6 @@
#include "D3Q27System.h"
#include "InterpolationProcessor.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
-#include <math.h>
#include "DataSet3D.h"
#include "Block3D.h"
diff --git a/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp
index e8eaa11d4f21a115d7d9d2c1a8ecc53c0dbff466..85047e2588259a5764f0c8193aaf68352c06b1c9 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/CoarsenCrossAndInsideGbObjectBlockVisitor.cpp
@@ -9,7 +9,7 @@ CoarsenCrossAndInsideGbObjectBlockVisitor::CoarsenCrossAndInsideGbObjectBlockVis
}
//////////////////////////////////////////////////////////////////////////
CoarsenCrossAndInsideGbObjectBlockVisitor::CoarsenCrossAndInsideGbObjectBlockVisitor(SPtr<GbObject3D> geoObject, int fineLevel, int coarseLevel)
- : Block3DVisitor(fineLevel, fineLevel), geoObject(geoObject), notActive(true), coarseLevel(coarseLevel)
+ : Block3DVisitor(fineLevel, fineLevel), geoObject(geoObject), coarseLevel(coarseLevel)
{
}