From 5e147120c8e9edd0aa5f92ded54dae955c948486 Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-bs.de>
Date: Thu, 28 Oct 2021 16:53:03 +0200
Subject: [PATCH] Rename function updateGrid27 to updateGrid
---
.../VirtualFluids_GPU/Calculation/UpdateGrid27.cpp | 12 +++++-------
src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h | 8 +++-----
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 e43389a62..01f8b4bda 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
@@ -9,15 +9,15 @@
#include "Kernel/Kernel.h"
#include "Parameter/CudaStreamManager.h"
-void UpdateGrid27::updateGrid27(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(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)
{
//////////////////////////////////////////////////////////////////////////
if (level != para->getFine()) {
- updateGrid27(para, comm, cudaManager, pm, level + 1, t, kernels);
- updateGrid27(para, comm, cudaManager, pm, level + 1, t, kernels);
+ updateGrid(para, comm, cudaManager, pm, level + 1, t, kernels);
+ updateGrid(para, comm, cudaManager, pm, level + 1, t, kernels);
}
//////////////////////////////////////////////////////////////////////////
@@ -1446,8 +1446,6 @@ void coarseToFine(Parameter* para, int level)
}
-UpdateGrid27::UpdateGrid27() = default;
-UpdateGrid27::~UpdateGrid27(){}
UpdateGrid27::UpdateGrid27(Parameter *para) {
chooseFunctionForCollisionAndExchange(para);
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
index 99ae734aa..83d2e9a70 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
@@ -14,13 +14,11 @@ class UpdateGrid27
{
public:
UpdateGrid27(Parameter *para);
- ~UpdateGrid27();
- void updateGrid27(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(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);
private:
- UpdateGrid27();
std::function<void(Parameter *para, std::vector<std::shared_ptr<PorousMedia>> &pm, int level, unsigned int t,
std::vector<SPtr<Kernel>> &kernels, vf::gpu::Communicator *comm, CudaMemoryManager *cudaManager)>
collisionAndExchange = nullptr;
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
index 2831c7414..3c3f159d4 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->updateGrid27(para.get(), comm, cudaManager.get(), pm, 0, t, kernels);
+ this->updateGrid27->updateGrid(para.get(), comm, cudaManager.get(), pm, 0, t, kernels);
////////////////////////////////////////////////////////////////////////////////
//Particles
--
GitLab