From 4073ac4c14c64f1087ac11183482ca540113de2d Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-bs.de>
Date: Sat, 27 Nov 2021 13:17:12 +0100
Subject: [PATCH] Remove parameters of updateGrid which are not needed anymore
---
.../Calculation/UpdateGrid27.cpp | 16 +++++++---------
.../VirtualFluids_GPU/Calculation/UpdateGrid27.h | 4 +---
src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp | 2 +-
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
index 3ee6f3189..5ba634900 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
@@ -9,15 +9,13 @@
#include "Kernel/Kernel.h"
#include "Parameter/CudaStreamManager.h"
-void UpdateGrid27::updateGrid(Parameter *para, vf::gpu::Communicator *comm, CudaMemoryManager *cudaManager,
- std::vector<std::shared_ptr<PorousMedia>> &pm, int level, unsigned int t,
- std::vector<SPtr<Kernel>> &kernels)
+void UpdateGrid27::updateGrid(int level, unsigned int t)
{
//////////////////////////////////////////////////////////////////////////
if (level != para->getFine()) {
- updateGrid(para, comm, cudaManager, pm, level + 1, t, kernels);
- updateGrid(para, comm, cudaManager, pm, level + 1, t, kernels);
+ updateGrid(level + 1, t);
+ updateGrid(level + 1, t);
}
//////////////////////////////////////////////////////////////////////////
@@ -26,20 +24,20 @@ void UpdateGrid27::updateGrid(Parameter *para, vf::gpu::Communicator *comm, Cuda
//////////////////////////////////////////////////////////////////////////
- postCollisionBC(para, level, t);
+ postCollisionBC(para.get(), level, t);
//////////////////////////////////////////////////////////////////////////
- swapBetweenEvenAndOddTimestep(para, level);
+ swapBetweenEvenAndOddTimestep(para.get(), level);
//////////////////////////////////////////////////////////////////////////
if (para->getUseWale())
- calcMacroscopicQuantities(para, level);
+ calcMacroscopicQuantities(para.get(), level);
//////////////////////////////////////////////////////////////////////////
- preCollisionBC(para, cudaManager, level, t);
+ preCollisionBC(para.get(), cudaManager.get(), level, t);
//////////////////////////////////////////////////////////////////////////
if( level != para->getFine() )
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
index 3a0094073..32b4bf82b 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
@@ -15,9 +15,7 @@ class UpdateGrid27
public:
UpdateGrid27(SPtr<Parameter> para, vf::gpu::Communicator *comm, SPtr<CudaMemoryManager> cudaManager,
std::vector<std::shared_ptr<PorousMedia>> &pm, std::vector<SPtr<Kernel>> &kernels);
- void updateGrid(Parameter *para, vf::gpu::Communicator *comm, CudaMemoryManager *cudaManager,
- std::vector<std::shared_ptr<PorousMedia>> &pm, int level, unsigned int t,
- std::vector<SPtr<Kernel>> &kernels);
+ void updateGrid(int level, unsigned int t);
private:
typedef void (UpdateGrid27::*collisionAndExchangeFun)(int level, unsigned int t);
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
index ddcfa298e..ae6d1db2e 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -440,7 +440,7 @@ void Simulation::run()
////////////////////////////////////////////////////////////////////////////////
for(t=para->getTStart();t<=para->getTEnd();t++)
{
- this->updateGrid27->updateGrid(para.get(), comm, cudaManager.get(), pm, 0, t, kernels);
+ this->updateGrid27->updateGrid(0, t);
////////////////////////////////////////////////////////////////////////////////
//Particles
--
GitLab