From 1d1aaf8bb66c26e9047abfd7e53fd23f92623eeb Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Tue, 23 Feb 2021 08:03:24 +0000
Subject: [PATCH] Fix clang compiler warnings for VF cpu.
---
.../BoundaryConditions/MultiphaseNoSlipBCAlgorithm.h | 2 +-
.../CoProcessors/IntegrateValuesHelper.cpp | 6 +++---
.../Visitors/MultiphaseInitDistributionsBlockVisitor.cpp | 5 ++++-
.../Visitors/MultiphaseInitDistributionsBlockVisitor.h | 4 ++--
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNoSlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNoSlipBCAlgorithm.h
index a1b9642f0..dc6e5bc6a 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNoSlipBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNoSlipBCAlgorithm.h
@@ -45,6 +45,6 @@ public:
SPtr<BCAlgorithm> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void addDistributionsH(SPtr<DistributionArray3D> distributionsH) override;
- void applyBC();
+ void applyBC() override;
};
#endif // MultiphaseNoSlipBCAlgorithm_h__
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
index 76895f1be..81f7dfc41 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
@@ -131,9 +131,9 @@ void IntegrateValuesHelper::calculateAV()
double Avzz = (*averagedValues)(val<1>(node), val<2>(node), val<3>(node), AvVzz);
double Avxz = (*averagedValues)(val<1>(node), val<2>(node), val<3>(node), AvVxz);
- sAvVx1 += abs(Avx);
- sAvVx2 += abs(Avy);
- sAvVx3 += abs(Avz);
+ sAvVx1 += std::abs(Avx);
+ sAvVx2 += std::abs(Avy);
+ sAvVx3 += std::abs(Avz);
sTSx1 += sqrt(Avxx);
sTSx2 += sqrt(Avyy);
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.cpp
index 508442c86..2d1babf81 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.cpp
@@ -51,8 +51,11 @@ MultiphaseInitDistributionsBlockVisitor::MultiphaseInitDistributionsBlockVisitor
}
//////////////////////////////////////////////////////////////////////////
MultiphaseInitDistributionsBlockVisitor::MultiphaseInitDistributionsBlockVisitor( LBMReal densityRatio, LBMReal intThickness, LBMReal radius, LBMReal vx1, LBMReal vx2, LBMReal vx3)
- : Block3DVisitor(0, Grid3DSystem::MAXLEVEL), densityRatio(densityRatio), intThickness(intThickness), radius(radius)
+ : Block3DVisitor(0, Grid3DSystem::MAXLEVEL), densityRatio(densityRatio) /*, intThickness(intThickness), radius(radius) */
{
+ (void) intThickness;
+ (void) radius;
+
this->setVx1(vx1);
this->setVx2(vx2);
this->setVx3(vx3);
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.h
index e6ebadfe8..f94167040 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.h
@@ -95,8 +95,8 @@ private:
LBMReal nu;
LBMReal densityRatio;
- LBMReal intThickness;
- LBMReal radius;
+ //LBMReal intThickness;
+ //LBMReal radius;
};
#endif //D3Q27INITDISTRIBUTIONSPATCHVISITOR_H
--
GitLab