diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp
index 9f4254c7a4b717509e607384052dc810a9696989..5a469b44ab21c9a0fc3850baf9f1a82c1f3a0314 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 9b4eec35e498c8491c8855e68bcef4d5e0a4550b..7bff82d2118e449ea19a1cfd56ff261b730ff0d4 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 ae48c727b7f74a97a95624a576b713bf8cc11a09..d9446388fdbc2721f95120212ddd9b4dfbf52b1b 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 f9046ffd028b8db6813fad71466a45ee7b367558..72045afbe7a68ba9c8595ee5c736dd5b2da89ec7 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 bf6c326ee9928c1bef171958b0cac928f9f08b2b..53bb1d75007a47572742a69907012e7f0d71efbd 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 d51261a81d9d03b61b1fccf671616847ebe4114a..437849ab24898a014acc030b1ccc134b59dd50d6 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 a22cd110e9b29019e5c52aab256cb5bb2a0103fe..21047604c0f45417cf3a992794363df4a85219f2 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 e43e88e482ea56e3d2fecdcd1275b209575e3442..ac91c6c33d61e9f4e7811394798eca74651c9605 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;