From 54b86584ac430d521fc981ca0c84d54dc4264e2c Mon Sep 17 00:00:00 2001
From: peters <peters@irmb.tu-bs.de>
Date: Tue, 15 Jun 2021 18:17:05 +0200
Subject: [PATCH] use new configuration in DrivenCavity.
---
apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp b/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
index af043fb15..8fe7281f6 100644
--- a/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
+++ b/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
@@ -22,6 +22,8 @@
#include "Core/VectorTypes.h"
#include "Core/Logger/Logger.h"
+#include <basics/config/ConfigurationFile.h>
+
//////////////////////////////////////////////////////////////////////////
#include "GridGenerator/grid/GridBuilder/LevelGridBuilder.h"
@@ -119,12 +121,6 @@ void multipleLevel(const std::string& configPath)
gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_IN_OBJECT);
auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
-
- vf::gpu::Communicator* comm = vf::gpu::Communicator::getInstanz();
- SPtr<ConfigFileReader> configReader = ConfigFileReader::getNewInstance();
-
- std::cout << configPath << std::endl;
- SPtr<ConfigData> configData = configReader->readConfigFile(configPath.c_str());
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -152,8 +148,12 @@ void multipleLevel(const std::string& configPath)
{
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ vf::gpu::Communicator* comm = vf::gpu::Communicator::getInstanz();
+
+ vf::basics::ConfigurationFile config;
+ config.load(configPath);
- SPtr<Parameter> para = Parameter::make(configData, comm);
+ SPtr<Parameter> para = std::make_shared<Parameter>(config, comm->getNummberOfProcess(), comm->getPID());
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--
GitLab