From 2a513f0857d2405e4f56d26f1d15e51522525c6a Mon Sep 17 00:00:00 2001
From: niikonst <niikonst@blogin1.usr.hlrn.de>
Date: Mon, 18 Sep 2023 15:09:22 +0200
Subject: [PATCH] fix merge
---
.../MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp
index d71fdfb7f..84613be5c 100644
--- a/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp
@@ -4002,7 +4002,7 @@ void MultiphaseScaleDistributionLBMKernel::calculate(int step)
///////
// non Newtonian fluid collision factor
- if (phi[DIR_000] > phiLim /*- 0.3*/) {
+ //if (phi[DIR_000] > phiLim /*- 0.3*/) {
//if (phi[DIR_000] > phiLim) {
// real shearRate = sqrt(c2o1 * (dxux * dxux + dyuy * dyuy + dzuz * dzuz) + Dxy * Dxy + Dxz * Dxz + Dyz * Dyz);
// collFactorM = Rheology::getBinghamCollFactor(collFactorM, shearRate, c1o1);
--
GitLab