From 09dfaad41025a115087d1f89f344a9618ff3fece Mon Sep 17 00:00:00 2001
From: Hkorb <henry.korb@geo.uu.se>
Date: Thu, 30 Sep 2021 17:42:04 +0200
Subject: [PATCH] renames Visitor to PreCollisionInteractor
---
apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp | 12 ++++++------
.../GPU/CudaMemoryManager.cpp | 4 ++--
src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp | 10 +++++-----
.../VirtualFluids_GPU/Parameter/Parameter.cpp | 8 ++++----
.../VirtualFluids_GPU/Parameter/Parameter.h | 18 +++++++++---------
.../ActuatorLine.cu | 0
.../ActuatorLine.h | 6 +++---
.../PreCollisionInteractor.h} | 10 +++++-----
.../Probes/PlaneProbe.cu | 0
.../Probes/PlaneProbe.h | 0
.../Probes/PointProbe.cu | 0
.../Probes/PointProbe.h | 0
.../Probes/Probe.cu | 0
.../Probes/Probe.h | 6 +++---
14 files changed, 37 insertions(+), 37 deletions(-)
rename src/gpu/VirtualFluids_GPU/{Visitor => PreCollisionInteractor}/ActuatorLine.cu (100%)
rename src/gpu/VirtualFluids_GPU/{Visitor => PreCollisionInteractor}/ActuatorLine.h (96%)
rename src/gpu/VirtualFluids_GPU/{Visitor/Visitor.h => PreCollisionInteractor/PreCollisionInteractor.h} (77%)
rename src/gpu/VirtualFluids_GPU/{Visitor => PreCollisionInteractor}/Probes/PlaneProbe.cu (100%)
rename src/gpu/VirtualFluids_GPU/{Visitor => PreCollisionInteractor}/Probes/PlaneProbe.h (100%)
rename src/gpu/VirtualFluids_GPU/{Visitor => PreCollisionInteractor}/Probes/PointProbe.cu (100%)
rename src/gpu/VirtualFluids_GPU/{Visitor => PreCollisionInteractor}/Probes/PointProbe.h (100%)
rename src/gpu/VirtualFluids_GPU/{Visitor => PreCollisionInteractor}/Probes/Probe.cu (100%)
rename src/gpu/VirtualFluids_GPU/{Visitor => PreCollisionInteractor}/Probes/Probe.h (96%)
diff --git a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
index 1f74934cf..2f5824156 100644
--- a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
+++ b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
@@ -48,9 +48,9 @@
#include "VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h"
#include "VirtualFluids_GPU/Parameter/Parameter.h"
#include "VirtualFluids_GPU/Output/FileWriter.h"
-#include "VirtualFluids_GPU/Visitor/ActuatorLine.h"
-#include "VirtualFluids_GPU/Visitor/Probes/PointProbe.h"
-#include "VirtualFluids_GPU/Visitor/Probes/PlaneProbe.h"
+#include "VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.h"
+#include "VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.h"
+#include "VirtualFluids_GPU/PreCollisionInteractor/Probes/PlaneProbe.h"
#include "VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.h"
#include "VirtualFluids_GPU/PreProcessor/PreProcessorFactory/PreProcessorFactoryImp.h"
@@ -197,10 +197,10 @@ void multipleLevel(const std::string& configPath)
real density = 1.225f;
int level = 0;
- ActuatorLine* actuator_line = new ActuatorLine((unsigned int) 3, density, (unsigned int)32, epsilon, turbPos[0], turbPos[1], turbPos[2], D, level, dt, dx);
+ SPtr<ActuatorLine> actuator_line =SPtr<ActuatorLine>( new ActuatorLine((unsigned int) 3, density, (unsigned int)32, epsilon, turbPos[0], turbPos[1], turbPos[2], D, level, dt, dx) );
para->addActuator( actuator_line );
- PointProbe* pointProbe = new PointProbe("pointProbe", 100, 500, 100);
+ SPtr<PointProbe> pointProbe = SPtr<PointProbe>( new PointProbe("pointProbe", 100, 500, 100) );
std::vector<real> probeCoordsX = {D,2*D,5*D};
std::vector<real> probeCoordsY = {3*D,3*D,3*D};
std::vector<real> probeCoordsZ = {3*D,3*D,3*D};
@@ -210,7 +210,7 @@ void multipleLevel(const std::string& configPath)
pointProbe->addPostProcessingVariable(PostProcessingVariable::Variances);
para->addProbe( pointProbe );
- PlaneProbe* planeProbe = new PlaneProbe("planeProbe", 100, 500, 100);
+ SPtr<PlaneProbe> planeProbe = SPtr<PlaneProbe>( new PlaneProbe("planeProbe", 100, 500, 100) );
planeProbe->setProbePlane(5*D, 0, 0, dx, L_y, L_z);
planeProbe->addPostProcessingVariable(PostProcessingVariable::Means);
para->addProbe( planeProbe );
diff --git a/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp b/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp
index 21baa2f40..7074a222b 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp
+++ b/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp
@@ -5,8 +5,8 @@
#include <math.h>
#include <Parameter/Parameter.h>
-#include <Visitor/ActuatorLine.h>
-#include <Visitor/Probes/Probe.h>
+#include <PreCollisionInteractor/ActuatorLine.h>
+#include <PreCollisionInteractor/Probes/Probe.h>
#include "Calculation/PorousMedia.h"
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
index 0446beb17..a7e42e41e 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -130,11 +130,11 @@ void Simulation::init(SPtr<Parameter> para, SPtr<GridProvider> gridProvider, std
gridProvider->allocArrays_BoundaryQs();
gridProvider->allocArrays_OffsetScale();
- for( Visitor* actuator: para->getActuators()){
+ for( PreCollisionInteractor* actuator: para->getActuators()){
actuator->init(para.get(), gridProvider.get(), cudaManager.get());
}
- for( Visitor* probe: para->getProbes()){
+ for( PreCollisionInteractor* probe: para->getProbes()){
probe->init(para.get(), gridProvider.get(), cudaManager.get());
}
@@ -1287,12 +1287,12 @@ void Simulation::free()
}
}
//////////////////////////////////////////////////////////////////////////
- //Visitors
- for( Visitor* actuator: para->getActuators()){
+ //PreCollisionInteractors
+ for( PreCollisionInteractor* actuator: para->getActuators()){
actuator->free(para.get(), cudaManager.get());
}
- for( Visitor* probe: para->getProbes()){
+ for( PreCollisionInteractor* probe: para->getProbes()){
probe->free(para.get(), cudaManager.get());
}
//////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
index 497fb9c0f..86b8f1d4f 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
@@ -1492,11 +1492,11 @@ void Parameter::setADKernel(std::string adKernel)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//add-methods
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void Parameter::addActuator(Visitor* actuator)
+void Parameter::addActuator(PreCollisionInteractor* actuator)
{
actuators.push_back(actuator);
}
-void Parameter::addProbe(Visitor* probe)
+void Parameter::addProbe(PreCollisionInteractor* probe)
{
probes.push_back(probe);
}
@@ -1911,11 +1911,11 @@ TempPressforBoundaryConditions* Parameter::getTempPressD()
{
return this->TempPressD;
}
-std::vector<Visitor*> Parameter::getActuators()
+std::vector<PreCollisionInteractor*> Parameter::getActuators()
{
return actuators;
}
-std::vector<Visitor*> Parameter::getProbes()
+std::vector<PreCollisionInteractor*> Parameter::getProbes()
{
return probes;
}
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
index 565b0ab98..4b30d9ff9 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
@@ -40,7 +40,7 @@
#include "LBM/D3Q27.h"
#include "LBM/LB.h"
-#include "Visitor/Visitor.h"
+#include "PreCollisionInteractor/PreCollisionInteractor.h"
#include "VirtualFluids_GPU_export.h"
@@ -526,8 +526,8 @@ public:
//adder
- void addActuator(Visitor* actuator);
- void addProbe(Visitor* probes);
+ void addActuator(PreCollisionInteractor* actuator);
+ void addProbe(PreCollisionInteractor* probes);
// getter
double *getForcesDouble();
@@ -687,8 +687,8 @@ public:
TempVelforBoundaryConditions *getTempVelD();
TempPressforBoundaryConditions *getTempPressH();
TempPressforBoundaryConditions *getTempPressD();
- std::vector<Visitor*> getActuators();
- std::vector<Visitor*> getProbes();
+ std::vector<PreCollisionInteractor*> getActuators();
+ std::vector<PreCollisionInteractor*> getProbes();
unsigned int getTimeDoCheckPoint();
unsigned int getTimeDoRestart();
bool getDoCheckPoint();
@@ -773,7 +773,7 @@ private:
bool calcCp { false };
bool writeVeloASCII { false };
bool calcPlaneConc { false };
- bool isBodyForce;
+ bool isBodyForce { false };
int diffMod {27};
int maxlevel {0};
int coarse {0};
@@ -819,9 +819,9 @@ private:
real angularVelocity;
unsigned int startTurn;
- // Visitors //////////////
- std::vector<Visitor*> actuators;
- std::vector<Visitor*> probes;
+ // PreCollisionInteractors //////////////
+ std::vector<PreCollisionInteractor*> actuators;
+ std::vector<PreCollisionInteractor*> probes;
// Step of Ensight writing//
unsigned int stepEnsight;
diff --git a/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.cu
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.cu
rename to src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.cu
diff --git a/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.h
similarity index 96%
rename from src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.h
rename to src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.h
index b458a9b50..cb8553988 100644
--- a/src/gpu/VirtualFluids_GPU/Visitor/ActuatorLine.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorLine.h
@@ -1,12 +1,12 @@
#ifndef ActuatorLine_H
#define ActuatorLine_H
-#include "Visitor.h"
+#include "PreCollisionInteractor.h"
#include "Parameter/Parameter.h"
#include "PointerDefinitions.h"
#include "GridGenerator/grid/GridBuilder/GridBuilder.h"
-class ActuatorLine : public Visitor
+class ActuatorLine : public PreCollisionInteractor
{
public:
ActuatorLine(
@@ -27,7 +27,7 @@ public:
diameter(_diameter),
level(_level),
delta_x(_delta_x),
- Visitor()
+ PreCollisionInteractor()
{
this->delta_t = _delta_t/pow(2,this->level);
this->delta_x = _delta_x/pow(2,this->level);
diff --git a/src/gpu/VirtualFluids_GPU/Visitor/Visitor.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h
similarity index 77%
rename from src/gpu/VirtualFluids_GPU/Visitor/Visitor.h
rename to src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h
index 41265ea8f..3aed65d83 100644
--- a/src/gpu/VirtualFluids_GPU/Visitor/Visitor.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h
@@ -1,5 +1,5 @@
-#ifndef Visitor_H
-#define Visitor_H
+#ifndef PreCollisionInteractor_H
+#define PreCollisionInteractor_H
#include <string>
#include <vector>
@@ -14,19 +14,19 @@ class Parameter;
class GridProvider;
class CudaMemoryManager;
-class VIRTUALFLUIDS_GPU_EXPORT Visitor
+class VIRTUALFLUIDS_GPU_EXPORT PreCollisionInteractor
{
private:
SPtr<Parameter> para;
protected:
- Visitor()
+ PreCollisionInteractor()
{
this->updateInterval = 1;
}
public:
- virtual ~Visitor()
+ virtual ~PreCollisionInteractor()
{
}
diff --git a/src/gpu/VirtualFluids_GPU/Visitor/Probes/PlaneProbe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlaneProbe.cu
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Visitor/Probes/PlaneProbe.cu
rename to src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlaneProbe.cu
diff --git a/src/gpu/VirtualFluids_GPU/Visitor/Probes/PlaneProbe.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlaneProbe.h
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Visitor/Probes/PlaneProbe.h
rename to src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlaneProbe.h
diff --git a/src/gpu/VirtualFluids_GPU/Visitor/Probes/PointProbe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.cu
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Visitor/Probes/PointProbe.cu
rename to src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.cu
diff --git a/src/gpu/VirtualFluids_GPU/Visitor/Probes/PointProbe.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.h
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Visitor/Probes/PointProbe.h
rename to src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PointProbe.h
diff --git a/src/gpu/VirtualFluids_GPU/Visitor/Probes/Probe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Visitor/Probes/Probe.cu
rename to src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu
diff --git a/src/gpu/VirtualFluids_GPU/Visitor/Probes/Probe.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h
similarity index 96%
rename from src/gpu/VirtualFluids_GPU/Visitor/Probes/Probe.h
rename to src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h
index c909b52bf..069b988b9 100644
--- a/src/gpu/VirtualFluids_GPU/Visitor/Probes/Probe.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h
@@ -3,7 +3,7 @@
#include <cuda.h>
-#include "Visitor/Visitor.h"
+#include "PreCollisionInteractor/PreCollisionInteractor.h"
#include "PointerDefinitions.h"
enum class PostProcessingVariable{
@@ -38,7 +38,7 @@ __global__ void interpQuantities( uint* pointIndices,
);
-class Probe : public Visitor
+class Probe : public PreCollisionInteractor
{
public:
Probe(
@@ -50,7 +50,7 @@ public:
tStartAvg(_tStartAvg),
tStartOut(_tStartOut),
tOut(_tOut),
- Visitor()
+ PreCollisionInteractor()
{
assert("Output starts before averaging!" && tStartOut>=tStartAvg);
}
--
GitLab