From 1fbbbf6f0418da773520cbe33f4bcb7bbfa3979b Mon Sep 17 00:00:00 2001
From: Konstantin Kutscher <kutscher@irmb.tu-bs.de>
Date: Fri, 21 Jan 2022 15:54:49 +0100
Subject: [PATCH] fix warnings
---
apps/cpu/Multiphase/Multiphase.cpp | 2 +-
apps/cpu/RisingBubble2D/RisingBubble2D.cpp | 2 +-
.../Visitors/MultiphaseSetKernelBlockVisitor.cpp | 9 ++-------
.../Visitors/MultiphaseSetKernelBlockVisitor.h | 5 +----
4 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/apps/cpu/Multiphase/Multiphase.cpp b/apps/cpu/Multiphase/Multiphase.cpp
index 407ca2d29..fe1384160 100644
--- a/apps/cpu/Multiphase/Multiphase.cpp
+++ b/apps/cpu/Multiphase/Multiphase.cpp
@@ -349,7 +349,7 @@ void run(string configname)
UBLOG(logINFO, "Available memory per process = " << availMem << " bytes");
}
- MultiphaseSetKernelBlockVisitor kernelVisitor(kernel, nuL, nuG, densityRatio, beta, kappa, theta, availMem,
+ MultiphaseSetKernelBlockVisitor kernelVisitor(kernel, nuL, nuG, densityRatio, availMem,
needMem);
grid->accept(kernelVisitor);
diff --git a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
index 32dfe53c3..9034251c4 100644
--- a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
+++ b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
@@ -283,7 +283,7 @@ void run(string configname)
UBLOG(logINFO, "Available memory per process = " << availMem << " bytes");
}
- MultiphaseSetKernelBlockVisitor kernelVisitor(kernel, nuL, nuG, densityRatio, beta, kappa, theta, availMem,
+ MultiphaseSetKernelBlockVisitor kernelVisitor(kernel, nuL, nuG, densityRatio, availMem,
needMem);
grid->accept(kernelVisitor);
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.cpp
index 11863b691..50b303a60 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.cpp
@@ -19,9 +19,8 @@
// }
//}
//////////////////////////////////////////////////////////////////////////
-MultiphaseSetKernelBlockVisitor::MultiphaseSetKernelBlockVisitor(SPtr<LBMKernel> kernel, LBMReal nuL, LBMReal nuG, LBMReal densityRatio, LBMReal beta, LBMReal kappa,
- LBMReal contactAngle, double availMem, double needMem, MultiphaseSetKernelBlockVisitor::Action action /*= SetKernelBlockVisitor::New*/) :
- Block3DVisitor(0, Grid3DSystem::MAXLEVEL), kernel(kernel), nuL(nuL), nuG(nuG), densityRatio(densityRatio), beta(beta), kappa(kappa), contactAngle(contactAngle), action(action), dataSetFlag(true)
+MultiphaseSetKernelBlockVisitor::MultiphaseSetKernelBlockVisitor(SPtr<LBMKernel> kernel, LBMReal nuL, LBMReal nuG, LBMReal densityRatio, double availMem, double needMem, MultiphaseSetKernelBlockVisitor::Action action /*= SetKernelBlockVisitor::New*/) :
+ Block3DVisitor(0, Grid3DSystem::MAXLEVEL), kernel(kernel), nuL(nuL), nuG(nuG), densityRatio(densityRatio), action(action), dataSetFlag(true)
{
if (needMem > availMem)
{
@@ -36,10 +35,6 @@ void MultiphaseSetKernelBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> blo
LBMReal collFactorL = LBMSystem::calcCollisionFactor(nuL, block->getLevel());
LBMReal collFactorG = LBMSystem::calcCollisionFactor(nuG, block->getLevel());
kernel->setCollisionFactorMultiphase(collFactorL, collFactorG);
-
- //kernel->setDensityRatio(densityRatio);
- //kernel->setMultiphaseModelParameters(beta, kappa);
- //kernel->setContactAngle(contactAngle);
kernel->setIndex(block->getX1(), block->getX2(), block->getX3());
kernel->setDeltaT(LBMSystem::getDeltaT(block->getLevel()));
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.h
index 9f952e2dd..7406311a7 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.h
@@ -46,7 +46,7 @@ public:
//SetKernelBlockVisitor(LBMKernel3DPtr kernel, LBMReal nue, double availMem, double needMem);
- MultiphaseSetKernelBlockVisitor(SPtr<LBMKernel> kernel, LBMReal nuL, LBMReal nuG, LBMReal densityRatio, LBMReal beta, LBMReal kappa, LBMReal contactAngle, double availMem, double needMem,
+ MultiphaseSetKernelBlockVisitor(SPtr<LBMKernel> kernel, LBMReal nuL, LBMReal nuG, LBMReal densityRatio, double availMem, double needMem,
MultiphaseSetKernelBlockVisitor::Action action = MultiphaseSetKernelBlockVisitor::NewKernel);
virtual ~MultiphaseSetKernelBlockVisitor() {}
@@ -60,9 +60,6 @@ private:
LBMReal nuL;
LBMReal nuG;
LBMReal densityRatio;
- LBMReal beta;
- LBMReal kappa;
- LBMReal contactAngle;
Action action;
bool dataSetFlag;
};
--
GitLab