From a07e8b3383703549bc5eb595448c2073a11e635c Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-braunschweig.de>
Date: Thu, 14 Oct 2021 17:03:19 +0200
Subject: [PATCH] Fix error due to incomplete type
---
src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp | 4 +---
src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h | 5 +----
src/gpu/VirtualFluids_GPU/LBM/Simulation.h | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
index dbb568df7..a794757a4 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
@@ -1434,9 +1434,7 @@ void coarseToFine(Parameter* para, int level)
}
UpdateGrid27::UpdateGrid27() = default;
-UpdateGrid27::~UpdateGrid27() = default;
-UpdateGrid27::UpdateGrid27(const UpdateGrid27 &updateGrid) {}
-UpdateGrid27::UpdateGrid27(UpdateGrid27 &&updateGrid27) {}
+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 aa39b8159..9bc083731 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
@@ -15,9 +15,6 @@ class UpdateGrid27
public:
UpdateGrid27(Parameter *para);
~UpdateGrid27();
- UpdateGrid27(const UpdateGrid27 &updateGrid);
- UpdateGrid27(UpdateGrid27 &&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);
@@ -26,7 +23,7 @@ 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;
+ collisionAndExchange = NULL;
void chooseFunctionForCollisionAndExchange(Parameter *para);
};
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
index 75c979107..f11212eda 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
@@ -112,6 +112,6 @@ protected:
SPtr<EnstrophyAnalyzer> enstrophyAnalyzer;
////////////////////////////////////////////////////////////////////////////
- UPtr<UpdateGrid27> updateGrid27;
+ SPtr<UpdateGrid27> updateGrid27;
};
#endif
--
GitLab