From c67d9cc4ec0157c5b1a400dd8e22cce74b0bfa76 Mon Sep 17 00:00:00 2001
From: HenrikAsmuth <henrik.asmuth@geo.uu.se>
Date: Wed, 7 Dec 2022 14:34:29 +0100
Subject: [PATCH] Add check for sufficient number of nodes in bounding spheres
of ActuatorFarm
---
.../PreCollisionInteractor/ActuatorFarm.cu | 31 ++++++++++++++-----
.../PreCollisionInteractor/ActuatorFarm.h | 2 +-
src/lbm/constants/NumericConstants.h | 1 +
3 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
index ef74653d6..63d89fdf6 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
@@ -13,6 +13,7 @@
#include "DataStructureInitializer/GridProvider.h"
#include "GPU/CudaMemoryManager.h"
#include "lbm/constants/NumericConstants.h"
+#include <logger/Logger.h>
using namespace vf::lbm::constant;
@@ -273,11 +274,10 @@ void ActuatorFarm::init(Parameter* para, GridProvider* gridProvider, CudaMemoryM
this->initBladeIndices(para, cudaMemoryManager);
this->initBladeVelocities(cudaMemoryManager);
this->initBladeForces(cudaMemoryManager);
- this->initBoundingSphere(para, cudaMemoryManager);
+ this->initBoundingSpheres(para, cudaMemoryManager);
this->streamIndex = 0;
}
-
void ActuatorFarm::interact(Parameter* para, CudaMemoryManager* cudaMemoryManager, int level, unsigned int t)
{
if (level != this->level) return;
@@ -479,9 +479,11 @@ void ActuatorFarm::initBladeIndices(Parameter* para, CudaMemoryManager* cudaMemo
cudaMemoryManager->cudaCopyBladeIndicesHtoD(this);
}
-void ActuatorFarm::initBoundingSphere(Parameter* para, CudaMemoryManager* cudaMemoryManager)
+void ActuatorFarm::initBoundingSpheres(Parameter* para, CudaMemoryManager* cudaMemoryManager)
{
- std::vector<int> nodesInSphere;
+ std::vector<int> nodesInSpheres;
+
+ real dx = para->getScaledLengthRatio(this->level);
for(uint turbine=0; turbine<this->numberOfTurbines; turbine++)
{
@@ -490,22 +492,35 @@ void ActuatorFarm::initBoundingSphere(Parameter* para, CudaMemoryManager* cudaMe
real posX = this->turbinePosXH[turbine];
real posY = this->turbinePosYH[turbine];
real posZ = this->turbinePosZH[turbine];
-
+
real sphereRadiusSqrd = sphereRadius*sphereRadius;
+
+ uint minimumNumberOfNodesPerSphere = (uint)(c4o3*cPi*pow(sphereRadius, c3o1)/pow(dx, c3o1));
+ uint nodesInThisSphere = 0;
for (uint j = 1; j <= para->getParH(this->level)->numberOfNodes; j++)
{
const real distX = para->getParH(this->level)->coordinateX[j]-posX;
const real distY = para->getParH(this->level)->coordinateY[j]-posY;
const real distZ = para->getParH(this->level)->coordinateZ[j]-posZ;
- if(distSqrd(distX,distY,distZ) < sphereRadiusSqrd) nodesInSphere.push_back(j);
+ if(distSqrd(distX,distY,distZ) < sphereRadiusSqrd)
+ {
+ nodesInSpheres.push_back(j);
+ nodesInThisSphere++;
+ }
+ }
+
+ if(nodesInThisSphere<minimumNumberOfNodesPerSphere)
+ {
+ VF_LOG_CRITICAL("Found only {} nodes in bounding sphere of turbine no. {}, expected at least {}!", nodesInThisSphere, turbine, minimumNumberOfNodesPerSphere);
+ throw std::runtime_error("ActuatorFarm::initBoundingSpheres: Turbine bounding sphere partially out of domain.");
}
}
- this->numberOfIndices = uint(nodesInSphere.size());
+ this->numberOfIndices = uint(nodesInSpheres.size());
cudaMemoryManager->cudaAllocSphereIndices(this);
- std::copy(nodesInSphere.begin(), nodesInSphere.end(), this->boundingSphereIndicesH);
+ std::copy(nodesInSpheres.begin(), nodesInSpheres.end(), this->boundingSphereIndicesH);
cudaMemoryManager->cudaCopySphereIndicesHtoD(this);
}
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.h
index dc4dd54bc..5dcd2fc59 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.h
@@ -143,7 +143,7 @@ public:
private:
void initTurbineGeometries(CudaMemoryManager* cudaManager);
- void initBoundingSphere(Parameter* para, CudaMemoryManager* cudaManager);
+ void initBoundingSpheres(Parameter* para, CudaMemoryManager* cudaManager);
void initBladeCoords(CudaMemoryManager* cudaManager);
void initBladeVelocities(CudaMemoryManager* cudaManager);
void initBladeForces(CudaMemoryManager* cudaManager);
diff --git a/src/lbm/constants/NumericConstants.h b/src/lbm/constants/NumericConstants.h
index 1a1350604..0f1745e6b 100644
--- a/src/lbm/constants/NumericConstants.h
+++ b/src/lbm/constants/NumericConstants.h
@@ -164,6 +164,7 @@ static constexpr float c99o100 = 0.99f;
static constexpr float c1o126 = (1.0f / 126.0f);
static constexpr float c1o216 = (1.0f / 216.0f);
static constexpr float c5o4 = 1.25f;
+static constexpr float c4o3 = (4.0f / 3.0f);//1.33333333f;
static constexpr float c9o4 = 2.25f;
static constexpr float c5o2 = 2.5f;
static constexpr float c9o2 = 4.5f;
--
GitLab