From 5c58fc97b9ed9a71da14cfbe6582e0cac6110c5c Mon Sep 17 00:00:00 2001
From: Anna <a.wellmann@tu-bs.de>
Date: Wed, 6 Jul 2022 07:07:15 +0000
Subject: [PATCH] Refactor FileWriter (small changes)
---
src/gpu/VirtualFluids_GPU/Output/DataWriter.h | 4 +--
.../VirtualFluids_GPU/Output/FileWriter.cpp | 26 +++++++++----------
src/gpu/VirtualFluids_GPU/Output/FileWriter.h | 4 +--
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/Output/DataWriter.h b/src/gpu/VirtualFluids_GPU/Output/DataWriter.h
index 564ab4f01..41fbfb505 100644
--- a/src/gpu/VirtualFluids_GPU/Output/DataWriter.h
+++ b/src/gpu/VirtualFluids_GPU/Output/DataWriter.h
@@ -49,9 +49,9 @@ class DataWriter
{
public:
//! Class default constructor
- VIRTUALFLUIDS_GPU_EXPORT DataWriter() {}
+ VIRTUALFLUIDS_GPU_EXPORT DataWriter() = default;
//! Class destructor
- virtual VIRTUALFLUIDS_GPU_EXPORT ~DataWriter() {}
+ virtual VIRTUALFLUIDS_GPU_EXPORT ~DataWriter() = default;
//! \brief write the initialization step to VTK file(s)
//! \param para instance of classParameter
diff --git a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
index 989d9f0be..276dbfc2b 100644
--- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
+++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
@@ -82,12 +82,12 @@ void FileWriter::writeUnstrucuredGridLT(SPtr<Parameter> para, std::vector<std::s
std::vector< UbTupleFloat3 > nodes;
std::vector< UbTupleUInt8 > cells;
std::vector< std::string > nodedatanames;
- nodedatanames.push_back("Press");
- nodedatanames.push_back("DRho");
- nodedatanames.push_back("Vx");
- nodedatanames.push_back("Vy");
- nodedatanames.push_back("Vz");
- nodedatanames.push_back("Geometry");
+ nodedatanames.emplace_back("Press");
+ nodedatanames.emplace_back("DRho");
+ nodedatanames.emplace_back("Vx");
+ nodedatanames.emplace_back("Vy");
+ nodedatanames.emplace_back("Vz");
+ nodedatanames.emplace_back("Geometry");
unsigned int number1, number2, number3, number4, number5, number6, number7, number8;
unsigned int dn1, dn2, dn3, dn4, dn5, dn6, dn7, dn8;
bool neighborsAreFluid;
@@ -185,13 +185,13 @@ void FileWriter::writeUnstrucuredGridAD(SPtr<Parameter> para, std::vector<std::s
std::vector<UbTupleFloat3> nodes;
std::vector<UbTupleUInt8> cells;
std::vector<std::string> nodedatanames;
- nodedatanames.push_back("Press");
- nodedatanames.push_back("DRho");
- nodedatanames.push_back("Vx");
- nodedatanames.push_back("Vy");
- nodedatanames.push_back("Vz");
- nodedatanames.push_back("Geometry");
- nodedatanames.push_back("Concentration");
+ nodedatanames.emplace_back("Press");
+ nodedatanames.emplace_back("DRho");
+ nodedatanames.emplace_back("Vx");
+ nodedatanames.emplace_back("Vy");
+ nodedatanames.emplace_back("Vz");
+ nodedatanames.emplace_back("Geometry");
+ nodedatanames.emplace_back("Concentration");
unsigned int number1, number2, number3, number4, number5, number6, number7, number8;
unsigned int dn1, dn2, dn3, dn4, dn5, dn6, dn7, dn8;
bool neighborsAreFluid;
diff --git a/src/gpu/VirtualFluids_GPU/Output/FileWriter.h b/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
index 45a90e4ca..d0121aefe 100644
--- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
+++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.h
@@ -50,9 +50,7 @@ class FileWriter : public DataWriter
{
public:
//! Class default constructor
- VIRTUALFLUIDS_GPU_EXPORT FileWriter() {}
- //! Class destructor
- VIRTUALFLUIDS_GPU_EXPORT ~FileWriter() {}
+ VIRTUALFLUIDS_GPU_EXPORT FileWriter() = default;
//! \brief write the initialization step to VTK file(s)
//! \param para instance of classParameter
--
GitLab