From 499c861ed4e0e99b644b7501f3273acaf0dc53b8 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Thu, 8 Oct 2020 09:50:58 +0200
Subject: [PATCH] Use emplace_back and equal defaults.
---
src/basics/geometry3d/GbTriFaceMesh3D.h | 6 +--
.../KdTree/KdSplitCandidateManager.h | 4 +-
.../BoundaryConditions/DensityBCAdapter.cpp | 4 +-
.../CoProcessors/AverageValuesCoProcessor.cpp | 22 ++++-----
.../CoProcessors/IntegrateValuesHelper.cpp | 2 +-
.../PressureCoefficientCoProcessor.cpp | 2 +-
.../CoProcessors/QCriterionCoProcessor.cpp | 4 +-
.../CoProcessors/ShearStressCoProcessor.cpp | 4 +-
.../TimeAveragedValuesCoProcessor.cpp | 48 +++++++++----------
.../TurbulenceIntensityCoProcessor.cpp | 2 +-
.../WriteMQFromSelectionCoProcessor.cpp | 14 +++---
.../LBM/CompressibleCumulantLBMKernel.cpp | 1 -
...rsenCrossAndInsideGbObjectBlockVisitor.cpp | 2 +-
13 files changed, 55 insertions(+), 60 deletions(-)
diff --git a/src/basics/geometry3d/GbTriFaceMesh3D.h b/src/basics/geometry3d/GbTriFaceMesh3D.h
index 1aed8f915..eff53d4e2 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 7c5d707b8..f107bac60 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 0a7a57a67..dcdfd989d 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 131c2ff7b..3cc990b96 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 474a4947e..93802d6fc 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 cd36bda41..417f713a7 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 b53487f6b..909ea0210 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 c36e793d3..5487936b5 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 88e7b5a87..b3a92e95f 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 2eab0a349..9f1a383c2 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 754cfb77b..0f53b97a4 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 a018f7bb9..b01159e58 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 e8eaa11d4..85047e258 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)
{
}
--
GitLab