From 7a409997beebec736d532e189414a8f95d4e5fdb Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-bs.de>
Date: Tue, 13 Dec 2022 07:58:04 +0000
Subject: [PATCH] TestSetup1
---
.../ARAGORNUBUNTU.config.cmake | 1 +
apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp | 42 ++++++++++++-------
.../LBM/ActuatorLine/configActuatorLine.txt | 18 ++++----
src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp | 4 ++
4 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/CMake/cmake_config_files/ARAGORNUBUNTU.config.cmake b/CMake/cmake_config_files/ARAGORNUBUNTU.config.cmake
index 90debb1a4..cd50d08b1 100644
--- a/CMake/cmake_config_files/ARAGORNUBUNTU.config.cmake
+++ b/CMake/cmake_config_files/ARAGORNUBUNTU.config.cmake
@@ -13,5 +13,6 @@ set(GPU_APP "apps/gpu/LBM/")
list(APPEND USER_APPS
"${GPU_APP}DrivenCavityMultiGPU"
"${GPU_APP}SphereScaling"
+ "${GPU_APP}ActuatorLine"
# "${GPU_APP}MusselOyster"
)
\ No newline at end of file
diff --git a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
index 68927ad87..4a06cb82f 100644
--- a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
+++ b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
@@ -8,6 +8,7 @@
#include <fstream>
#include <exception>
#include <memory>
+#include <filesystem>
//////////////////////////////////////////////////////////////////////////
@@ -83,6 +84,8 @@ void multipleLevel(const std::string& configPath)
logging::Logger::timeStamp(logging::Logger::ENABLE);
logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
+ VF_LOG_INFO("Start Preprocessing");
+
vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();
auto gridFactory = GridFactory::make();
@@ -96,7 +99,7 @@ void multipleLevel(const std::string& configPath)
const real velocity = config.getValue<real>("Velocity");
- const real L_x = 24*reference_diameter;
+ const real L_x = 20*reference_diameter;
const real L_y = 6*reference_diameter;
const real L_z = 6*reference_diameter;
@@ -109,11 +112,11 @@ void multipleLevel(const std::string& configPath)
const float tOut = config.getValue<real>("tOut");
const float tEnd = config.getValue<real>("tEnd"); // total time of simulation
- const float tStartAveraging = config.getValue<real>("tStartAveraging");
- const float tStartTmpAveraging = config.getValue<real>("tStartTmpAveraging");
- const float tAveraging = config.getValue<real>("tAveraging");
- const float tStartOutProbe = config.getValue<real>("tStartOutProbe");
- const float tOutProbe = config.getValue<real>("tOutProbe");
+ // const float tStartAveraging = config.getValue<real>("tStartAveraging");
+ // const float tStartTmpAveraging = config.getValue<real>("tStartTmpAveraging");
+ // const float tAveraging = config.getValue<real>("tAveraging");
+ // const float tStartOutProbe = config.getValue<real>("tStartOutProbe");
+ // const float tOutProbe = config.getValue<real>("tOutProbe");
SPtr<Parameter> para = std::make_shared<Parameter>(communicator.getNummberOfProcess(), communicator.getPID(), &config);
BoundaryConditionFactory bcFactory = BoundaryConditionFactory();
@@ -121,12 +124,12 @@ void multipleLevel(const std::string& configPath)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- const real dx = reference_diameter/real(nodes_per_diameter);
+ const real dx = reference_diameter/real(nodes_per_diameter);
real turbPos[3] = {3*reference_diameter, 3*reference_diameter, 3*reference_diameter};
- gridBuilder->addCoarseGrid(0.0, 0.0, 0.0,
- L_x, L_y, L_z, dx);
+ gridBuilder->addCoarseGrid(0.0, 0.0, 0.0,
+ L_x, L_y, L_z, dx);
gridBuilder->setNumberOfLayers(4,0);
gridBuilder->addGrid( new Cuboid( turbPos[0]-1.5*reference_diameter, turbPos[1]-1.5*reference_diameter, turbPos[2]-1.5*reference_diameter,
@@ -134,11 +137,11 @@ void multipleLevel(const std::string& configPath)
para->setMaxLevel(2);
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
- gridBuilder->setPeriodicBoundaryCondition(false, false, false);
+ gridBuilder->setPeriodicBoundaryCondition(false, false, false);
- gridBuilder->buildGrids(lbmOrGks, false); // buildGrids() has to be called before setting the BCs!!!!
+ gridBuilder->buildGrids(lbmOrGks, false); // buildGrids() has to be called before setting the BCs!!!!
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
const real dt = dx * mach / (sqrt(3) * velocity);
@@ -243,11 +246,20 @@ int main( int argc, char* argv[])
{
try
{
- vf::logging::Logger::initalizeLogger();
+ //////////////////////////////////////////////////////////////////////////
+ // assuming that a config files is stored parallel to this file.
+ std::filesystem::path configPath = __FILE__;
+
+ // the config file's default name can be replaced by passing a command line argument
+ std::string configName("configActuatorLine.txt");
+ if (argc == 2) {
+ configName = argv[1];
+ std::cout << "Using configFile command line argument: " << configName << std::endl;
+ }
- if( argc > 1){ path = argv[1]; }
+ configPath.replace_filename(configName);
- multipleLevel(path + "/configActuatorLine.txt");
+ multipleLevel(configPath);
}
catch (const spdlog::spdlog_ex &ex) {
std::cout << "Log initialization failed: " << ex.what() << std::endl;
diff --git a/apps/gpu/LBM/ActuatorLine/configActuatorLine.txt b/apps/gpu/LBM/ActuatorLine/configActuatorLine.txt
index 5799f2471..311121235 100644
--- a/apps/gpu/LBM/ActuatorLine/configActuatorLine.txt
+++ b/apps/gpu/LBM/ActuatorLine/configActuatorLine.txt
@@ -1,14 +1,14 @@
##################################################
#informations for Writing
##################################################
-Path = .
+# Path = ./output
##################################################
#informations for reading
##################################################
GridPath=.
##################################################
ReferenceDiameter=126
-NodesPerDiameter=32
+NodesPerDiameter=16
Velocity=9
##################################################
tStartOut=100
@@ -16,15 +16,15 @@ tOut=100
tEnd=1000
##################################################
-tStartTmpAveraging=100
-tStartAveraging=100
-tAveraging=100
-tTmpAveraging=100
-tStartOutProbe=100
-tOutProbe=100
+# tStartTmpAveraging=100
+# tStartAveraging=100
+# tAveraging=100
+# tTmpAveraging=100
+# tStartOutProbe=100
+# tOutProbe=100
##################################################
-#TurbulenceModel = QR
+TurbulenceModel = None
#SGSconstant = 0.3333333
#
#QuadricLimiterP = 100000.0
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
index b120dd205..74d7e8ff8 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -461,6 +461,10 @@ void Simulation::run()
////////////////////////////////////////////////////////////////////////////////
// Time loop
////////////////////////////////////////////////////////////////////////////////
+
+ puts("\n\n\n\n\n\n");
+ VF_LOG_INFO("Start Simulation \n");
+
for(timestep=para->getTimestepStart();timestep<=para->getTimestepEnd();timestep++)
{
this->updateGrid27->updateGrid(0, timestep);
--
GitLab