From 31f7337f9b2d6beefaa45af760f30dacf6026ff1 Mon Sep 17 00:00:00 2001
From: HenrikAsmuth <henrik.asmuth@geo.uu.se>
Date: Thu, 8 Sep 2022 16:00:54 +0200
Subject: [PATCH] various small cleanups for merge
---
.gitignore | 2 +-
gpu.cmake | 1 -
src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h | 1 -
src/gpu/VirtualFluids_GPU/GPU/GPU_Kernels.cuh | 12 ------------
.../GPU/TurbulentViscosityKernels.cu | 10 ----------
.../TurbulentViscosityCumulantK17CompChim.cu | 2 +-
6 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5d4d78662..f87c8efbb 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 5b175ca2a..a6b10012d 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 2f0779c6a..f1fb34763 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 1a5c79fb9..4cb2867f3 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 df1dc571c..3719ca371 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 0980050dc..140ab0ada 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);
--
GitLab