From f29f628fbd69ae90b224e7dfc3b1f36e20b55eb3 Mon Sep 17 00:00:00 2001
From: peters <peters@irmb.tu-bs.de>
Date: Wed, 26 May 2021 15:14:14 +0200
Subject: [PATCH] Renamed ChimeraKernel.
---
src/gpu/VirtualFluids_GPU/CMakeLists.txt | 7 +++-
.../CumulantK17Unified_device.cu | 2 +-
.../Kernel/Utilities/DistributionHelper.cuh | 2 +-
...PreCompiled.cpp => CumulantChimeraK17.cpp} | 2 +-
...meraPreCompiled.h => CumulantChimeraK17.h} | 0
src/lbm/MacroscopicQuantities.h | 38 -------------------
src/lbm/cuda/CMakeLists.txt | 2 +-
7 files changed, 9 insertions(+), 44 deletions(-)
rename src/lbm/{CumulantChimeraPreCompiled.cpp => CumulantChimeraK17.cpp} (99%)
rename src/lbm/{CumulantChimeraPreCompiled.h => CumulantChimeraK17.h} (100%)
diff --git a/src/gpu/VirtualFluids_GPU/CMakeLists.txt b/src/gpu/VirtualFluids_GPU/CMakeLists.txt
index 4c7fcd57b..5c9359944 100644
--- a/src/gpu/VirtualFluids_GPU/CMakeLists.txt
+++ b/src/gpu/VirtualFluids_GPU/CMakeLists.txt
@@ -14,7 +14,10 @@ vf_add_library(PUBLIC_LINK basics lbmCuda PRIVATE_LINK ${additional_libraries} G
set_target_properties(VirtualFluids_GPU PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+
vf_add_tests()
-set_target_properties(VirtualFluids_GPUTests PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
-set_source_files_properties(Kernel/Utilities/DistributionHelperTests.cpp PROPERTIES LANGUAGE CUDA)
+if(BUILD_VF_UNIT_TESTS)
+ set_target_properties(VirtualFluids_GPUTests PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+ set_source_files_properties(Kernel/Utilities/DistributionHelperTests.cpp PROPERTIES LANGUAGE CUDA)
+endif()
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Unified/CumulantK17Unified_device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Unified/CumulantK17Unified_device.cu
index ccf23c5ab..ec15a2a76 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Unified/CumulantK17Unified_device.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Unified/CumulantK17Unified_device.cu
@@ -31,7 +31,7 @@
//! \author Martin Schoenherr, Soeren Peters
//=======================================================================================
/* Device code */
-#include <lbm/CumulantChimeraPreCompiled.h>
+#include <lbm/CumulantChimeraK17.h>
#include "Kernel/Utilities/DistributionHelper.cuh"
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cuh b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cuh
index 649f7322c..b657bc2d6 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cuh
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cuh
@@ -36,7 +36,7 @@
#include "LBM/LB.h"
-#include <lbm/CumulantChimeraPreCompiled.h>
+#include <lbm/CumulantChimeraK17.h>
namespace vf
{
diff --git a/src/lbm/CumulantChimeraPreCompiled.cpp b/src/lbm/CumulantChimeraK17.cpp
similarity index 99%
rename from src/lbm/CumulantChimeraPreCompiled.cpp
rename to src/lbm/CumulantChimeraK17.cpp
index 33744ab29..b072e7507 100644
--- a/src/lbm/CumulantChimeraPreCompiled.cpp
+++ b/src/lbm/CumulantChimeraK17.cpp
@@ -1,4 +1,4 @@
-#include "CumulantChimeraPreCompiled.h"
+#include "CumulantChimeraK17.h"
#include <cmath>
diff --git a/src/lbm/CumulantChimeraPreCompiled.h b/src/lbm/CumulantChimeraK17.h
similarity index 100%
rename from src/lbm/CumulantChimeraPreCompiled.h
rename to src/lbm/CumulantChimeraK17.h
diff --git a/src/lbm/MacroscopicQuantities.h b/src/lbm/MacroscopicQuantities.h
index d5e84c04b..1a440b532 100644
--- a/src/lbm/MacroscopicQuantities.h
+++ b/src/lbm/MacroscopicQuantities.h
@@ -88,44 +88,6 @@ inline __host__ __device__ real getPressure(const real *const &f27, const real&
// Attention: op defined directly to op = 1 ; ^^^^(1.0/op-0.5)=0.5
}
-// GPU: LBCalcMacCompSP27
-// rhoD[k] = (D.f[dirE])[ke] + (D.f[dirW])[kw] + (D.f[dirN])[kn] + (D.f[dirS])[ks] + (D.f[dirT])[kt] + (D.f[dirB])[kb]
-// + (D.f[dirNE])[kne] + (D.f[dirSW])[ksw] + (D.f[dirSE])[kse] + (D.f[dirNW])[knw] +
-// (D.f[dirTE])[kte] + (D.f[dirBW])[kbw] + (D.f[dirBE])[kbe] + (D.f[dirTW])[ktw] + (D.f[dirTN])[ktn] +
-// (D.f[dirBS])[kbs] + (D.f[dirBN])[kbn] + (D.f[dirTS])[kts] + (D.f[dirZERO])[kzero] +
-// (D.f[dirTNE])[ktne] + (D.f[dirTSW])[ktsw] + (D.f[dirTSE])[ktse] + (D.f[dirTNW])[ktnw] +
-// (D.f[dirBNE])[kbne] + (D.f[dirBSW])[kbsw] + (D.f[dirBSE])[kbse] + (D.f[dirBNW])[kbnw];
-
-// vxD[k] = ((D.f[dirE])[ke] - (D.f[dirW])[kw] + (D.f[dirNE])[kne] - (D.f[dirSW])[ksw] + (D.f[dirSE])[kse] -
-// (D.f[dirNW])[knw] + (D.f[dirTE])[kte] - (D.f[dirBW])[kbw] + (D.f[dirBE])[kbe] - (D.f[dirTW])[ktw] +
-// (D.f[dirTNE])[ktne] - (D.f[dirTSW])[ktsw] + (D.f[dirTSE])[ktse] - (D.f[dirTNW])[ktnw] +
-// (D.f[dirBNE])[kbne] - (D.f[dirBSW])[kbsw] + (D.f[dirBSE])[kbse] - (D.f[dirBNW])[kbnw]) /
-// (c1o1 + rhoD[k]);
-
-// vyD[k] = ((D.f[dirN])[kn] - (D.f[dirS])[ks] + (D.f[dirNE])[kne] - (D.f[dirSW])[ksw] - (D.f[dirSE])[kse] +
-// (D.f[dirNW])[knw] + (D.f[dirTN])[ktn] - (D.f[dirBS])[kbs] + (D.f[dirBN])[kbn] - (D.f[dirTS])[kts] +
-// (D.f[dirTNE])[ktne] - (D.f[dirTSW])[ktsw] - (D.f[dirTSE])[ktse] + (D.f[dirTNW])[ktnw] +
-// (D.f[dirBNE])[kbne] - (D.f[dirBSW])[kbsw] - (D.f[dirBSE])[kbse] + (D.f[dirBNW])[kbnw]) /
-// (c1o1 + rhoD[k]);
-
-// vzD[k] = ((D.f[dirT])[kt] - (D.f[dirB])[kb] + (D.f[dirTE])[kte] - (D.f[dirBW])[kbw] - (D.f[dirBE])[kbe] +
-// (D.f[dirTW])[ktw] + (D.f[dirTN])[ktn] - (D.f[dirBS])[kbs] - (D.f[dirBN])[kbn] + (D.f[dirTS])[kts] +
-// (D.f[dirTNE])[ktne] + (D.f[dirTSW])[ktsw] + (D.f[dirTSE])[ktse] + (D.f[dirTNW])[ktnw] -
-// (D.f[dirBNE])[kbne] - (D.f[dirBSW])[kbsw] - (D.f[dirBSE])[kbse] - (D.f[dirBNW])[kbnw]) /
-// (c1o1 + rhoD[k]);
-
-// pressD[k] =
-// ((D.f[dirE])[ke] + (D.f[dirW])[kw] + (D.f[dirN])[kn] + (D.f[dirS])[ks] + (D.f[dirT])[kt] + (D.f[dirB])[kb] +
-// c2o1 * ((D.f[dirNE])[kne] + (D.f[dirSW])[ksw] + (D.f[dirSE])[kse] + (D.f[dirNW])[knw] + (D.f[dirTE])[kte] +
-// (D.f[dirBW])[kbw] + (D.f[dirBE])[kbe] + (D.f[dirTW])[ktw] + (D.f[dirTN])[ktn] + (D.f[dirBS])[kbs] +
-// (D.f[dirBN])[kbn] + (D.f[dirTS])[kts]) +
-// c3o1 * ((D.f[dirTNE])[ktne] + (D.f[dirTSW])[ktsw] + (D.f[dirTSE])[ktse] + (D.f[dirTNW])[ktnw] +
-// (D.f[dirBNE])[kbne] + (D.f[dirBSW])[kbsw] + (D.f[dirBSE])[kbse] + (D.f[dirBNW])[kbnw]) -
-// rhoD[k] - (vxD[k] * vxD[k] + vyD[k] * vyD[k] + vzD[k] * vzD[k]) * (c1o1 + rhoD[k])) *
-// c1o2 +
-// rhoD[k]; // times zero for incompressible case
-// // achtung op hart gesetzt Annahme op = 1 ; ^^^^(1.0/op-0.5)=0.5
-
}
}
diff --git a/src/lbm/cuda/CMakeLists.txt b/src/lbm/cuda/CMakeLists.txt
index 78433784b..1ab9fb42e 100644
--- a/src/lbm/cuda/CMakeLists.txt
+++ b/src/lbm/cuda/CMakeLists.txt
@@ -7,5 +7,5 @@ vf_add_library(NAME lbmCuda BUILDTYPE static PUBLIC_LINK basics FOLDER ../../lbm
set_target_properties(lbmCuda PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
-set_source_files_properties(../CumulantChimeraPreCompiled.cpp PROPERTIES LANGUAGE CUDA)
+set_source_files_properties(../CumulantChimeraK17.cpp PROPERTIES LANGUAGE CUDA)
#set_source_files_properties(../BackwardChimera.cpp PROPERTIES LANGUAGE CUDA)
--
GitLab