diff --git a/.gitignore b/.gitignore index 5d4d78662881515ed337f02a557621da2fa3a924..f87c8efbbd3b3877bd77212d6c2184db2aa409f1 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,4 @@ stl/ .DS_Store # Settings -.gitconfig +.gitconfig \ No newline at end of file diff --git a/gpu.cmake b/gpu.cmake index 5b175ca2a5fe7d289bd948e905ada612413333d2..a6b10012da7d71ec82422863319b77dc5e4af57d 100644 --- a/gpu.cmake +++ b/gpu.cmake @@ -27,7 +27,6 @@ IF (BUILD_VF_GPU) add_subdirectory(apps/gpu/LBM/DrivenCavity) add_subdirectory(apps/gpu/LBM/SphereGPU) - add_subdirectory(apps/gpu/LBM/BoundaryLayer) ELSE() MESSAGE( STATUS "exclude Virtual Fluids GPU." ) ENDIF() diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h index 2f0779c6ae2b1461f01383cf9fef9d17a4a38b01..f1fb3476313718e120bb5ee167445e50a319facb 100644 --- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h +++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h @@ -10,7 +10,6 @@ class BCKernelManager; class ADKernelManager; -class TurbulenceModelManager; class GridScalingKernelManager; class Kernel; class BoundaryConditionFactory; diff --git a/src/gpu/VirtualFluids_GPU/GPU/GPU_Kernels.cuh b/src/gpu/VirtualFluids_GPU/GPU/GPU_Kernels.cuh index 1a5c79fb9554d2fc64aea9b6594e79619d703be4..4cb2867f322856c2e1ece4a60e70588a79ddc8a7 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/GPU_Kernels.cuh +++ b/src/gpu/VirtualFluids_GPU/GPU/GPU_Kernels.cuh @@ -882,18 +882,6 @@ __global__ void QSlipDeviceComp27(real* DD, unsigned int size_Mat, bool isEvenTimestep); -// __global__ void QSlipDeviceComp27TurbViscosity(real* DD, -// int* k_Q, -// real* QQ, -// unsigned int numberOfBCnodes, -// real om1, -// unsigned int* neighborX, -// unsigned int* neighborY, -// unsigned int* neighborZ, -// real* turbViscosity, -// unsigned int size_Mat, -// bool isEvenTimestep); - __global__ void QSlipDeviceComp27TurbViscosity( real* distributions, int* subgridDistanceIndices, diff --git a/src/gpu/VirtualFluids_GPU/GPU/TurbulentViscosityKernels.cu b/src/gpu/VirtualFluids_GPU/GPU/TurbulentViscosityKernels.cu index df1dc571cf9627d84e940b2e0f53d55216ca6532..3719ca3712e6f63a77f62bf314af7d19eea01f4c 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/TurbulentViscosityKernels.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/TurbulentViscosityKernels.cu @@ -122,14 +122,4 @@ void calcTurbulentViscosityAMD(Parameter* para, int level) para->getSGSConstant() ); getLastCudaError("calcAMD execution failed"); -} - -__inline__ __device__ real calcTurbulentViscosityQR(real C, real dxux, real dyuy, real dzuz, real Dxy, real Dxz , real Dyz) -{ - // ! Verstappen's QR model - //! Second invariant of the strain-rate tensor - real Q = c1o2*( dxux*dxux + dyuy*dyuy + dzuz*dzuz ) + c1o4*( Dxy*Dxy + Dxz*Dxz + Dyz*Dyz); - //! Third invariant of the strain-rate tensor (determinant) - real R = - dxux*dyuy*dzuz - c1o4*( Dxy*Dxz*Dyz + dxux*Dyz*Dyz + dyuy*Dxz*Dxz + dzuz*Dxy*Dxy ); - return C * max(R, c0o1) / Q; } \ No newline at end of file diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/TurbulentViscosityKernels/FluidFlow/Compressible/CumulantK17chim/TurbulentViscosityCumulantK17CompChim.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/TurbulentViscosityKernels/FluidFlow/Compressible/CumulantK17chim/TurbulentViscosityCumulantK17CompChim.cu index 0980050dcb43f84b5a7da42dd2c9e4cef1796833..140ab0ada23318e57f4078dca1bc6611ddb9de54 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/TurbulentViscosityKernels/FluidFlow/Compressible/CumulantK17chim/TurbulentViscosityCumulantK17CompChim.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/TurbulentViscosityKernels/FluidFlow/Compressible/CumulantK17chim/TurbulentViscosityCumulantK17CompChim.cu @@ -22,7 +22,7 @@ void TurbulentViscosityCumulantK17CompChim::run() para->getParD(level)->forceZ_SP,para->getQuadricLimitersDev(), para->getParD(level)->isEvenTimestep); break; case TurbulenceModel::Smagorinsky: - LB_Kernel_TurbulentViscosityCumulantK17CompChim < TurbulenceModel::AMD > <<< grid.grid, grid.threads >>>( para->getParD(level)->omega, para->getParD(level)->typeOfGridNode, para->getParD(level)->neighborX, para->getParD(level)->neighborY, para->getParD(level)->neighborZ, para->getParD(level)->distributions.f[0], + LB_Kernel_TurbulentViscosityCumulantK17CompChim < TurbulenceModel::Smagorinsky > <<< grid.grid, grid.threads >>>( para->getParD(level)->omega, para->getParD(level)->typeOfGridNode, para->getParD(level)->neighborX, para->getParD(level)->neighborY, para->getParD(level)->neighborZ, para->getParD(level)->distributions.f[0], para->getParD(level)->rho, para->getParD(level)->velocityX, para->getParD(level)->velocityY, para->getParD(level)->velocityZ, para->getParD(level)->turbViscosity,para->getSGSConstant(), (unsigned long)para->getParD(level)->numberOfNodes, level, para->getIsBodyForce(), para->getForcesDev(), para->getParD(level)->forceX_SP, para->getParD(level)->forceY_SP, para->getParD(level)->forceZ_SP,para->getQuadricLimitersDev(), para->getParD(level)->isEvenTimestep);