From 40aa68e73bd7d6f8c03de287ae422fd0fd79d562 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Wed, 26 May 2021 10:37:10 +0200
Subject: [PATCH] Small clean ups.
---
src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp | 2 +-
.../CumulantK17Unified/CumulantK17Unified_device.cu | 2 +-
src/lbm/CumulantChimeraPreCompiled.cpp | 4 ++--
src/lbm/CumulantChimeraPreCompiled.h | 2 +-
src/lbm/MacroscopicQuantities.h | 3 ++-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp
index fb4aa49a3..8c2660ac5 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp
@@ -244,7 +244,7 @@ void CumulantK17LBMKernelUnified::calculate(int step)
distribution.f[vf::lbm::dir::MMM] = mfaaa;
distribution.f[vf::lbm::dir::ZZZ] = mfbbb;
- vf::lbm::cumulantChimera(distribution, omega, forces);
+ vf::lbm::cumulantChimeraK17(distribution, omega, forces);
mfcbb = distribution.f[vf::lbm::dir::PZZ];
mfabb = distribution.f[vf::lbm::dir::MZZ];
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 973a91962..ccf23c5ab 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
@@ -66,7 +66,7 @@ __global__ void LB_Kernel_CumulantK17Unified(
real level_forces[3];
getLevelForce(forces[0], forces[1], forces[2], level, level_forces);
- vf::lbm::cumulantChimera(distributionWrapper.distribution, omega, level_forces);
+ vf::lbm::cumulantChimeraK17(distributionWrapper.distribution, omega, level_forces);
distributionWrapper.write();
}
diff --git a/src/lbm/CumulantChimeraPreCompiled.cpp b/src/lbm/CumulantChimeraPreCompiled.cpp
index af2c8789c..33744ab29 100644
--- a/src/lbm/CumulantChimeraPreCompiled.cpp
+++ b/src/lbm/CumulantChimeraPreCompiled.cpp
@@ -16,7 +16,7 @@ namespace vf
namespace lbm
{
- using namespace constant;
+using namespace constant;
//////////////////////////////////////////////////////////////////////////
@@ -25,7 +25,7 @@ namespace lbm
//! 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 cumulantChimera(Distribution27& distribution, real omega, real* forces)
+__host__ __device__ void cumulantChimeraK17(Distribution27& distribution, real omega, real* forces)
{
////////////////////////////////////////////////////////////////////////////////////
//! - Read distributions: style of reading and writing the distributions from/to
diff --git a/src/lbm/CumulantChimeraPreCompiled.h b/src/lbm/CumulantChimeraPreCompiled.h
index b4cbe4f21..0aba4bcdc 100644
--- a/src/lbm/CumulantChimeraPreCompiled.h
+++ b/src/lbm/CumulantChimeraPreCompiled.h
@@ -52,7 +52,7 @@ inline __host__ __device__ real abs_internal(real value)
//! 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 cumulantChimera(Distribution27& distribution, real omega, real* forces);
+__host__ __device__ void cumulantChimeraK17(Distribution27& distribution, real omega, real* forces);
}
}
diff --git a/src/lbm/MacroscopicQuantities.h b/src/lbm/MacroscopicQuantities.h
index ac2ce9a23..d5e84c04b 100644
--- a/src/lbm/MacroscopicQuantities.h
+++ b/src/lbm/MacroscopicQuantities.h
@@ -84,7 +84,8 @@ inline __host__ __device__ real getPressure(const real *const &f27, const real&
constant::c3o1 * (f27[dir::TNE] + f27[dir::TSW] + f27[dir::TSE] + f27[dir::TNW] +
f27[dir::BNE] + f27[dir::BSW] + f27[dir::BSE] + f27[dir::BNW]) -
rho - (vx * vx + vy * vy + vz * vz) * (constant::c1o1 + rho)) *
- constant::c1o2 + rho;
+ constant::c1o2 + rho; // times zero for incompressible case
+ // Attention: op defined directly to op = 1 ; ^^^^(1.0/op-0.5)=0.5
}
// GPU: LBCalcMacCompSP27
--
GitLab