From 1193d11f5704e7d5a21ed7e98cb2e32d64c31381 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Wed, 7 Oct 2020 11:03:09 +0200
Subject: [PATCH] Use emplace_back instead of push_back.
---
src/basics/Core/Input/Input.cpp | 8 ++---
src/basics/basics/utilities/UbScheduler.h | 2 +-
.../BoundaryConditions/BoundaryConditions.h | 8 ++---
.../BoundaryConditions/VelocityBCAdapter.cpp | 36 +++++++++----------
.../CoProcessors/WriteBlocksCoProcessor.cpp | 12 +++----
.../WriteBoundaryConditionsCoProcessor.cpp | 10 +++---
.../WriteMacroscopicQuantitiesCoProcessor.cpp | 14 ++++----
.../LBM/CumulantK17LBMKernel.cpp | 2 +-
.../Visitors/SetSolidBlocksBlockVisitor.cpp | 4 ++-
9 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/src/basics/Core/Input/Input.cpp b/src/basics/Core/Input/Input.cpp
index 069d76a5b..4d2aee7de 100644
--- a/src/basics/Core/Input/Input.cpp
+++ b/src/basics/Core/Input/Input.cpp
@@ -1,5 +1,7 @@
#include "Input.h"
+#include <memory>
+
#ifdef BUILD_JSONCPP
#include "JsonInput/JsonInput.h"
#endif
@@ -15,10 +17,8 @@ namespace input
if(inputType == "json")
return std::unique_ptr<Input>(new JsonInput(stream));
#endif
-
- // changed by St. Lenz: make_unique<...> is C++ 14 standard!
- //return std::make_unique<ConfigInput>(stream);
- return std::unique_ptr<ConfigInput>(new ConfigInput(stream));
+
+ return std::make_unique<ConfigInput>(stream);
}
}
diff --git a/src/basics/basics/utilities/UbScheduler.h b/src/basics/basics/utilities/UbScheduler.h
index ae199b9d8..fcb410b22 100644
--- a/src/basics/basics/utilities/UbScheduler.h
+++ b/src/basics/basics/utilities/UbScheduler.h
@@ -136,7 +136,7 @@ public:
}
//nu aber:
- schedules.push_back(UbSchedule(step, begin, end));
+ schedules.emplace_back(step, begin, end);
if( end>maxT ) maxT = end;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
index eafba3016..2f36837b5 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
@@ -210,10 +210,10 @@ public:
virtual std::vector< std::string > getBCNames()
{
std::vector< std::string > tmp;
- tmp.push_back( "NoSlipBC" );
- tmp.push_back( "SlipBC" );
- tmp.push_back( "VelocityBC" );
- tmp.push_back( "DensityBC" );
+ tmp.emplace_back("NoSlipBC" );
+ tmp.emplace_back("SlipBC" );
+ tmp.emplace_back("VelocityBC" );
+ tmp.emplace_back("DensityBC" );
return tmp;
}
virtual std::vector< long long > getBCFlags()
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.cpp
index 393592d09..7c2d9f467 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.cpp
@@ -49,25 +49,25 @@ VelocityBCAdapter::VelocityBCAdapter(const bool& vx1, const bool& vx2, const boo
/*==========================================================*/
VelocityBCAdapter::VelocityBCAdapter(const bool& vx1, const bool& vx2, const bool& vx3, const mu::Parser& function, const double& startTime, const double& endTime )
{
- if(vx1) this->vx1BCs.push_back(BCFunction(function,startTime,endTime));
- if(vx2) this->vx2BCs.push_back(BCFunction(function,startTime,endTime));
- if(vx3) this->vx3BCs.push_back(BCFunction(function,startTime,endTime));
+ if(vx1) this->vx1BCs.emplace_back(function,startTime,endTime);
+ if(vx2) this->vx2BCs.emplace_back(function,startTime,endTime);
+ if(vx3) this->vx3BCs.emplace_back(function,startTime,endTime);
this->init();
}
/*==========================================================*/
VelocityBCAdapter::VelocityBCAdapter(const bool& vx1, const bool& vx2, const bool& vx3, const mu::Parser& function1, const mu::Parser& function2, const mu::Parser& function3, const double& startTime, const double& endTime )
{
- if(vx1) this->vx1BCs.push_back(BCFunction(function1,startTime,endTime));
- if(vx2) this->vx2BCs.push_back(BCFunction(function2,startTime,endTime));
- if(vx3) this->vx3BCs.push_back(BCFunction(function3,startTime,endTime));
+ if(vx1) this->vx1BCs.emplace_back(function1,startTime,endTime);
+ if(vx2) this->vx2BCs.emplace_back(function2,startTime,endTime);
+ if(vx3) this->vx3BCs.emplace_back(function3,startTime,endTime);
this->init();
}
/*==========================================================*/
VelocityBCAdapter::VelocityBCAdapter(const bool& vx1, const bool& vx2, const bool& vx3, const string& functionstring, const double& startTime, const double& endTime )
{
- if(vx1) this->vx1BCs.push_back(BCFunction(functionstring,startTime,endTime));
- if(vx2) this->vx2BCs.push_back(BCFunction(functionstring,startTime,endTime));
- if(vx3) this->vx3BCs.push_back(BCFunction(functionstring,startTime,endTime));
+ if(vx1) this->vx1BCs.emplace_back(functionstring,startTime,endTime);
+ if(vx2) this->vx2BCs.emplace_back(functionstring,startTime,endTime);
+ if(vx3) this->vx3BCs.emplace_back(functionstring,startTime,endTime);
this->init();
}
/*==========================================================*/
@@ -99,9 +99,9 @@ VelocityBCAdapter::VelocityBCAdapter(const double& vx1, const double& vx1StartTi
const double& vx2, const double& vx2StartTime, const double& vx2EndTime,
const double& vx3, const double& vx3StartTime, const double& vx3EndTime )
{
- this->vx1BCs.push_back(BCFunction(vx1,vx1StartTime,vx1EndTime));
- this->vx2BCs.push_back(BCFunction(vx2,vx2StartTime,vx2EndTime));
- this->vx3BCs.push_back(BCFunction(vx3,vx3StartTime,vx3EndTime));
+ this->vx1BCs.emplace_back(vx1,vx1StartTime,vx1EndTime);
+ this->vx2BCs.emplace_back(vx2,vx2StartTime,vx2EndTime);
+ this->vx3BCs.emplace_back(vx3,vx3StartTime,vx3EndTime);
this->init();
}
/*==========================================================*/
@@ -109,9 +109,9 @@ VelocityBCAdapter::VelocityBCAdapter(const string& vx1Function, const double& vx
const string& vx2Function, const double& vx2StartTime, const double& vx2EndTime,
const string& vx3Function, const double& vx3StartTime, const double& vx3EndTime )
{
- if(vx1Function.size()) this->vx1BCs.push_back(BCFunction(vx1Function,vx1StartTime,vx1EndTime));
- if(vx2Function.size()) this->vx2BCs.push_back(BCFunction(vx2Function,vx2StartTime,vx2EndTime));
- if(vx3Function.size()) this->vx3BCs.push_back(BCFunction(vx3Function,vx3StartTime,vx3EndTime));
+ if(vx1Function.size()) this->vx1BCs.emplace_back(vx1Function,vx1StartTime,vx1EndTime);
+ if(vx2Function.size()) this->vx2BCs.emplace_back(vx2Function,vx2StartTime,vx2EndTime);
+ if(vx3Function.size()) this->vx3BCs.emplace_back(vx3Function,vx3StartTime,vx3EndTime);
this->init();
}
/*==========================================================*/
@@ -120,9 +120,9 @@ void VelocityBCAdapter::setNewVelocities(const double& vx1, const double& vx1Sta
const double& vx3, const double& vx3StartTime, const double& vx3EndTime )
{
this->clear();
- this->vx1BCs.push_back(BCFunction(vx1,vx1StartTime,vx1EndTime));
- this->vx2BCs.push_back(BCFunction(vx2,vx2StartTime,vx2EndTime));
- this->vx3BCs.push_back(BCFunction(vx3,vx3StartTime,vx3EndTime));
+ this->vx1BCs.emplace_back(vx1,vx1StartTime,vx1EndTime);
+ this->vx2BCs.emplace_back(vx2,vx2StartTime,vx2EndTime);
+ this->vx3BCs.emplace_back(vx3,vx3StartTime,vx3EndTime);
this->init();
}
/*==========================================================*/
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp
index 5c6870b18..077c10e32 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp
@@ -70,12 +70,12 @@ void WriteBlocksCoProcessor::collectData(double step)
std::vector< UbTupleInt8 > cells;
std::vector<std::string> celldatanames;
- celldatanames.push_back("isActive");
- celldatanames.push_back("rank");
- celldatanames.push_back("interface");
- celldatanames.push_back("ID");
- celldatanames.push_back("part");
- celldatanames.push_back("level");
+ celldatanames.emplace_back("isActive");
+ celldatanames.emplace_back("rank");
+ celldatanames.emplace_back("interface");
+ celldatanames.emplace_back("ID");
+ celldatanames.emplace_back("part");
+ celldatanames.emplace_back("level");
//celldatanames.push_back("connectorCF");
//celldatanames.push_back("connectorFC");
#if defined VF_FETOL
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
index 0f19edb4b..52bc483f2 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
@@ -150,12 +150,12 @@ void WriteBoundaryConditionsCoProcessor::addDataGeo(SPtr<Block3D> block)
//Diese Daten werden geschrieben:
datanames.resize(0);
- datanames.push_back("Boundary Conditions");
- datanames.push_back("Geometry");
- datanames.push_back("Level");
- datanames.push_back("Algorithm");
+ datanames.emplace_back("Boundary Conditions");
+ datanames.emplace_back("Geometry");
+ datanames.emplace_back("Level");
+ datanames.emplace_back("Algorithm");
//datanames.push_back("Interface CF");
- datanames.push_back("qs");
+ datanames.emplace_back("qs");
data.resize(datanames.size());
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
index 31bb9ec70..0b19a8ba6 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
@@ -149,11 +149,11 @@ void WriteMacroscopicQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
{
//This data is written:
datanames.resize(0);
- datanames.push_back("DRho");
- datanames.push_back("Press");
- datanames.push_back("Vx");
- datanames.push_back("Vy");
- datanames.push_back("Vz");
+ datanames.emplace_back("DRho");
+ datanames.emplace_back("Press");
+ datanames.emplace_back("Vx");
+ datanames.emplace_back("Vy");
+ datanames.emplace_back("Vz");
data.resize(datanames.size());
@@ -202,9 +202,9 @@ void WriteMacroscopicQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
int index = 0;
nodeNumbers(ix1,ix2,ix3) = nr++;
Vector3D worldCoordinates = grid->getNodeCoordinates(block, ix1, ix2, ix3);
- 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,drho,vx1,vx2,vx3);
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp
index f510d9f58..11787ab8b 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp
@@ -34,7 +34,7 @@
#include "CumulantK17LBMKernel.h"
#include "D3Q27System.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
-#include <math.h>
+#include <cmath>
#include "DataSet3D.h"
#include "LBMKernel.h"
#include "Block3D.h"
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.cpp
index 5c3d0762f..de9edef09 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetSolidBlocksBlockVisitor.cpp
@@ -33,13 +33,15 @@
#include "SetSolidBlocksBlockVisitor.h"
+#include <utility>
+
#include "Interactor3D.h"
#include "Grid3DSystem.h"
#include "Grid3D.h"
#include "Block3D.h"
SetSolidBlocksBlockVisitor::SetSolidBlocksBlockVisitor(SPtr<Interactor3D> interactor) :
- Block3DVisitor(0, Grid3DSystem::MAXLEVEL), interactor(interactor)
+ Block3DVisitor(0, Grid3DSystem::MAXLEVEL), interactor(std::move(interactor))
{
}
--
GitLab