Add K15 unified.

src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15/CumulantK15Comp_Device.cu

@@ -2,10 +2,44 @@
 #include "LBM/D3Q27.h"
 #include <lbm/constants/NumericConstants.h>
 
+#include <lbm/CumulantChimeraK15.h>
+
+#include "Kernel/Utilities/DistributionHelper.cuh"
+
 using namespace vf::lbm::constant;
 #include "math.h"
 
 extern "C" __global__ void LB_Kernel_CumulantK15Comp(real omega,
+    unsigned int* typeOfGridNode,
+    unsigned int* neighborX,
+    unsigned int* neighborY,
+    unsigned int* neighborZ,
+    real* distributions,
+    int size_Mat,
+    int level,
+    real* forces,
+    bool isEvenTimestep)
+{
+    const uint k = vf::gpu::getNodeIndex();
+    const uint nodeType = typeOfGridNode[k];
+
+    if (!vf::gpu::isValidFluidNode(k, size_Mat, nodeType))
+        return;
+
+    vf::gpu::DistributionWrapper distributionWrapper {
+        distributions, size_Mat, isEvenTimestep, k, neighborX, neighborY, neighborZ
+    };
+
+    real level_forces[3];
+    vf::gpu::getLevelForce(forces[0], forces[1], forces[2], level, level_forces);
+
+    vf::lbm::cumulantChimeraK15(distributionWrapper.distribution, omega, level_forces);
+
+    distributionWrapper.write();
+}
+
+
+extern "C" __global__ void LB_Kernel_CumulantK15Comp_(real omega,
 	unsigned int* bcMatD,
 	unsigned int* neighborX,
 	unsigned int* neighborY,

src/gpu/VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cu

@@ -4,6 +4,8 @@
 
 #include "LBM/D3Q27.h"
 
+#include <lbm/constants/NumericConstants.h>
+#include <lbm/constants/D3Q27.h>
 
 namespace vf
 {

src/gpu/VirtualFluids_GPU/Kernel/Utilities/DistributionHelper.cuh

@@ -35,7 +35,7 @@
 
 #include "LBM/LB.h" 
 
-#include <lbm/CumulantChimeraK17.h>
+#include <lbm/Distribution27.h>
 
 namespace vf
 {

src/lbm/CumulantChimeraK15.h

+#ifndef LBM_CUMULANT_CHIMERA_K15_H
+#define LBM_CUMULANT_CHIMERA_K15_H
+
+#ifndef __host__
+#define __host__
+#endif
+#ifndef __device__
+#define __device__
+#endif
+
+#include <basics/Core/DataTypes.h>
+
+#include "Distribution27.h"
+
+namespace vf
+{
+namespace lbm
+{
+
+//////////////////////////////////////////////////////////////////////////
+//! Cumulant K17 Kernel is based on \ref
+//! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>
+//! and \ref
+//! <a href="https://doi.org/10.1016/j.jcp.2017.07.004"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.07.004 ]</b></a>
+//////////////////////////////////////////////////////////////////////////
+__host__ __device__ void cumulantChimeraK15(Distribution27& distribution, real omega, real* forces);
+
+}
+}
+#endif

src/lbm/CumulantChimeraK17.cpp

-#include "CumulantChimeraK17.h"
+#include "CumulantChimeraK15.h"
 
 #include <cmath>
 

src/lbm/CumulantChimeraK17.h

-#ifndef LBM_CUMULANT_CHIMERA_PRE_H
-#define LBM_CUMULANT_CHIMERA_PRE_H
+#ifndef LBM_CUMULANT_CHIMERA_K17_H
+#define LBM_CUMULANT_CHIMERA_K17_H
 
 #ifndef __host__
 #define __host__
@@ -8,44 +8,15 @@
 #define __device__
 #endif
 
-#include <cmath>
-
 #include <basics/Core/DataTypes.h>
-#include <basics/Core/RealConstants.h>
 
-#include "Chimera.h"
-#include "MacroscopicQuantities.h"
+#include "Distribution27.h"
 
 namespace vf
 {
 namespace lbm
 {
 
-
-struct Distribution27
-{
-    real f[27];
-
-    inline __host__ __device__ real getDensity_() const
-    {
-        return getDensity(f);
-    }
-};
-
-
-
-
-inline __host__ __device__ real abs_internal(real value)
-{
-#ifdef __CUDA_ARCH__
-    return ::abs(value);
-#else
-    return std::abs(value);
-#endif
-}
-
-
-
 //////////////////////////////////////////////////////////////////////////
 //! Cumulant K17 Kernel is based on \ref
 //! <a href="https://doi.org/10.1016/j.jcp.2017.05.040"><b>[ M. Geier et al. (2017), DOI:10.1016/j.jcp.2017.05.040 ]</b></a>

src/lbm/Distribution27.cpp

+#include "Distribution27.h"
+
+
+#include "MacroscopicQuantities.h"
+
+
+namespace vf
+{
+namespace lbm
+{
+
+
+
+inline __host__ __device__ real Distribution27::getDensity_() const
+{
+    return getDensity(f);
+}
+
+
+
+__host__ __device__ real abs_internal(real value)
+{
+#ifdef __CUDA_ARCH__
+    return ::abs(value);
+#else
+    return std::abs(value);
+#endif
+}
+
+
+}
+}

src/lbm/Distribution27.h

+#ifndef LBM_DISTRIBUTION_27_H
+#define LBM_DISTRIBUTION_27_H
+
+#ifndef __host__
+#define __host__
+#endif
+#ifndef __device__
+#define __device__
+#endif
+
+
+#include <basics/Core/DataTypes.h>
+
+namespace vf
+{
+namespace lbm
+{
+
+
+struct Distribution27
+{
+    real f[27];
+
+    __host__ __device__ real getDensity_() const;
+};
+
+
+__host__ __device__ real abs_internal(real value);
+
+
+}
+}
+
+#endif

src/lbm/cuda/CMakeLists.txt

@@ -6,6 +6,7 @@ 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(../Distribution27.cpp PROPERTIES LANGUAGE CUDA)
+set_source_files_properties(../CumulantChimeraK15.cpp PROPERTIES LANGUAGE CUDA)
 set_source_files_properties(../CumulantChimeraK17.cpp PROPERTIES LANGUAGE CUDA)
 #set_source_files_properties(../BackwardChimera.cpp PROPERTIES LANGUAGE CUDA)