From a7440335ee3dde2d849e264b32b01a84e2494181 Mon Sep 17 00:00:00 2001
From: Hkorb <henry.korb@geo.uu.se>
Date: Thu, 30 Sep 2021 17:42:50 +0200
Subject: [PATCH] renames Visitor to Actuator in UpdateGrid
---
.../VirtualFluids_GPU/Calculation/UpdateGrid27.cpp | 11 +++++++----
src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h | 5 -----
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
index 0496a4784..8fed82906 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
@@ -8,6 +8,9 @@
#include "Communication/ExchangeData27.h"
#include "Kernel/Kernel.h"
+void visitActuators(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t);
+void visitProbes(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t);
+
void updateGrid27(Parameter* para,
vf::gpu::Communicator* comm,
CudaMemoryManager* cudaManager,
@@ -60,7 +63,7 @@ void updateGrid27(Parameter* para,
coarseToFine(para, level);
}
- visitVisitors(para, cudaManager, level, t);
+ visitPreCollisionInteractors(para, cudaManager, level, t);
visitProbes(para, cudaManager, level, t);
}
@@ -1264,9 +1267,9 @@ void coarseToFine(Parameter* para, int level)
}
-void visitVisitors(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t)
+void visitActuators(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t)
{
- for( Visitor* actuator: para->getActuators() )
+ for( PreCollisionInteractor* actuator: para->getActuators() )
{
actuator->visit(para, cudaManager, level, t);
}
@@ -1274,7 +1277,7 @@ void visitVisitors(Parameter* para, CudaMemoryManager* cudaManager, int level, u
void visitProbes(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t)
{
- for( Visitor* probe: para->getProbes() )
+ for( PreCollisionInteractor* probe: para->getProbes() )
{
probe->visit(para, cudaManager, level, t);
}
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
index 1adf7dd5e..c66d6afd4 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
@@ -38,9 +38,4 @@ extern "C" void fineToCoarse(Parameter* para, int level);
extern "C" void coarseToFine(Parameter* para, int level);
-extern "C" void visitVisitors(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t);
-
-extern "C" void visitProbes(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t);
-
-
#endif
--
GitLab