diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp index 27759453e424bc35ef0f73a354c82415dfb53331..1f2bc56b70d1f9cb4cc145162e07dd537319b90d 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 1f800b1bd8cd3e5520693b2460988f1f16fa6778..b07156f2b0fae7bca73a75127bdd61e0e73cd48f 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 b2fad77f1d4a1e494c463a9e1571b5b641faa638..f0de6c8e01b2f4cfc0421f02b1a75308512e34e8 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 3aed65d8353601ec51d355722c7950235bd6ecbb..78b4d5e9ba148651e78c38758624de69dd08c47d 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 1b5675b6948ab64ec89b810a5bc48a167b77d79b..e798f433270777f8d718218e91306f980b20e9ca 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 8b69f5e99bc51245e3b01bb00e2b6247b04e1129..8223411ffc45fdac8b3ba038f97eeb899dd3d94d 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]; }