diff --git a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp index 638d025c8a2673968e4c5fec25301a4c104ea160..ab3a1a2b60f9bf0db7ca1b38738a6c23fd4286f5 100644 --- a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp +++ b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp @@ -95,9 +95,9 @@ void multipleLevel(const std::string& configPath) const real velocity = config.getValue<real>("Velocity"); - const real L_x = 6*reference_diameter; - const real L_y = 3*reference_diameter; - const real L_z = 4*reference_diameter; + const real L_x = 4*reference_diameter; + const real L_y = 2.5*reference_diameter; + const real L_z = 3*reference_diameter; const real viscosity = 1.56e-5; @@ -122,14 +122,14 @@ void multipleLevel(const std::string& configPath) const real dx = reference_diameter/real(nodes_per_diameter); - real turbPos[3] = {1*reference_diameter, reference_diameter, 2*reference_diameter}; + real turbPos[3] = {0.7f*reference_diameter, reference_diameter, 1.5f*reference_diameter}; gridBuilder->addCoarseGrid(0.0, 0.0, 0.0, L_x, L_y, L_z, dx); gridBuilder->setNumberOfLayers(4,0); - gridBuilder->addGrid( new Cuboid( turbPos[0]-0.4*reference_diameter, turbPos[1]-1*reference_diameter, turbPos[2]-0.8*reference_diameter, - turbPos[0]+3.0*reference_diameter, turbPos[1]+0.8*reference_diameter, turbPos[2]+0.8*reference_diameter) , 1 ); + gridBuilder->addGrid( new Cuboid( turbPos[0]-0.3*reference_diameter, turbPos[1]-1*reference_diameter, turbPos[2]-0.7*reference_diameter, + turbPos[0]+2.0*reference_diameter, turbPos[1]+0.7*reference_diameter, turbPos[2]+0.7*reference_diameter) , 1 ); para->setMaxLevel(2); scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible); @@ -159,7 +159,6 @@ void multipleLevel(const std::string& configPath) VF_LOG_INFO("velocity [dx/dt] = {}", velocityLB); VF_LOG_INFO("viscosity [10^8 dx^2/dt] = {}", viscosityLB*1e8); VF_LOG_INFO("nodes/turbine diameter = {}", reference_diameter/dx); - VF_LOG_INFO("1000 timesteps are {} s", 1000 * dt); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -197,7 +196,7 @@ void multipleLevel(const std::string& configPath) ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// gridBuilder->setVelocityBoundaryCondition(SideType::MX, velocityLB, 0.0, 0.0); - gridBuilder->setVelocityBoundaryCondition(SideType::MY, velocityLB, 0.0, 0.0); + gridBuilder->setVelocityBoundaryCondition(SideType::MY, 0.0, 0.0, 0.0); gridBuilder->setVelocityBoundaryCondition(SideType::PY, velocityLB, 0.0, 0.0); gridBuilder->setVelocityBoundaryCondition(SideType::MZ, velocityLB, 0.0, 0.0); gridBuilder->setVelocityBoundaryCondition(SideType::PZ, velocityLB, 0.0, 0.0); diff --git a/apps/gpu/LBM/ActuatorLine/Pole.stl b/apps/gpu/LBM/ActuatorLine/Pole.stl index dae651651f5174393d36b139b08eaf818de9f491..4ece0f0d197dd408f5e17cccc0a4a1bb6544acd7 100644 --- a/apps/gpu/LBM/ActuatorLine/Pole.stl +++ b/apps/gpu/LBM/ActuatorLine/Pole.stl @@ -1,254 +1,254 @@ solid Visualization Toolkit generated SLA File - facet normal 0.951056 0 -0.309018 + facet normal 0.95105063192813954 0 -0.30903510400775902 outer loop - vertex 150 126 252 - vertex 150 0 252 - vertex 148.09 126 246.122 + vertex 112 126 189 + vertex 112 0 189 + vertex 110.08999633789062 126 183.12199401855469 endloop endfacet - facet normal -0.951056 0 0.309018 + facet normal 0.95105063192813954 0 -0.30903510400775902 outer loop - vertex 148.09 0 246.122 - vertex 148.09 126 246.122 - vertex 150 0 252 + vertex 110.08999633789062 0 183.12199401855469 + vertex 110.08999633789062 126 183.12199401855469 + vertex 112 0 189 endloop endfacet - facet normal 0.951056 0 -0.309018 + facet normal 0.58781521760400901 0 -0.80899522245384836 outer loop - vertex 148.09 126 246.122 - vertex 148.09 0 246.122 - vertex 143.09 126 242.489 + vertex 110.08999633789062 126 183.12199401855469 + vertex 110.08999633789062 0 183.12199401855469 + vertex 105.08999633789062 126 179.48899841308594 endloop endfacet - facet normal -0.951056 0 0.309018 + facet normal 0.58781521760400901 0 -0.80899522245384836 outer loop - vertex 143.09 0 242.489 - vertex 143.09 126 242.489 - vertex 148.09 0 246.122 + vertex 105.08999633789062 0 179.48899841308594 + vertex 105.08999633789062 126 179.48899841308594 + vertex 110.08999633789062 0 183.12199401855469 endloop endfacet - facet normal 0.951056 0 -0.309018 + facet normal 0 0 -1 outer loop - vertex 143.09 126 242.489 - vertex 143.09 0 242.489 - vertex 136.91 126 242.489 + vertex 105.08999633789062 126 179.48899841308594 + vertex 105.08999633789062 0 179.48899841308594 + vertex 98.910003662109375 126 179.48899841308594 endloop endfacet - facet normal -0.951056 0 0.309018 + facet normal 0 0 -1 outer loop - vertex 136.91 0 242.489 - vertex 136.91 126 242.489 - vertex 143.09 0 242.489 + vertex 98.910003662109375 0 179.48899841308594 + vertex 98.910003662109375 126 179.48899841308594 + vertex 105.08999633789062 0 179.48899841308594 endloop endfacet - facet normal 0.951056 0 -0.309018 + facet normal -0.58781521760400901 0 -0.80899522245384836 outer loop - vertex 136.91 126 242.489 - vertex 136.91 0 242.489 - vertex 131.91 126 246.122 + vertex 98.910003662109375 126 179.48899841308594 + vertex 98.910003662109375 0 179.48899841308594 + vertex 93.910003662109375 126 183.12199401855469 endloop endfacet - facet normal -0.951056 0 0.309018 + facet normal -0.58781521760400901 -0 -0.80899522245384836 outer loop - vertex 131.91 0 246.122 - vertex 131.91 126 246.122 - vertex 136.91 0 242.489 + vertex 93.910003662109375 0 183.12199401855469 + vertex 93.910003662109375 126 183.12199401855469 + vertex 98.910003662109375 0 179.48899841308594 endloop endfacet - facet normal 0.951056 0 -0.309018 + facet normal -0.95105063192813954 0 -0.30903510400775902 outer loop - vertex 131.91 126 246.122 - vertex 131.91 0 246.122 - vertex 130 126 252 + vertex 93.910003662109375 126 183.12199401855469 + vertex 93.910003662109375 0 183.12199401855469 + vertex 92 126 189 endloop endfacet - facet normal -0.951056 0 0.309018 + facet normal -0.95105063192813954 -0 -0.30903510400775902 outer loop - vertex 130 0 252 - vertex 130 126 252 - vertex 131.91 0 246.122 + vertex 92 0 189 + vertex 92 126 189 + vertex 93.910003662109375 0 183.12199401855469 endloop endfacet - facet normal 0.951056 0 -0.309018 + facet normal -0.95105039614603315 0 0.30903582962251064 outer loop - vertex 130 126 252 - vertex 130 0 252 - vertex 131.91 126 257.878 + vertex 92 126 189 + vertex 92 0 189 + vertex 93.910003662109375 126 194.87799072265625 endloop endfacet - facet normal -0.951056 0 0.309018 + facet normal -0.95105039614603315 0 0.30903582962251064 outer loop - vertex 131.91 0 257.878 - vertex 131.91 126 257.878 - vertex 130 0 252 + vertex 93.910003662109375 0 194.87799072265625 + vertex 93.910003662109375 126 194.87799072265625 + vertex 92 0 189 endloop endfacet - facet normal 0.951056 0 -0.309018 + facet normal -0.58781521760400901 0 0.80899522245384836 outer loop - vertex 131.91 126 257.878 - vertex 131.91 0 257.878 - vertex 136.91 126 261.511 + vertex 93.910003662109375 126 194.87799072265625 + vertex 93.910003662109375 0 194.87799072265625 + vertex 98.910003662109375 126 198.510986328125 endloop endfacet - facet normal -0.951056 0 0.309018 + facet normal -0.58781521760400901 0 0.80899522245384836 outer loop - vertex 136.91 0 261.511 - vertex 136.91 126 261.511 - vertex 131.91 0 257.878 + vertex 98.910003662109375 0 198.510986328125 + vertex 98.910003662109375 126 198.510986328125 + vertex 93.910003662109375 0 194.87799072265625 endloop endfacet - facet normal 0.951056 0 -0.309018 + facet normal 0 0 1 outer loop - vertex 136.91 126 261.511 - vertex 136.91 0 261.511 - vertex 143.09 126 261.511 + vertex 98.910003662109375 126 198.510986328125 + vertex 98.910003662109375 0 198.510986328125 + vertex 105.08999633789062 126 198.510986328125 endloop endfacet - facet normal -0.951056 0 0.309018 + facet normal 0 0 1 outer loop - vertex 143.09 0 261.511 - vertex 143.09 126 261.511 - vertex 136.91 0 261.511 + vertex 105.08999633789062 0 198.510986328125 + vertex 105.08999633789062 126 198.510986328125 + vertex 98.910003662109375 0 198.510986328125 endloop endfacet - facet normal 0.951056 0 -0.309018 + facet normal 0.58781521760400901 -0 0.80899522245384836 outer loop - vertex 143.09 126 261.511 - vertex 143.09 0 261.511 - vertex 148.09 126 257.878 + vertex 105.08999633789062 126 198.510986328125 + vertex 105.08999633789062 0 198.510986328125 + vertex 110.08999633789062 126 194.87799072265625 endloop endfacet - facet normal -0.951056 0 0.309018 + facet normal 0.58781521760400901 0 0.80899522245384836 outer loop - vertex 148.09 0 257.878 - vertex 148.09 126 257.878 - vertex 143.09 0 261.511 + vertex 110.08999633789062 0 194.87799072265625 + vertex 110.08999633789062 126 194.87799072265625 + vertex 105.08999633789062 0 198.510986328125 endloop endfacet - facet normal 0.951056 0 -0.309018 + facet normal 0.95105039614603315 -0 0.30903582962251064 outer loop - vertex 148.09 126 257.878 - vertex 148.09 0 257.878 - vertex 150 126 252 + vertex 110.08999633789062 126 194.87799072265625 + vertex 110.08999633789062 0 194.87799072265625 + vertex 112 126 189 endloop endfacet - facet normal -0.951056 0 0.309018 + facet normal 0.95105039614603315 0 0.30903582962251064 outer loop - vertex 150 0 252 - vertex 150 126 252 - vertex 148.09 0 257.878 + vertex 112 0 189 + vertex 112 126 189 + vertex 110.08999633789062 0 194.87799072265625 endloop endfacet - facet normal 0.309017 0 -0.951056 + facet normal 0 1 0 outer loop - vertex 150 126 252 - vertex 148.09 126 246.122 - vertex 148.09 126 257.878 + vertex 112 126 189 + vertex 110.08999633789062 126 183.12199401855469 + vertex 110.08999633789062 126 194.87799072265625 endloop endfacet - facet normal -0.308774 0.0396513 0.950309 + facet normal 0 1 0 outer loop - vertex 148.09 126 246.122 - vertex 143.09 126 242.489 - vertex 148.09 126 257.878 + vertex 110.08999633789062 126 183.12199401855469 + vertex 105.08999633789062 126 179.48899841308594 + vertex 110.08999633789062 126 194.87799072265625 endloop endfacet - facet normal 0 0 1 + facet normal 0 1 0 outer loop - vertex 148.09 126 257.878 - vertex 143.09 126 242.489 - vertex 143.09 126 261.511 + vertex 110.08999633789062 126 194.87799072265625 + vertex 105.08999633789062 126 179.48899841308594 + vertex 105.08999633789062 126 198.510986328125 endloop endfacet - facet normal 0 0.028819 -0.999585 + facet normal 0 1 -0 outer loop - vertex 143.09 126 261.511 - vertex 143.09 126 242.489 - vertex 136.91 126 261.511 + vertex 105.08999633789062 126 198.510986328125 + vertex 105.08999633789062 126 179.48899841308594 + vertex 98.910003662109375 126 198.510986328125 endloop endfacet - facet normal -0.309017 0 0.951057 + facet normal 0 1 0 outer loop - vertex 136.91 126 261.511 - vertex 143.09 126 242.489 - vertex 131.91 126 257.878 + vertex 98.910003662109375 126 198.510986328125 + vertex 105.08999633789062 126 179.48899841308594 + vertex 93.910003662109375 126 194.87799072265625 endloop endfacet - facet normal 0.308981 0.0151556 -0.950947 + facet normal 0 1 0 outer loop - vertex 131.91 126 257.878 - vertex 143.09 126 242.489 - vertex 130 126 252 + vertex 93.910003662109375 126 194.87799072265625 + vertex 105.08999633789062 126 179.48899841308594 + vertex 92 126 189 endloop endfacet - facet normal -0.587785 0 0.809018 + facet normal 0 1 0 outer loop - vertex 130 126 252 - vertex 143.09 126 242.489 - vertex 131.91 126 246.122 + vertex 92 126 189 + vertex 105.08999633789062 126 179.48899841308594 + vertex 93.910003662109375 126 183.12199401855469 endloop endfacet - facet normal 0.587785 0 -0.809018 + facet normal 0 1 0 outer loop - vertex 136.91 126 242.489 - vertex 131.91 126 246.122 - vertex 143.09 126 242.489 + vertex 98.910003662109375 126 179.48899841308594 + vertex 93.910003662109375 126 183.12199401855469 + vertex 105.08999633789062 126 179.48899841308594 endloop endfacet - facet normal -0.587785 0 0.809018 + facet normal 0 -1 0 outer loop - vertex 130 0 252 - vertex 131.91 0 246.122 - vertex 131.91 0 257.878 + vertex 92 0 189 + vertex 93.910003662109375 0 183.12199401855469 + vertex 93.910003662109375 0 194.87799072265625 endloop endfacet - facet normal 0.58754 0.028819 -0.808682 + facet normal 0 -1 0 outer loop - vertex 131.91 0 246.122 - vertex 136.91 0 242.489 - vertex 131.91 0 257.878 + vertex 93.910003662109375 0 183.12199401855469 + vertex 98.910003662109375 0 179.48899841308594 + vertex 93.910003662109375 0 194.87799072265625 endloop endfacet - facet normal 0.309017 0 -0.951057 + facet normal 0 -1 0 outer loop - vertex 131.91 0 257.878 - vertex 136.91 0 242.489 - vertex 136.91 0 261.511 + vertex 93.910003662109375 0 194.87799072265625 + vertex 98.910003662109375 0 179.48899841308594 + vertex 98.910003662109375 0 198.510986328125 endloop endfacet - facet normal -0.308774 0.0396513 0.950309 + facet normal 0 -1 0 outer loop - vertex 136.91 0 261.511 - vertex 136.91 0 242.489 - vertex 143.09 0 261.511 + vertex 98.910003662109375 0 198.510986328125 + vertex 98.910003662109375 0 179.48899841308594 + vertex 105.08999633789062 0 198.510986328125 endloop endfacet - facet normal 0.587785 0 -0.809017 + facet normal 0 -1 0 outer loop - vertex 143.09 0 261.511 - vertex 136.91 0 242.489 - vertex 148.09 0 257.878 + vertex 105.08999633789062 0 198.510986328125 + vertex 98.910003662109375 0 179.48899841308594 + vertex 110.08999633789062 0 194.87799072265625 endloop endfacet - facet normal -0.587147 0.0465989 0.808138 + facet normal 0 -1 0 outer loop - vertex 148.09 0 257.878 - vertex 136.91 0 242.489 - vertex 150 0 252 + vertex 110.08999633789062 0 194.87799072265625 + vertex 98.910003662109375 0 179.48899841308594 + vertex 112 0 189 endloop endfacet - facet normal 0.587785 0 0.809018 + facet normal 0 -1 0 outer loop - vertex 150 0 252 - vertex 136.91 0 242.489 - vertex 148.09 0 246.122 + vertex 112 0 189 + vertex 98.910003662109375 0 179.48899841308594 + vertex 110.08999633789062 0 183.12199401855469 endloop endfacet - facet normal -0.587785 0 -0.809018 + facet normal 0 -1 0 outer loop - vertex 143.09 0 242.489 - vertex 148.09 0 246.122 - vertex 136.91 0 242.489 + vertex 105.08999633789062 0 179.48899841308594 + vertex 110.08999633789062 0 183.12199401855469 + vertex 98.910003662109375 0 179.48899841308594 endloop endfacet endsolid diff --git a/apps/gpu/LBM/ActuatorLine/configActuatorLine.txt b/apps/gpu/LBM/ActuatorLine/configActuatorLine.txt index ca7f0aefb024f74043b311fc488e22e38e089803..64ddb3961aa10578798463789d55255d496e2273 100644 --- a/apps/gpu/LBM/ActuatorLine/configActuatorLine.txt +++ b/apps/gpu/LBM/ActuatorLine/configActuatorLine.txt @@ -8,12 +8,12 @@ Path = /work/y0078217/Results/ActuatorLine GridPath=. ################################################## ReferenceDiameter=126 -NodesPerDiameter=60 +NodesPerDiameter=100 Velocity=9 ################################################## tStartOut=0 tOut=10000 -tEnd=100000 +tEnd=10000 ################################################## # tStartTmpAveraging=100 diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Sponge/CumulantK17Sponge_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Sponge/CumulantK17Sponge_Device.cu index ce6bbce68c16b18aca810159d13d91eb8b5e4cbc..1bad79fa5728b57d4247fe8372636f84051fab50 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Sponge/CumulantK17Sponge_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Sponge/CumulantK17Sponge_Device.cu @@ -358,8 +358,8 @@ __global__ void LB_Kernel_CumulantK17Sponge( // 3. // Calculate modified omega for sponge bob layer - real startXsponge = 656.0f; - real endXsponge = 756.0f; + real startXsponge = 504.0f; + real endXsponge = 454.0f; real sizeSponge = endXsponge - startXsponge; real OxyyPxzz = c8o1 * (-c2o1 + omega) * (c1o1 + c2o1 * omega) / (-c8o1 - c14o1 * omega + c7o1 * omega * omega); diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu index 3e553ad68f4066d613037438c94e2a640c1a78fc..431f40f2939b0c2c1e480f3fe589b09106e3ce10 100644 --- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu +++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu @@ -508,11 +508,11 @@ void ActuatorFarm::initBoundingSpheres(Parameter* para, CudaMemoryManager* cudaM } } - 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."); - } + // 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(nodesInSpheres.size());