From 9a33edd14a271d2da5a0a6cf72d439e2e459cb20 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters.soeren@gmx.net>
Date: Wed, 10 Feb 2021 15:43:48 +0100
Subject: [PATCH] Removed a lot of warnings like unused variables and missing
overrides.
---
apps/cpu/CouetteFlow/cflow.cpp | 8 +-
apps/cpu/FlowAroundCylinder/cylinder.cpp | 2 +-
apps/cpu/HerschelBulkleyModel/hbflow.cpp | 8 +-
apps/cpu/rheometer/rheometer.cpp | 2 +-
apps/cpu/sphere/sphere.cpp | 7 +-
.../RheologicalVelocityBCAlgorithm.cpp | 3 -
.../RheologicalVelocityBCAlgorithm.h | 2 +-
.../SimpleSlipBCAlgorithm.h | 4 +-
.../SimpleVelocityBCAlgorithm.cpp | 1 -
.../SimpleVelocityBCAlgorithm.h | 4 +-
.../ThixotropyNoSlipBCAlgorithm.cpp | 7 -
.../ThixotropyNoSlipBCAlgorithm.h | 6 +-
...ityWithDensityAndThixotropyBCAlgorithm.cpp | 2 -
.../VelocityWithDensityBCAlgorithm.cpp | 2 +-
.../CalculateTorqueCoProcessor.cpp | 1 -
.../WriteMacroscopicQuantitiesCoProcessor.cpp | 1 -
.../WriteThixotropyQuantitiesCoProcessor.cpp | 7 +-
.../WriteThixotropyQuantitiesCoProcessor.h | 6 +-
.../ThixotropyFullDirectConnector.cpp | 2 +-
.../VirtualFluidsCore/LBM/BasicLBMKernel.cpp | 4 -
.../VirtualFluidsCore/LBM/BasicLBMKernel.h | 2 +-
.../LBM/CumulantLBMKernel.cpp | 11 +-
.../VirtualFluidsCore/LBM/CumulantLBMKernel.h | 6 +-
src/cpu/VirtualFluidsCore/LBM/D3Q27System.cpp | 159 +++++++++---------
.../LBM/RheologyK17LBMKernel.cpp | 4 -
.../LBM/RheologyK17LBMKernel.h | 4 +-
src/cpu/VirtualFluidsCore/LBM/Thixotropy.h | 2 +-
.../LBM/ThixotropyExpLBMKernel.cpp | 14 +-
.../LBM/ThixotropyInterpolationProcessor.cpp | 46 ++---
.../LBM/ThixotropyInterpolationProcessor.h | 4 +-
.../LBM/ThixotropyLBMKernel.cpp | 10 +-
.../LBM/ThixotropyModelLBMKernel2.cpp | 14 +-
.../InitDistributionsBlockVisitor.cpp | 4 -
.../Visitors/InitThixotropyBlockVisitor.cpp | 10 +-
.../Visitors/SetConnectorsBlockVisitor.cpp | 7 -
35 files changed, 159 insertions(+), 217 deletions(-)
diff --git a/apps/cpu/CouetteFlow/cflow.cpp b/apps/cpu/CouetteFlow/cflow.cpp
index f5a3abca7..72fd03b2f 100644
--- a/apps/cpu/CouetteFlow/cflow.cpp
+++ b/apps/cpu/CouetteFlow/cflow.cpp
@@ -34,8 +34,8 @@ void bflow(string configname)
//double tau0 = config.getValue<double>("tau0");
double velocity = config.getValue<double>("velocity");
double n = config.getValue<double>("n");
- double Re = config.getValue<double>("Re");
- double Bn = config.getValue<double>("Bn");
+// double Re = config.getValue<double>("Re");
+// double Bn = config.getValue<double>("Bn");
SPtr<Communicator> comm = MPICommunicator::getInstance();
int myid = comm->getProcessID();
@@ -81,8 +81,8 @@ void bflow(string configname)
double blockLength = 3.0 * deltax;
- double h = (g_maxX2) / 2.0;
- double dex = g_maxX1;
+// double h = (g_maxX2) / 2.0;
+// double dex = g_maxX1;
//LBMReal tau0 = 1.2e-7;
//LBMReal k = nuLB;
diff --git a/apps/cpu/FlowAroundCylinder/cylinder.cpp b/apps/cpu/FlowAroundCylinder/cylinder.cpp
index 8e0073b77..044ef765f 100644
--- a/apps/cpu/FlowAroundCylinder/cylinder.cpp
+++ b/apps/cpu/FlowAroundCylinder/cylinder.cpp
@@ -73,7 +73,7 @@ void run(string configname)
SPtr<LBMUnitConverter> conv = SPtr<LBMUnitConverter>(new LBMUnitConverter());
- const int baseLevel = 0;
+// const int baseLevel = 0;
SPtr<Grid3D> grid(new Grid3D(comm));
diff --git a/apps/cpu/HerschelBulkleyModel/hbflow.cpp b/apps/cpu/HerschelBulkleyModel/hbflow.cpp
index d83f0f6d0..10381afe2 100644
--- a/apps/cpu/HerschelBulkleyModel/hbflow.cpp
+++ b/apps/cpu/HerschelBulkleyModel/hbflow.cpp
@@ -34,8 +34,8 @@ void bflow(string configname)
double tau0 = config.getValue<double>("tau0");
double velocity = config.getValue<double>("velocity");
double n = config.getValue<double>("n");
- double Re = config.getValue<double>("Re");
- double Bn = config.getValue<double>("Bn");
+// double Re = config.getValue<double>("Re");
+// double Bn = config.getValue<double>("Bn");
double scaleFactor = config.getValue<double>("scaleFactor");
SPtr<Communicator> comm = MPICommunicator::getInstance();
@@ -84,8 +84,8 @@ void bflow(string configname)
double blockLength = 3.0 * deltax;
- double h = (g_maxX2) / 2.0;
- double dex = g_maxX1;
+// double h = (g_maxX2) / 2.0;
+// double dex = g_maxX1;
//LBMReal tau0 = 1.2e-7;
//LBMReal k = nuLB;
diff --git a/apps/cpu/rheometer/rheometer.cpp b/apps/cpu/rheometer/rheometer.cpp
index 96c50e5c3..fba3d7235 100644
--- a/apps/cpu/rheometer/rheometer.cpp
+++ b/apps/cpu/rheometer/rheometer.cpp
@@ -105,7 +105,7 @@ void bflow(string configname)
//double g_maxX2 = boundingBox[1]/2.0;
//double g_maxX3 = boundingBox[2]/2.0;
- double blockLength = 3.0 * deltax;
+// double blockLength = 3.0 * deltax;
// double d = 2.0 * radius;
// double U = uLB;
diff --git a/apps/cpu/sphere/sphere.cpp b/apps/cpu/sphere/sphere.cpp
index 388d36718..f7f8481d1 100644
--- a/apps/cpu/sphere/sphere.cpp
+++ b/apps/cpu/sphere/sphere.cpp
@@ -12,8 +12,6 @@ void run(string configname)
SPtr<Communicator> comm = MPICommunicator::getInstance();
int myid = comm->getProcessID();
- int mybundle = comm->getBundleID();
- int root = comm->getRoot();
//ConfigurationFile config;
//config.load(configname);
@@ -41,7 +39,7 @@ void run(string configname)
LBMReal nuLB = (uLB*2.0*radius)/Re;
double dp_LB = 1e-6;
- double rhoLBinflow = dp_LB*3.0;
+// double rhoLBinflow = dp_LB*3.0;
SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
@@ -98,9 +96,6 @@ void run(string configname)
if (true)
{
-
- const int baseLevel = 0;
-
//bounding box
double d_minX1 = 0.0;
double d_minX2 = 0.0;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologicalVelocityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologicalVelocityBCAlgorithm.cpp
index 2614c703b..9f6ca522a 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologicalVelocityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologicalVelocityBCAlgorithm.cpp
@@ -26,9 +26,6 @@ void RheologicalVelocityBCAlgorithm::applyBC()
calcMacrosFct(f, drho, vx1, vx2, vx3);
calcFeqFct(feq, drho, vx1, vx2, vx3);
- LBMReal shearRate = D3Q27System::getShearRate(f, collFactor);
- LBMReal collFactorF = getThyxotropyCollFactor(collFactor, shearRate, drho);
-
rho = 1.0+drho*compressibleFactor;
for (int fdir = D3Q27System::FSTARTDIR; fdir<=D3Q27System::FENDDIR; fdir++)
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologicalVelocityBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologicalVelocityBCAlgorithm.h
index 60237e3db..179bf57c3 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologicalVelocityBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologicalVelocityBCAlgorithm.h
@@ -12,7 +12,7 @@ public:
RheologicalVelocityBCAlgorithm();
~RheologicalVelocityBCAlgorithm();
virtual SPtr<BCAlgorithm> clone() override { UB_THROW(UbException("LBMReal clone() - belongs in the derived class")); }
- void addDistributions(SPtr<DistributionArray3D> distributions);
+ void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
protected:
virtual LBMReal getThyxotropyCollFactor(LBMReal omegaInf, LBMReal shearRate, LBMReal drho) const = 0; // { UB_THROW(UbException("LBMReal getThyxotropyCollFactor() - belongs in the derived class")); }
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCAlgorithm.h
index 3da686232..bfe4a766b 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCAlgorithm.h
@@ -44,8 +44,8 @@ class SimpleSlipBCAlgorithm : public BCAlgorithm
public:
SimpleSlipBCAlgorithm();
virtual ~SimpleSlipBCAlgorithm();
- SPtr<BCAlgorithm> clone();
- void addDistributions(SPtr<DistributionArray3D> distributions);
+ SPtr<BCAlgorithm> clone() override;
+ void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
};
#endif // SimpleSlipBCAlgorithm_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.cpp
index 27e0615e1..9e136e015 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.cpp
@@ -72,7 +72,6 @@ void SimpleVelocityBCAlgorithm::applyBC()
if (bcPtr->hasVelocityBoundaryFlag(fdir))
{
const int invDir = D3Q27System::INVDIR[fdir];
- LBMReal q = bcPtr->getQ(invDir);
LBMReal velocity = bcPtr->getBoundaryVelocity(invDir);
LBMReal fReturn = f[invDir] - velocity;
distributions->setDistributionForDirection(fReturn, x1+D3Q27System::DX1[invDir], x2+D3Q27System::DX2[invDir], x3+D3Q27System::DX3[invDir], fdir);
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.h
index 714276760..b751d220c 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.h
@@ -45,8 +45,8 @@ class SimpleVelocityBCAlgorithm : public BCAlgorithm
public:
SimpleVelocityBCAlgorithm();
~SimpleVelocityBCAlgorithm();
- SPtr<BCAlgorithm> clone();
- void addDistributions(SPtr<DistributionArray3D> distributions);
+ SPtr<BCAlgorithm> clone() override;
+ void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
};
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.cpp
index 0ee6d281d..9fae576b7 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.cpp
@@ -2,13 +2,6 @@
#include "DistributionArray3D.h"
#include "BoundaryConditions.h"
-ThixotropyNoSlipBCAlgorithm::ThixotropyNoSlipBCAlgorithm()
-{
-}
-//////////////////////////////////////////////////////////////////////////
-ThixotropyNoSlipBCAlgorithm::~ThixotropyNoSlipBCAlgorithm()
-{
-}
//////////////////////////////////////////////////////////////////////////
void ThixotropyNoSlipBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
{
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.h
index 284cbbf2f..51448a836 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.h
@@ -9,10 +9,10 @@ class DistributionArray3D;
class ThixotropyNoSlipBCAlgorithm : public BCAlgorithm
{
public:
- ThixotropyNoSlipBCAlgorithm();
- ~ThixotropyNoSlipBCAlgorithm();
+ ThixotropyNoSlipBCAlgorithm() = default;
+ ~ThixotropyNoSlipBCAlgorithm() = default;
virtual SPtr<BCAlgorithm> clone() override { UB_THROW(UbException("LBMReal clone() - belongs in the derived class")); }
- void addDistributions(SPtr<DistributionArray3D> distributions);
+ void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
protected:
virtual LBMReal getThyxotropyCollFactor(LBMReal omegaInf, LBMReal shearRate, LBMReal drho) const = 0; // { UB_THROW(UbException("LBMReal getThyxotropyCollFactor() - belongs in the derived class")); }
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityAndThixotropyBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityAndThixotropyBCAlgorithm.cpp
index d08d112d4..8f2436b38 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityAndThixotropyBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityAndThixotropyBCAlgorithm.cpp
@@ -81,7 +81,6 @@ void VelocityWithDensityAndThixotropyBCAlgorithm::applyBC()
if (bcArray->isSolid(nX1,nX2,nX3))
{
const int invDir = D3Q27System::INVDIR[fdir];
- LBMReal q =1.0;// bcPtr->getQ(invDir);// m+m q=0 stabiler
LBMReal velocity = bcPtr->getBoundaryVelocity(fdir);
LBMReal fReturn = (f[fdir] + f[invDir] - velocity*rho) / 2.0 - drho*D3Q27System::WEIGTH[invDir];
@@ -91,7 +90,6 @@ void VelocityWithDensityAndThixotropyBCAlgorithm::applyBC()
if (bcPtr->hasVelocityBoundaryFlag(fdir))
{
- const int invDir = D3Q27System::INVDIR[fdir];
LBMReal htemp = D3Q27System::getCompFeqForDirection(fdir, lambda, vx1, vx2, vx3);
htemp = D3Q27System::getCompFeqForDirection(fdir, lambdaBC, vx1, vx2, vx3) + h[fdir] - htemp;
distributionsH->setDistributionForDirection(htemp, nx1, nx2, nx3, fdir);
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
index 96c465439..45615466c 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
@@ -25,7 +25,7 @@ void VelocityWithDensityBCAlgorithm::applyBC()
{
//velocity bc for non reflecting pressure bc
LBMReal f[D3Q27System::ENDF+1];
- LBMReal feq[D3Q27System::ENDF+1];
+ //LBMReal feq[D3Q27System::ENDF+1];
distributions->getDistributionInv(f, x1, x2, x3);
LBMReal rho, vx1, vx2, vx3, drho;
calcMacrosFct(f, drho, vx1, vx2, vx3);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
index af7533ef5..097615763 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
@@ -86,7 +86,6 @@ void CalculateTorqueCoProcessor::calculateForces()
forceX1global = 0.0;
forceX2global = 0.0;
forceX3global = 0.0;
- int counter = 0;
for(SPtr<D3Q27Interactor> interactor : interactors)
{
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
index 43687af9c..04191a992 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
@@ -146,7 +146,6 @@ void WriteMacroscopicQuantitiesCoProcessor::clearData()
void WriteMacroscopicQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
{
double level = (double)block->getLevel();
- double blockID = (double)block->getGlobalID();
// Diese Daten werden geschrieben:
datanames.resize(0);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.cpp
index af7c6d393..27ec00a76 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.cpp
@@ -110,13 +110,12 @@ void WriteThixotropyQuantitiesCoProcessor::clearData()
//////////////////////////////////////////////////////////////////////////
void WriteThixotropyQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
{
- UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);
- UbTupleDouble3 blockLengths = grid->getBlockLengths(block);
+ UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);;
UbTupleDouble3 nodeOffset = grid->getNodeOffset(block);
double dx = grid->getDeltaX(block);
- double level = (double)block->getLevel();
- double blockID = (double)block->getGlobalID();
+ //double level = (double)block->getLevel();
+ //double blockID = (double)block->getGlobalID();
//Diese Daten werden geschrieben:
datanames.resize(0);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.h
index 58430fd9e..269bb4a3b 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.h
@@ -13,7 +13,7 @@ class WriteThixotropyQuantitiesCoProcessor : public CoProcessor
public:
WriteThixotropyQuantitiesCoProcessor();
WriteThixotropyQuantitiesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string& path, WbWriter* const writer, SPtr<LBMUnitConverter> conv, SPtr<Communicator> comm);
- ~WriteThixotropyQuantitiesCoProcessor() {}
+ ~WriteThixotropyQuantitiesCoProcessor() = default;
void process(double step) override;
@@ -31,12 +31,12 @@ private:
std::string path;
WbWriter* writer;
SPtr<LBMUnitConverter> conv;
- bool bcInformation;
+// bool bcInformation;
std::vector<std::vector<SPtr<Block3D> > > blockVector;
int minInitLevel;
int maxInitLevel;
int gridRank;
SPtr<Communicator> comm;
- double ConcentrationSum;
+// double ConcentrationSum;
};
#endif
diff --git a/src/cpu/VirtualFluidsCore/Connectors/ThixotropyFullDirectConnector.cpp b/src/cpu/VirtualFluidsCore/Connectors/ThixotropyFullDirectConnector.cpp
index 3fb819ab7..39561bd81 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/ThixotropyFullDirectConnector.cpp
+++ b/src/cpu/VirtualFluidsCore/Connectors/ThixotropyFullDirectConnector.cpp
@@ -66,7 +66,7 @@ void ThixotropyFullDirectConnector::sendVectors()
nonLocalDistributionsToh = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(this->hTo)->getNonLocalDistributions();
zeroDistributionsToh = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(this->hTo)->getZeroDistributions();
- bool con = /*(from.lock()->getGlobalID()==11) &&*/ (to.lock()->getGlobalID() == 1);
+ //bool con = /*(from.lock()->getGlobalID()==11) &&*/ (to.lock()->getGlobalID() == 1);
//EAST
if (sendDir == D3Q27System::E)
diff --git a/src/cpu/VirtualFluidsCore/LBM/BasicLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/BasicLBMKernel.cpp
index 553c49961..12c4b6e89 100644
--- a/src/cpu/VirtualFluidsCore/LBM/BasicLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/BasicLBMKernel.cpp
@@ -49,10 +49,6 @@ void BasicLBMKernel::calculate(int step)
{
if (!bcArray->isSolid(x1, x2, x3) && !bcArray->isUndefined(x1, x2, x3))
{
- int x1p = x1 + 1;
- int x2p = x2 + 1;
- int x3p = x3 + 1;
-
nodeCollision(step, x1, x2, x3);
}
}
diff --git a/src/cpu/VirtualFluidsCore/LBM/BasicLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/BasicLBMKernel.h
index 4a6b4632f..2e8a6c5b3 100644
--- a/src/cpu/VirtualFluidsCore/LBM/BasicLBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/BasicLBMKernel.h
@@ -1,4 +1,4 @@
-#ifndef BasicLBMKernell_h__
+#ifndef BasicLBMKernel_h__
#define BasicLBMKernel_h__
#include "LBMKernel.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.cpp
index f0955c0b1..1ecfc5a4c 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.cpp
@@ -18,11 +18,6 @@ CumulantLBMKernel::CumulantLBMKernel()
this->OxyyMxzz = 1.0;
this->bulkOmegaToOmega = false;
this->OxxPyyPzz = 1.0;
-}
-//////////////////////////////////////////////////////////////////////////
-CumulantLBMKernel::~CumulantLBMKernel(void)
-{
-
}
//////////////////////////////////////////////////////////////////////////
void CumulantLBMKernel::initDataSet()
@@ -1069,10 +1064,6 @@ void CumulantLBMKernel::initData()
muForcingX1.DefineVar("nu", &muNu);
muForcingX2.DefineVar("nu", &muNu);
muForcingX3.DefineVar("nu", &muNu);
-
- LBMReal forcingX1 = 0;
- LBMReal forcingX2 = 0;
- LBMReal forcingX3 = 0;
}
localDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getLocalDistributions();
nonLocalDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
@@ -1431,7 +1422,7 @@ void CumulantLBMKernel::nodeCollision(int step, int x1, int x2, int x3)
//////////////////////////////
LBMReal OxyyPxzz = one;//three * (two - omega) / (three - omega);//
//LBMReal OxyyMxzz = one;//six * (two - omega) / (six - omega);//
- LBMReal Oxyz = one;//twelve * (two - omega) / (twelve + omega);//
+ //LBMReal Oxyz = one;//twelve * (two - omega) / (twelve + omega);//
//////////////////////////////
//LBMReal OxyyPxzz = two-omega;//
//LBMReal OxyyMxzz = two-omega;//
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.h
index b75b13031..995ce63d8 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.h
@@ -18,10 +18,10 @@ public:
enum Parameter { NORMAL, MAGIC };
public:
CumulantLBMKernel();
- virtual ~CumulantLBMKernel(void);
+ virtual ~CumulantLBMKernel() = default;
//virtual void calculate(int step);
- SPtr<LBMKernel> clone();
- double getCalculationTime();
+ SPtr<LBMKernel> clone() override;
+ double getCalculationTime() override;
void setBulkOmegaToOmega(bool value);
void setRelaxationParameter(Parameter p);
protected:
diff --git a/src/cpu/VirtualFluidsCore/LBM/D3Q27System.cpp b/src/cpu/VirtualFluidsCore/LBM/D3Q27System.cpp
index 6c2f84f06..874a24fbb 100644
--- a/src/cpu/VirtualFluidsCore/LBM/D3Q27System.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/D3Q27System.cpp
@@ -1,4 +1,5 @@
#include "D3Q27System.h"
+
namespace D3Q27System
{
using namespace UbMath;
@@ -28,85 +29,85 @@ const int INVDIR[] = { INV_E, INV_W, INV_N, INV_S, INV_T, INV_B, INV
INV_NW, INV_TE, INV_BW, INV_BE, INV_TW, INV_TN, INV_BS, INV_BN, INV_TS,
INV_TNE, INV_TNW, INV_TSE, INV_TSW, INV_BNE, INV_BNW, INV_BSE, INV_BSW };
-// The x,y,z component for each normalized direction
-const double cNorm[3][ENDDIR] = { { double(DX1[0]),
- double(DX1[1]),
- double(DX1[2]),
- double(DX1[3]),
- double(DX1[4]),
- double(DX1[5]),
- double(DX1[6]) / std::sqrt(double(2)),
- double(DX1[7]) / std::sqrt(double(2)),
- double(DX1[8]) / std::sqrt(double(2)),
- double(DX1[9]) / std::sqrt(double(2)),
- double(DX1[10]) / std::sqrt(double(2)),
- double(DX1[11]) / std::sqrt(double(2)),
- double(DX1[12]) / std::sqrt(double(2)),
- double(DX1[13]) / std::sqrt(double(2)),
- double(DX1[14]),
- double(DX1[15]),
- double(DX1[16]),
- double(DX1[17]),
- double(DX1[18]) / std::sqrt(double(3)),
- double(DX1[19]) / std::sqrt(double(3)),
- double(DX1[20]) / std::sqrt(double(3)),
- double(DX1[21]) / std::sqrt(double(3)),
- double(DX1[22]) / std::sqrt(double(3)),
- double(DX1[23]) / std::sqrt(double(3)),
- double(DX1[24]) / std::sqrt(double(3)),
- double(DX1[25]) / std::sqrt(double(3)) },
- { double(DX2[0]),
- double(DX2[1]),
- double(DX2[2]),
- double(DX2[3]),
- double(DX2[4]),
- double(DX2[5]),
- double(DX2[6]) / std::sqrt(double(2)),
- double(DX2[7]) / std::sqrt(double(2)),
- double(DX2[8]) / std::sqrt(double(2)),
- double(DX2[9]) / std::sqrt(double(2)),
- double(DX2[10]),
- double(DX2[11]),
- double(DX2[12]),
- double(DX2[13]),
- double(DX2[14]) / std::sqrt(double(2)),
- double(DX2[15]) / std::sqrt(double(2)),
- double(DX2[16]) / std::sqrt(double(2)),
- double(DX2[17]) / std::sqrt(double(2)),
- double(DX2[18]) / std::sqrt(double(3)),
- double(DX2[19]) / std::sqrt(double(3)),
- double(DX2[20]) / std::sqrt(double(3)),
- double(DX2[21]) / std::sqrt(double(3)),
- double(DX2[22]) / std::sqrt(double(3)),
- double(DX2[23]) / std::sqrt(double(3)),
- double(DX2[24]) / std::sqrt(double(3)),
- double(DX2[25]) / std::sqrt(double(3)) },
- { double(DX3[0]),
- double(DX3[1]),
- double(DX3[2]),
- double(DX3[3]),
- double(DX3[4]),
- double(DX3[5]),
- double(DX3[6]),
- double(DX3[7]),
- double(DX3[8]),
- double(DX3[9]),
- double(DX3[10]) / std::sqrt(double(2)),
- double(DX3[11]) / std::sqrt(double(2)),
- double(DX3[12]) / std::sqrt(double(2)),
- double(DX3[13]) / std::sqrt(double(2)),
- double(DX3[14]) / std::sqrt(double(2)),
- double(DX3[15]) / std::sqrt(double(2)),
- double(DX3[16]) / std::sqrt(double(2)),
- double(DX3[17]) / std::sqrt(double(2)),
- double(DX3[18]) / std::sqrt(double(3)),
- double(DX3[19]) / std::sqrt(double(3)),
- double(DX3[20]) / std::sqrt(double(3)),
- double(DX3[21]) / std::sqrt(double(3)),
- double(DX3[22]) / std::sqrt(double(3)),
- double(DX3[23]) / std::sqrt(double(3)),
- double(DX3[24]) / std::sqrt(double(3)),
- double(DX3[25]) / std::sqrt(double(3)) } };
+//// The x,y,z component for each normalized direction
+//const double cNorm[3][ENDDIR] = { { double(DX1[0]),
+// double(DX1[1]),
+// double(DX1[2]),
+// double(DX1[3]),
+// double(DX1[4]),
+// double(DX1[5]),
+// double(DX1[6]) / std::sqrt(double(2)),
+// double(DX1[7]) / std::sqrt(double(2)),
+// double(DX1[8]) / std::sqrt(double(2)),
+// double(DX1[9]) / std::sqrt(double(2)),
+// double(DX1[10]) / std::sqrt(double(2)),
+// double(DX1[11]) / std::sqrt(double(2)),
+// double(DX1[12]) / std::sqrt(double(2)),
+// double(DX1[13]) / std::sqrt(double(2)),
+// double(DX1[14]),
+// double(DX1[15]),
+// double(DX1[16]),
+// double(DX1[17]),
+// double(DX1[18]) / std::sqrt(double(3)),
+// double(DX1[19]) / std::sqrt(double(3)),
+// double(DX1[20]) / std::sqrt(double(3)),
+// double(DX1[21]) / std::sqrt(double(3)),
+// double(DX1[22]) / std::sqrt(double(3)),
+// double(DX1[23]) / std::sqrt(double(3)),
+// double(DX1[24]) / std::sqrt(double(3)),
+// double(DX1[25]) / std::sqrt(double(3)) },
+// { double(DX2[0]),
+// double(DX2[1]),
+// double(DX2[2]),
+// double(DX2[3]),
+// double(DX2[4]),
+// double(DX2[5]),
+// double(DX2[6]) / std::sqrt(double(2)),
+// double(DX2[7]) / std::sqrt(double(2)),
+// double(DX2[8]) / std::sqrt(double(2)),
+// double(DX2[9]) / std::sqrt(double(2)),
+// double(DX2[10]),
+// double(DX2[11]),
+// double(DX2[12]),
+// double(DX2[13]),
+// double(DX2[14]) / std::sqrt(double(2)),
+// double(DX2[15]) / std::sqrt(double(2)),
+// double(DX2[16]) / std::sqrt(double(2)),
+// double(DX2[17]) / std::sqrt(double(2)),
+// double(DX2[18]) / std::sqrt(double(3)),
+// double(DX2[19]) / std::sqrt(double(3)),
+// double(DX2[20]) / std::sqrt(double(3)),
+// double(DX2[21]) / std::sqrt(double(3)),
+// double(DX2[22]) / std::sqrt(double(3)),
+// double(DX2[23]) / std::sqrt(double(3)),
+// double(DX2[24]) / std::sqrt(double(3)),
+// double(DX2[25]) / std::sqrt(double(3)) },
+// { double(DX3[0]),
+// double(DX3[1]),
+// double(DX3[2]),
+// double(DX3[3]),
+// double(DX3[4]),
+// double(DX3[5]),
+// double(DX3[6]),
+// double(DX3[7]),
+// double(DX3[8]),
+// double(DX3[9]),
+// double(DX3[10]) / std::sqrt(double(2)),
+// double(DX3[11]) / std::sqrt(double(2)),
+// double(DX3[12]) / std::sqrt(double(2)),
+// double(DX3[13]) / std::sqrt(double(2)),
+// double(DX3[14]) / std::sqrt(double(2)),
+// double(DX3[15]) / std::sqrt(double(2)),
+// double(DX3[16]) / std::sqrt(double(2)),
+// double(DX3[17]) / std::sqrt(double(2)),
+// double(DX3[18]) / std::sqrt(double(3)),
+// double(DX3[19]) / std::sqrt(double(3)),
+// double(DX3[20]) / std::sqrt(double(3)),
+// double(DX3[21]) / std::sqrt(double(3)),
+// double(DX3[22]) / std::sqrt(double(3)),
+// double(DX3[23]) / std::sqrt(double(3)),
+// double(DX3[24]) / std::sqrt(double(3)),
+// double(DX3[25]) / std::sqrt(double(3)) } };
} // namespace D3Q27System
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.cpp
index 3a0525473..de780bc05 100644
--- a/src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.cpp
@@ -85,10 +85,6 @@ void RheologyK17LBMKernel::calculate(int step)
muForcingX1.DefineVar("nu", &muNu);
muForcingX2.DefineVar("nu", &muNu);
muForcingX3.DefineVar("nu", &muNu);
-
- LBMReal forcingX1 = 0;
- LBMReal forcingX2 = 0;
- LBMReal forcingX3 = 0;
}
/////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.h
index f2c211dff..f9838ba2e 100644
--- a/src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.h
@@ -19,8 +19,8 @@ public:
public:
RheologyK17LBMKernel();
virtual ~RheologyK17LBMKernel(void);
- virtual void calculate(int step);
- virtual SPtr<LBMKernel> clone();
+ virtual void calculate(int step) override;
+ virtual SPtr<LBMKernel> clone() override;
double getCalculationTime() override;
//! The value should not be equal to a shear viscosity
void setBulkViscosity(LBMReal value);
diff --git a/src/cpu/VirtualFluidsCore/LBM/Thixotropy.h b/src/cpu/VirtualFluidsCore/LBM/Thixotropy.h
index a5ad23dab..d54e2ac5b 100644
--- a/src/cpu/VirtualFluidsCore/LBM/Thixotropy.h
+++ b/src/cpu/VirtualFluidsCore/LBM/Thixotropy.h
@@ -61,7 +61,7 @@ inline LBMReal Thixotropy::getBinghamCollFactor(LBMReal omegaInf, LBMReal shearR
//LBMReal omega = cs2 * cs2 * shearRate * shearRate * omegaInf * rho * rho / (cs2 * cs2 * shearRate * shearRate * rho * rho + cs2 * shearRate * omegaInf * rho * tau0+omegaInf*omegaInf*tau0*tau0);
- LBMReal a = omegaInf * tau0 / (cs2 * shearRate * rho);
+ // LBMReal a = omegaInf * tau0 / (cs2 * shearRate * rho);
//10 iterations
//LBMReal omega = omegaInf / (1 + a * (1 + a * (1 + a * (1 + a * (1 + a * (1 + a * (1 + a * (1 + a * (1 + a * (1 + a))))))))));
diff --git a/src/cpu/VirtualFluidsCore/LBM/ThixotropyExpLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/ThixotropyExpLBMKernel.cpp
index 095f9678a..a13e4fc71 100644
--- a/src/cpu/VirtualFluidsCore/LBM/ThixotropyExpLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/ThixotropyExpLBMKernel.cpp
@@ -86,10 +86,6 @@ void ThixotropyExpLBMKernel::calculate(int step)
muForcingX1.DefineVar("nu", &muNu);
muForcingX2.DefineVar("nu", &muNu);
muForcingX3.DefineVar("nu", &muNu);
-
- LBMReal forcingX1 = 0;
- LBMReal forcingX2 = 0;
- LBMReal forcingX3 = 0;
}
/////////////////////////////////////
@@ -235,8 +231,8 @@ void ThixotropyExpLBMKernel::calculate(int step)
(mfbbc - mfbba));
- LBMReal eta0 = (1/collFactor-c1o2)*c1o3;
- LBMReal eta = (1 + lambda)* eta0;
+// LBMReal eta0 = (1/collFactor-c1o2)*c1o3;
+// LBMReal eta = (1 + lambda)* eta0;
//collFactorF = one/(3*eta/(rho+one)+c1o2);
collFactorF = collFactor;
@@ -1763,9 +1759,9 @@ void ThixotropyExpLBMKernel::calculate(int step)
//proof correctness
//////////////////////////////////////////////////////////////////////////
//#ifdef PROOF_CORRECTNESS
- LBMReal drho_post = (mfaaa + mfaac + mfaca + mfcaa + mfacc + mfcac + mfccc + mfcca)
- + (mfaab + mfacb + mfcab + mfccb) + (mfaba + mfabc + mfcba + mfcbc) + (mfbaa + mfbac + mfbca + mfbcc)
- + (mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc) + mfbbb;
+// LBMReal drho_post = (mfaaa + mfaac + mfaca + mfcaa + mfacc + mfcac + mfccc + mfcca)
+// + (mfaab + mfacb + mfcab + mfccb) + (mfaba + mfabc + mfcba + mfcbc) + (mfbaa + mfbac + mfbca + mfbcc)
+// + (mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc) + mfbbb;
//UBLOG(logINFO, "lambda ="<<drho_post);
// //LBMReal dif = fabs(rho - rho_post);
// dif = drho - drho_post;
diff --git a/src/cpu/VirtualFluidsCore/LBM/ThixotropyInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/ThixotropyInterpolationProcessor.cpp
index 0f1edd355..a673f473e 100644
--- a/src/cpu/VirtualFluidsCore/LBM/ThixotropyInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/ThixotropyInterpolationProcessor.cpp
@@ -82,29 +82,29 @@ void ThixotropyInterpolationProcessor::setOffsets(LBMReal xoff, LBMReal yoff, LB
//////////////////////////////////////////////////////////////////////////
void ThixotropyInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, LBMReal xoff, LBMReal yoff, LBMReal zoff)
{
- setOffsets(xoff, yoff, zoff);
- calcInterpolatedCoefficiets(icellC, omegaC, 0.5, 0.25, -0.25, -0.25, -1, -1, -1);
- calcInterpolatedNode(icellF.BSW, /*omegaF,*/ -0.25, -0.25, -0.25, calcPressBSW(), -1, -1, -1);
- calcInterpolatedCoefficiets(icellC, omegaC, 0.5, 0.25, 0.25, -0.25, 1, 1, -1);
- calcInterpolatedNode(icellF.BNE, /*omegaF,*/ 0.25, 0.25, -0.25, calcPressBNE(), 1, 1, -1);
- calcInterpolatedCoefficiets(icellC, omegaC, 0.5, -0.25, 0.25, 0.25, -1, 1, 1);
- calcInterpolatedNode(icellF.TNW, /*omegaF,*/ -0.25, 0.25, 0.25, calcPressTNW(), -1, 1, 1);
- calcInterpolatedCoefficiets(icellC, omegaC, 0.5, 0.25, -0.25, 0.25, 1, -1, 1);
- calcInterpolatedNode(icellF.TSE, /*omegaF,*/ 0.25, -0.25, 0.25, calcPressTSE(), 1, -1, 1);
- calcInterpolatedCoefficiets(icellC, omegaC, 0.5, -0.25, 0.25, -0.25, -1, 1, -1);
- calcInterpolatedNode(icellF.BNW, /*omegaF,*/ -0.25, 0.25, -0.25, calcPressBNW(), -1, 1, -1);
- calcInterpolatedCoefficiets(icellC, omegaC, 0.5, 0.25, -0.25, -0.25, 1, -1, -1);
- calcInterpolatedNode(icellF.BSE, /*omegaF,*/ 0.25, -0.25, -0.25, calcPressBSE(), 1, -1, -1);
- calcInterpolatedCoefficiets(icellC, omegaC, 0.5, -0.25, -0.25, 0.25, -1, -1, 1);
- calcInterpolatedNode(icellF.TSW, /*omegaF,*/ -0.25, -0.25, 0.25, calcPressTSW(), -1, -1, 1);
- calcInterpolatedCoefficiets(icellC, omegaC, 0.5, 0.25, 0.25, 0.25, 1, 1, 1);
- calcInterpolatedNode(icellF.TNE, /*omegaF,*/ 0.25, 0.25, 0.25, calcPressTNE(), 1, 1, 1);
+ setOffsets(xoff, yoff, zoff);
+ calcInterpolatedCoefficiets_intern(icellC, omegaC, 0.5, 0.25, -0.25, -0.25, -1, -1, -1);
+ calcInterpolatedNode(icellF.BSW, /*omegaF,*/ -0.25, -0.25, -0.25, calcPressBSW(), -1, -1, -1);
+ calcInterpolatedCoefficiets_intern(icellC, omegaC, 0.5, 0.25, 0.25, -0.25, 1, 1, -1);
+ calcInterpolatedNode(icellF.BNE, /*omegaF,*/ 0.25, 0.25, -0.25, calcPressBNE(), 1, 1, -1);
+ calcInterpolatedCoefficiets_intern(icellC, omegaC, 0.5, -0.25, 0.25, 0.25, -1, 1, 1);
+ calcInterpolatedNode(icellF.TNW, /*omegaF,*/ -0.25, 0.25, 0.25, calcPressTNW(), -1, 1, 1);
+ calcInterpolatedCoefficiets_intern(icellC, omegaC, 0.5, 0.25, -0.25, 0.25, 1, -1, 1);
+ calcInterpolatedNode(icellF.TSE, /*omegaF,*/ 0.25, -0.25, 0.25, calcPressTSE(), 1, -1, 1);
+ calcInterpolatedCoefficiets_intern(icellC, omegaC, 0.5, -0.25, 0.25, -0.25, -1, 1, -1);
+ calcInterpolatedNode(icellF.BNW, /*omegaF,*/ -0.25, 0.25, -0.25, calcPressBNW(), -1, 1, -1);
+ calcInterpolatedCoefficiets_intern(icellC, omegaC, 0.5, 0.25, -0.25, -0.25, 1, -1, -1);
+ calcInterpolatedNode(icellF.BSE, /*omegaF,*/ 0.25, -0.25, -0.25, calcPressBSE(), 1, -1, -1);
+ calcInterpolatedCoefficiets_intern(icellC, omegaC, 0.5, -0.25, -0.25, 0.25, -1, -1, 1);
+ calcInterpolatedNode(icellF.TSW, /*omegaF,*/ -0.25, -0.25, 0.25, calcPressTSW(), -1, -1, 1);
+ calcInterpolatedCoefficiets_intern(icellC, omegaC, 0.5, 0.25, 0.25, 0.25, 1, 1, 1);
+ calcInterpolatedNode(icellF.TNE, /*omegaF,*/ 0.25, 0.25, 0.25, calcPressTNE(), 1, 1, 1);
}
//////////////////////////////////////////////////////////////////////////
void ThixotropyInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, LBMReal* icellC, LBMReal xoff, LBMReal yoff, LBMReal zoff)
{
setOffsets(xoff, yoff, zoff);
- calcInterpolatedCoefficiets(icellF, omegaF, 2.0, 0, 0, 0, 0, 0, 0);
+ calcInterpolatedCoefficiets_intern(icellF, omegaF, 2.0, 0, 0, 0, 0, 0, 0);
calcInterpolatedNodeFC(icellC, omegaC);
}
//////////////////////////////////////////////////////////////////////////
@@ -128,7 +128,15 @@ void ThixotropyInterpolationProcessor::calcMoments(const LBMReal* const f, LBMRe
kxxMzz = -3./2.*omega*((((f[NW]+f[SE])-(f[BS]+f[TN]))+((f[SW]+f[NE])-(f[TS]+f[BN])))+((f[W]+f[E])-(f[B]+f[T]))-(vx1*vx1-vx3*vx3));
}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyInterpolationProcessor::calcInterpolatedCoefficiets(const D3Q27ICell& icell, LBMReal omega, LBMReal eps_new, LBMReal x, LBMReal y, LBMReal z, LBMReal xs, LBMReal ys, LBMReal zs)
+void ThixotropyInterpolationProcessor::calcInterpolatedCoefficiets_intern(const D3Q27ICell& icell,
+ LBMReal omega,
+ LBMReal eps_new,
+ LBMReal x,
+ LBMReal y,
+ LBMReal z,
+ LBMReal xs,
+ LBMReal ys,
+ LBMReal zs)
{
LBMReal vx1_SWT,vx2_SWT,vx3_SWT;
LBMReal vx1_NWT,vx2_NWT,vx3_NWT;
diff --git a/src/cpu/VirtualFluidsCore/LBM/ThixotropyInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/ThixotropyInterpolationProcessor.h
index 9f55b8f5f..daaa6449e 100644
--- a/src/cpu/VirtualFluidsCore/LBM/ThixotropyInterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/ThixotropyInterpolationProcessor.h
@@ -70,8 +70,6 @@ private:
LBMReal kxyAverage, kyzAverage, kxzAverage, kxxMyyAverage, kxxMzzAverage;
- LBMReal a,b,c;
-
LBMReal rho;
LBMReal shearRate;
@@ -80,7 +78,7 @@ private:
void setOffsets(LBMReal xoff, LBMReal yoff, LBMReal zoff);
void calcMoments(const LBMReal* const f, LBMReal omegaInf, LBMReal& rho, LBMReal& vx1, LBMReal& vx2, LBMReal& vx3,
LBMReal& kxy, LBMReal& kyz, LBMReal& kxz, LBMReal& kxxMyy, LBMReal& kxxMzz);
- void calcInterpolatedCoefficiets(const D3Q27ICell& icell, LBMReal omega, LBMReal eps_new, LBMReal x, LBMReal y, LBMReal z, LBMReal xs, LBMReal ys, LBMReal zs);
+ void calcInterpolatedCoefficiets_intern(const D3Q27ICell& icell, LBMReal omega, LBMReal eps_new, LBMReal x, LBMReal y, LBMReal z, LBMReal xs, LBMReal ys, LBMReal zs);
void calcInterpolatedNode(LBMReal* f, /*LBMReal omega,*/ LBMReal x, LBMReal y, LBMReal z, LBMReal press, LBMReal xs, LBMReal ys, LBMReal zs);
LBMReal calcPressBSW();
LBMReal calcPressTSW();
diff --git a/src/cpu/VirtualFluidsCore/LBM/ThixotropyLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/ThixotropyLBMKernel.cpp
index eb313cdd7..b369b45a6 100644
--- a/src/cpu/VirtualFluidsCore/LBM/ThixotropyLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/ThixotropyLBMKernel.cpp
@@ -86,10 +86,6 @@ void ThixotropyLBMKernel::calculate(int step)
muForcingX1.DefineVar("nu", &muNu);
muForcingX2.DefineVar("nu", &muNu);
muForcingX3.DefineVar("nu", &muNu);
-
- LBMReal forcingX1 = 0;
- LBMReal forcingX2 = 0;
- LBMReal forcingX3 = 0;
}
/////////////////////////////////////
@@ -1757,9 +1753,9 @@ void ThixotropyLBMKernel::calculate(int step)
//proof correctness
//////////////////////////////////////////////////////////////////////////
//#ifdef PROOF_CORRECTNESS
- LBMReal drho_post = (mfaaa + mfaac + mfaca + mfcaa + mfacc + mfcac + mfccc + mfcca)
- + (mfaab + mfacb + mfcab + mfccb) + (mfaba + mfabc + mfcba + mfcbc) + (mfbaa + mfbac + mfbca + mfbcc)
- + (mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc) + mfbbb;
+// LBMReal drho_post = (mfaaa + mfaac + mfaca + mfcaa + mfacc + mfcac + mfccc + mfcca)
+// + (mfaab + mfacb + mfcab + mfccb) + (mfaba + mfabc + mfcba + mfcbc) + (mfbaa + mfbac + mfbca + mfbcc)
+// + (mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc) + mfbbb;
//UBLOG(logINFO, "lambda ="<<drho_post);
// //LBMReal dif = fabs(rho - rho_post);
// dif = drho - drho_post;
diff --git a/src/cpu/VirtualFluidsCore/LBM/ThixotropyModelLBMKernel2.cpp b/src/cpu/VirtualFluidsCore/LBM/ThixotropyModelLBMKernel2.cpp
index 5bb4770fd..af71e9127 100644
--- a/src/cpu/VirtualFluidsCore/LBM/ThixotropyModelLBMKernel2.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/ThixotropyModelLBMKernel2.cpp
@@ -131,9 +131,9 @@ void ThixotropyModelLBMKernel2::calculate(int step)
LBMReal m0, m1, m2;
- LBMReal rho = (mfaaa + mfaac + mfaca + mfcaa + mfacc + mfcac + mfccc + mfcca)
- + (mfaab + mfacb + mfcab + mfccb) + (mfaba + mfabc + mfcba + mfcbc) + (mfbaa + mfbac + mfbca + mfbcc)
- + (mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc) + mfbbb;
+// LBMReal rho = (mfaaa + mfaac + mfaca + mfcaa + mfacc + mfcac + mfccc + mfcca)
+// + (mfaab + mfacb + mfcab + mfccb) + (mfaba + mfabc + mfcba + mfcbc) + (mfbaa + mfbac + mfbca + mfbcc)
+// + (mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc) + mfbbb;
LBMReal vvx = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) +
(((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) +
@@ -479,12 +479,12 @@ void ThixotropyModelLBMKernel2::calculate(int step)
LBMReal dyuy = dxux + collFactorF * c3o2 * mxxMyy;
LBMReal dzuz = dxux + collFactorF * c3o2 * mxxMzz;
- LBMReal Dxy = -three * collFactorF * mfbba;
- LBMReal Dxz = -three * collFactorF * mfbab;
- LBMReal Dyz = -three * collFactorF * mfabb;
+// LBMReal Dxy = -three * collFactorF * mfbba;
+// LBMReal Dxz = -three * collFactorF * mfbab;
+// LBMReal Dyz = -three * collFactorF * mfabb;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//non Newtonian fluid collision factor
- LBMReal shearRate = sqrt(c2 * (dxux * dxux + dyuy * dyuy + dzuz * dzuz) + Dxy * Dxy + Dxz * Dxz + Dyz * Dyz) / (rho + one);
+// LBMReal shearRate = sqrt(c2 * (dxux * dxux + dyuy * dyuy + dzuz * dzuz) + Dxy * Dxy + Dxz * Dxz + Dyz * Dyz) / (rho + one);
LBMReal shearFactor = sqrt(c1o2 * ((mfcaa - mfaaa * c1o3) * (mfcaa - mfaaa * c1o3) + (mfaca - mfaaa * c1o3) * (mfaca - mfaaa * c1o3) + (mfaac - mfaaa * c1o3) * (mfaac - mfaaa * c1o3)) + mfbba * mfbba + mfbab * mfbab + mfabb * mfabb) + UbMath::Epsilon<LBMReal>::val();
diff --git a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp
index c17d8f659..870435528 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp
@@ -163,10 +163,6 @@ void InitDistributionsBlockVisitor::visit(const SPtr<Grid3D> grid, SPtr<Block3D>
LBMReal f[D3Q27System::ENDF+1];
- size_t nx1 = distributions->getNX1();
- size_t nx2 = distributions->getNX2();
- size_t nx3 = distributions->getNX3();
-
for(int ix3=0; ix3<bcArray->getNX3(); ix3++)
for(int ix2=0; ix2<bcArray->getNX2(); ix2++)
for(int ix1=0; ix1<bcArray->getNX1(); ix1++)
diff --git a/src/cpu/VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.cpp
index e63ad0e74..17668ba25 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.cpp
@@ -221,7 +221,7 @@ void InitThixotropyBlockVisitor::visit(const SPtr<Grid3D> grid, SPtr<Block3D> bl
if(!block) UB_THROW( UbException(UB_EXARGS,"block is not exist") );
- double dx = grid->getDeltaX(block);
+// double dx = grid->getDeltaX(block);
//define vars for functions
mu::value_type x1,x2,x3;
@@ -235,8 +235,6 @@ void InitThixotropyBlockVisitor::visit(const SPtr<Grid3D> grid, SPtr<Block3D> bl
//Funktionszeiger
typedef void (*CalcFeqsFct)(LBMReal* const& /*feq[27]*/,const LBMReal& /*(d)rho*/,const LBMReal& /*vx1*/,const LBMReal& /*vx2*/,const LBMReal& /*vx3*/);
CalcFeqsFct calcFeqsFct = NULL;
-
- LBMReal vx1,vx2,vx3,rho;
int gridRank = grid->getRank();
int blockRank = block->getRank();
@@ -255,14 +253,8 @@ void InitThixotropyBlockVisitor::visit(const SPtr<Grid3D> grid, SPtr<Block3D> bl
SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getHdistributions();
- LBMReal o = kernel->getCollisionFactor();
-
LBMReal h[D3Q27System::ENDF+1];
- size_t nx1 = distributions->getNX1();
- size_t nx2 = distributions->getNX2();
- size_t nx3 = distributions->getNX3();
-
for(int ix3=0; ix3<bcArray->getNX3(); ix3++)
for(int ix2=0; ix2<bcArray->getNX2(); ix2++)
for(int ix1=0; ix1<bcArray->getNX1(); ix1++)
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
index 9ea340b16..c5a2bdebc 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
@@ -143,11 +143,6 @@ void SetConnectorsBlockVisitor::setRemoteConnectors(SPtr<Block3D> sblock, SPtr<B
void SetConnectorsBlockVisitor::setInterpolationConnectors(SPtr<Grid3D> grid, SPtr<Block3D> block)
{
UBLOG(logDEBUG5, "D3Q27SetConnectorsBlockVisitor::setInterpolationConnectors() - start");
- int blockRank = block->getRank();
- if (block->getGlobalID()==394)
- {
- int test=0;
- }
//search for all blocks with different ranks
if (block->hasInterpolationFlagCF() && block->isActive())
@@ -490,8 +485,6 @@ void SetConnectorsBlockVisitor::createTransmitters(SPtr<Block3D> cBlock, SPtr<Bl
{
UBLOG(logDEBUG5, "D3Q27SetConnectorsBlockVisitor::createTransmitters(...) - start");
CreateTransmittersHelper helper;
- bool MPIpool = true;
- bool orthogonal = false;
int fBlockRank = fBlock->getRank();
int cBlockRank = cBlock->getRank();
if(fBlockRank == cBlockRank && fBlockRank == gridRank)
--
GitLab