From b18594b606af23c95bf7165ac4d3e68d80db2698 Mon Sep 17 00:00:00 2001
From: "TESLA03\\Master" <a.wellmann@tu-bs.de>
Date: Wed, 14 Jul 2021 15:38:04 +0200
Subject: [PATCH] Use new configuration in MusselOyster
---
apps/gpu/LBM/MusselOyster/MusselOyster.cpp | 29 +++++++++----------
.../LBM/MusselOyster/configMusselOyster.txt | 4 +--
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
index 481c07748..25e42bbc8 100644
--- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
+++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
@@ -13,16 +13,14 @@
//////////////////////////////////////////////////////////////////////////
-#include "Core/DataTypes.h"
-#include "PointerDefinitions.h"
+#include "basics/Core/DataTypes.h"
+#include "basics/PointerDefinitions.h"
+#include "basics/Core/VectorTypes.h"
-#include "Core/LbmOrGks.h"
-#include "Core/Input/Input.h"
-#include "Core/StringUtilities/StringUtil.h"
-#include "Core/Input/ConfigFileReader/ConfigFileReader.h"
-
-#include "Core/VectorTypes.h"
-#include "Core/Logger/Logger.h"
+#include "basics/Core/LbmOrGks.h"
+#include "basics/Core/StringUtilities/StringUtil.h"
+#include "basics/config/ConfigurationFile.h"
+#include "basics/Core/Logger/Logger.h"
//////////////////////////////////////////////////////////////////////////
@@ -90,9 +88,11 @@ void multipleLevel(const std::string& configPath)
auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
vf::gpu::Communicator* comm = vf::gpu::Communicator::getInstanz();
- SPtr<ConfigFileReader> configReader = ConfigFileReader::getNewInstance();
+ vf::basics::ConfigurationFile config;
std::cout << configPath << std::endl;
- SPtr<ConfigData> configData = configReader->readConfigFile(configPath.c_str());
+ config.load(configPath);
+ SPtr<Parameter> para = std::make_shared<Parameter>(config, comm->getNummberOfProcess(), comm->getPID());
+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -107,7 +107,6 @@ void multipleLevel(const std::string& configPath)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- SPtr<Parameter> para = Parameter::make(configData, comm);
bool useGridGenerator = true;
bool useMultiGPU = true;
@@ -131,8 +130,8 @@ void multipleLevel(const std::string& configPath)
*logging::out << logging::Logger::INFO_HIGH << "velocity real [m/s] = " << vxLB * para->getVelocityRatio()<< " \n";
*logging::out << logging::Logger::INFO_HIGH << "viscosity real [m^2/s] = " << viscosityLB * para->getViscosityRatio() << "\n";
- para->setTOut(10000);
- para->setTEnd(100000);
+ para->setTOut(5000);
+ para->setTEnd(50000);
para->setCalcDragLift(false);
para->setUseWale(false);
@@ -215,7 +214,7 @@ void multipleLevel(const std::string& configPath)
gridBuilder->setSubDomainBox(std::make_shared<BoundingBox>(xGridMin, xGridMax,
ySplit, yGridMax,
zGridMin, zGridMax));
- // falsch, siehe unten
+
gridBuilder->setPeriodicBoundaryCondition(false, false, true);
gridBuilder->buildGrids(LBM, true); // buildGrids() has to be called before setting the BCs!!!!
diff --git a/apps/gpu/LBM/MusselOyster/configMusselOyster.txt b/apps/gpu/LBM/MusselOyster/configMusselOyster.txt
index cbef5687a..f80b80469 100644
--- a/apps/gpu/LBM/MusselOyster/configMusselOyster.txt
+++ b/apps/gpu/LBM/MusselOyster/configMusselOyster.txt
@@ -7,7 +7,7 @@
##################################################
#informations for Writing
##################################################
-#Path="E:/MusselOyster/results"
+Path="E:/MusselOyster/results"
#Path="F:/Work/Computations/out/MusselOyster/"
#Prefix="MusselOyster"
#WriteGrid=true
@@ -26,7 +26,7 @@ GridPath="E:/temp/GridMussel/MUSSEL"
#LBM Version
##################################################
#D3Qxx=27
-#MainKernelName=CumulantAA2016CompSP27
+#MainKernelName=CumulantK17CompChim
##################################################
#simulation parameter
--
GitLab