From aaba2f3abbeca859cd0e03874f05c9bff4bee5f0 Mon Sep 17 00:00:00 2001
From: "TESLA03\\Master" <a.wellmann@tu-bs.de>
Date: Wed, 16 Jun 2021 13:45:46 +0200
Subject: [PATCH] Fixes to GridProvider
Remove loop for forcing in allocAndCopyForcing() in GridProvider and move initParamter() in Simulation.cpp
---
.../DataStructureInitializer/GridProvider.cpp | 10 +++++-----
src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.cpp
index 957935756..0b49062d1 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.cpp
@@ -119,11 +119,11 @@ void GridProvider::allocAndCopyForcing()
cudaMemoryManager->cudaAllocForcing();
cudaMemoryManager->cudaCopyForcingToDevice();
- for (int level = para->getCoarse(); level <= para->getFine(); level++)
- {
- cudaMemoryManager->cudaAllocLevelForcing(level);
- cudaMemoryManager->cudaCopyLevelForcingToDevice(level);
- }
+ //for (int level = para->getCoarse(); level <= para->getFine(); level++)
+ //{
+ // cudaMemoryManager->cudaAllocLevelForcing(level);
+ // cudaMemoryManager->cudaCopyLevelForcingToDevice(level);
+ //}
}
void GridProvider::allocAndCopyQuadricLimiters()
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
index 9a4cd41ce..4e5f96d15 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -91,13 +91,13 @@ void Simulation::init(SPtr<Parameter> para, SPtr<GridProvider> gridProvider, std
para->setNumprocs(comm->getNummberOfProcess());
devCheck(comm->mapCudaDevice(para->getMyID(), para->getNumprocs(), para->getDevices(), para->getMaxDev()));
- para->initParameter();
-
gridProvider->allocAndCopyForcing();
gridProvider->allocAndCopyQuadricLimiters();
gridProvider->setDimensions();
gridProvider->setBoundingBox();
+ para->initParameter();
+
para->setRe(para->getVelocity() * (real)1.0 / para->getViscosity());
para->setPhi((real) 0.0);
para->setlimitOfNodesForVTK(30000000); //max 30 Million nodes per VTK file
--
GitLab