From 25a85b7d0d70d1e9daf5da0aa26e016f58bef2de Mon Sep 17 00:00:00 2001
From: Sven Marcus <sven.marcus@tu-braunschweig.de>
Date: Tue, 19 Jul 2022 11:06:48 +0200
Subject: [PATCH] Clean up unnecessary comments
---
.../Utilities/LogFileReader/LogFileReader.cpp | 9 ---------
.../PostProcessingConfigFileReaderImp.cpp | 9 ---------
.../Utilities/ConfigFileReaderNT/ConfigFileReaderNT.h | 1 -
.../Utilities/InitialCondition/InitialConditionImp.cpp | 3 ---
.../VirtualFluidSimulation/VirtualFluidSimulationImp.cpp | 8 +++-----
.../VirtualFluidSimulationFactoryImp.cpp | 6 +++++-
src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp | 4 ++--
src/gpu/VirtualFluids_GPU/LBM/Simulation.h | 4 ++--
8 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp
index 9f4254c7a..5a469b44a 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp
@@ -11,7 +11,6 @@
#include "Utilities/LogFileData/LogFileDataImp.h"
-// #include "Core/Input/Input.h"
#include <basics/config/ConfigurationFile.h>
#include "Core/StringUtilities/StringUtil.h"
@@ -34,14 +33,6 @@ std::shared_ptr<LogFileData> LogFileReader::readLogFileToLogFileData(std::string
{
std::shared_ptr<LogFileDataImp> logFileData = LogFileDataImp::getNewInstance();
- // std::ifstream stream;
- // stream.open(filePath.c_str(), std::ios::in);
- // if (stream.fail()) {
- // std::cout << "can not open log file!\n";
- // exit(1);
- // }
-
- // std::unique_ptr<input::Input> input = input::Input::makeInput(stream, "config");
auto input = std::make_shared<vf::basics::ConfigurationFile>();
input->load(filePath);
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
index 9b4eec35e..7bff82d21 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
@@ -1,6 +1,5 @@
#include "PostProcessingConfigFileReaderImp.h"
-// #include "Core/Input/Input.h"
#include <basics/config/ConfigurationFile.h>
#include "Core/StringUtilities/StringUtil.h"
@@ -16,17 +15,9 @@ std::shared_ptr<PostProcessingConfigFileReader> PostProcessingConfigFileReaderIm
std::shared_ptr<PostProcessingConfigData> PostProcessingConfigFileReaderImp::readConfigFile(std::string filePath)
{
- // std::ifstream stream;
- // stream.open(filePath.c_str(), std::ios::in);
- // if (stream.fail()) {
- // throw "can not open config file!\n";
- // exit(1);
- // }
- // std::shared_ptr<input::Input> input = input::Input::makeInput(stream, "config");
auto input = std::make_shared<vf::basics::ConfigurationFile>();
input->load(filePath);
-
std::vector<BasicSimulation> simulation;
std::vector<Assistant> assistants;
std::vector<DataCombination> combination;
diff --git a/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.h b/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.h
index ae48c727b..d9446388f 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.h
+++ b/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.h
@@ -1,7 +1,6 @@
#ifndef CONFIG_FILE_READER_H
#define CONFIG_FILE_READER_H
-// #include "Core/Input/Input.h"
#include "Utilities/Structs/ConfigDataStruct.h"
#include <memory>
diff --git a/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.cpp
index f9046ffd0..72045afbe 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/InitialCondition/InitialConditionImp.cpp
@@ -17,17 +17,14 @@ void InitialConditionImp::init(const int level)
real InitialConditionImp::getXCoord(int i, int level)
{
return para->getParH(level)->coordinateX[i] - 1.0;
- // return (real)(para->getParH(level)->coordX_SP[i] - 1.0);
}
real InitialConditionImp::getYCoord(int i, int level)
{
return para->getParH(level)->coordinateY[i] - 1.0;
- // return (real)(para->getParH(level)->coordY_SP[i] - 1.0);
}
real InitialConditionImp::getZCoord(int i, int level)
{
return para->getParH(level)->coordinateZ[i] - 1.0;
- // return (real)(para->getParH(level)->coordZ_SP[i] - 1.0);
}
\ No newline at end of file
diff --git a/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulationImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulationImp.cpp
index bf6c326ee..53bb1d750 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulationImp.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulation/VirtualFluidSimulationImp.cpp
@@ -13,11 +13,9 @@
void VirtualFluidSimulationImp::run()
{
numericalTestSuite->makeSimulationHeadOutput();
- auto sim = Simulation(para, cudaManager, vf::gpu::Communicator::getInstance(), *grid.get(), new BoundaryConditionFactory());
-
- // These are created by the Simulation itself
- // sim.setFactories(kernelFactory, preProcessorFactory);
- // sim.init(para, grid, dataWriter, cudaManager);
+ BoundaryConditionFactory bc_factory;
+ auto sim = Simulation(para, cudaManager, vf::gpu::Communicator::getInstance(), *grid.get(), &bc_factory);
+ sim.setDataWriter(dataWriter);
timeTracking->setSimulationStartTime();
sim.run();
diff --git a/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.cpp b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.cpp
index d51261a81..437849ab2 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/VirtualFluidSimulationFactory/VirtualFluidSimulationFactoryImp.cpp
@@ -39,7 +39,11 @@ std::shared_ptr<Parameter> VirtualFluidSimulationFactoryImp::makeParameter(std::
para->setTimestepEnd(simPara->getEndTime());
para->setTimestepOut(simPara->getTimeStepLength());
+<<<<<<< HEAD
para->setTimestepStartOut(1);
+=======
+ para->setTStartOut(1);
+>>>>>>> Clean up unnecessary comments
para->setViscosityLB(simPara->getViscosity());
para->setVelocityLB(simPara->getMaxVelocity());
@@ -82,7 +86,7 @@ std::shared_ptr<Parameter> VirtualFluidSimulationFactoryImp::makeParameter(std::
para->setDiffOn(false);
para->setDoCheckPoint(false);
para->setDoRestart(false);
- para->setGeometryValues(false);
+ para->setUseGeometryValues(false);
para->setCalc2ndOrderMoments(false);
para->setCalc3rdOrderMoments(false);
para->setCalcHighOrderMoments(false);
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
index a22cd110e..21047604c 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -417,9 +417,9 @@ void Simulation::addEnstrophyAnalyzer(uint tAnalyse)
this->enstrophyAnalyzer = std::make_unique<EnstrophyAnalyzer>(this->para, tAnalyse);
}
-void Simulation::setDataWriter(std::unique_ptr<DataWriter>&& dataWriter_)
+void Simulation::setDataWriter(std::shared_ptr<DataWriter> dataWriter_)
{
- this->dataWriter = std::move(dataWriter_);
+ this->dataWriter = dataWriter_;
}
void Simulation::setFactories(std::unique_ptr<KernelFactory> &&kernelFactory_,
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
index e43e88e48..ac91c6c33 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
@@ -40,7 +40,7 @@ public:
void setFactories(std::unique_ptr<KernelFactory> &&kernelFactory,
std::unique_ptr<PreProcessorFactory> &&preProcessorFactory);
- void setDataWriter(std::unique_ptr<DataWriter>&& dataWriter);
+ void setDataWriter(std::shared_ptr<DataWriter> dataWriter);
void addKineticEnergyAnalyzer(uint tAnalyse);
void addEnstrophyAnalyzer(uint tAnalyse);
@@ -67,7 +67,7 @@ private:
vf::gpu::Communicator& communicator;
SPtr<Parameter> para;
- std::unique_ptr<DataWriter> dataWriter;
+ std::shared_ptr<DataWriter> dataWriter;
std::shared_ptr<CudaMemoryManager> cudaMemoryManager;
std::vector < SPtr< Kernel>> kernels;
std::vector < SPtr< ADKernel>> adKernels;
--
GitLab