From 7667d825813ee30951e64e3755382e434d53bcb5 Mon Sep 17 00:00:00 2001
From: Hkorb <henry.korb@geo.uu.se>
Date: Fri, 1 Oct 2021 07:25:52 +0200
Subject: [PATCH] changes precollision interactor->visit to interact
---
.../Calculation/UpdateGrid27.cpp | 16 ++++++++--------
.../PreCollisionInteractor/ActuatorLine.cu | 2 +-
.../PreCollisionInteractor/ActuatorLine.h | 2 +-
.../PreCollisionInteractor.h | 2 +-
.../PreCollisionInteractor/Probes/Probe.cu | 2 +-
.../PreCollisionInteractor/Probes/Probe.h | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
index 27759453e..1f2bc56b7 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
@@ -8,8 +8,8 @@
#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 interactWithActuators(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t);
+void interactWithProbes(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t);
void updateGrid27(Parameter* para,
vf::gpu::Communicator* comm,
@@ -63,9 +63,9 @@ void updateGrid27(Parameter* para,
coarseToFine(para, level);
}
- visitActuators(para, cudaManager, level, t);
+ interactWithActuators(para, cudaManager, level, t);
- visitProbes(para, cudaManager, level, t);
+ interactWithProbes(para, cudaManager, level, t);
}
void collision(Parameter* para, std::vector<std::shared_ptr<PorousMedia>>& pm, int level, unsigned int t, std::vector < SPtr< Kernel>>& kernels)
@@ -1267,18 +1267,18 @@ void coarseToFine(Parameter* para, int level)
}
-void visitActuators(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t)
+void interactWithActuators(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t)
{
for( SPtr<PreCollisionInteractor> actuator: para->getActuators() )
{
- actuator->visit(para, cudaManager, level, t);
+ actuator->interact(para, cudaManager, level, t);
}
}
-void visitProbes(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t)
+void interactWithProbes(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t)
{
for( SPtr<PreCollisionInteractor> probe: para->getProbes() )
{
- probe->visit(para, cudaManager, level, t);
+ probe->interact(para, cudaManager, level, t);
}
}
\ No newline at end of file
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.cu
index 1f800b1bd..b07156f2b 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.cu
@@ -152,7 +152,7 @@ void ActuatorLine::init(Parameter* para, GridProvider* gridProvider, CudaMemoryM
}
-void ActuatorLine::visit(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t)
+void ActuatorLine::interact(Parameter* para, CudaMemoryManager* cudaManager, int level, unsigned int t)
{
if (level != this->level) return;
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.h
index b2fad77f1..f0de6c8e0 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.h
@@ -44,7 +44,7 @@ public:
}
void init(Parameter* para, GridProvider* gridProvider, CudaMemoryManager* cudaManager);
- void visit(Parameter* para, CudaMemoryManager* cudaManager, int level, uint t);
+ void interact(Parameter* para, CudaMemoryManager* cudaManager, int level, uint t);
void free(Parameter* para, CudaMemoryManager* cudaManager);
void write(uint t);
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h
index 3aed65d83..78b4d5e9b 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h
@@ -31,7 +31,7 @@ public:
}
virtual void init(Parameter *para, GridProvider *gridProvider, CudaMemoryManager *cudaManager) = 0;
- virtual void visit(Parameter *para, CudaMemoryManager *cudaManager, int level, uint t) = 0;
+ virtual void interact(Parameter *para, CudaMemoryManager *cudaManager, int level, uint t) = 0;
virtual void free(Parameter *para, CudaMemoryManager *cudaManager) = 0;
protected:
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu
index 1b5675b69..e798f4332 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu
@@ -224,7 +224,7 @@ void Probe::addProbeStruct(CudaMemoryManager* cudaManager, std::vector<int>& pro
}
-void Probe::visit(Parameter* para, CudaMemoryManager* cudaManager, int level, uint t)
+void Probe::interact(Parameter* para, CudaMemoryManager* cudaManager, int level, uint t)
{
if(t>this->tStartAvg)
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h
index 8b69f5e99..8223411ff 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h
@@ -55,7 +55,7 @@ public:
assert("Output starts before averaging!" && tStartOut>=tStartAvg);
}
void init(Parameter* para, GridProvider* gridProvider, CudaMemoryManager* cudaManager);
- void visit(Parameter* para, CudaMemoryManager* cudaManager, int level, uint t);
+ void interact(Parameter* para, CudaMemoryManager* cudaManager, int level, uint t);
void free(Parameter* para, CudaMemoryManager* cudaManager);
SPtr<ProbeStruct> getProbeStruct(int level){ return this->probeParams[level]; }
--
GitLab