diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNoSlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNoSlipBCAlgorithm.h index a1b9642f0908fbc107e95bd59153e13828c8d3e4..dc6e5bc6a558b18e2b70bfea8ab1ed4bf1853a82 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 76895f1be4c36a43f5955e82aa0d39dcb2e6ddf4..81f7dfc418f3ea13a706fef2820b355131e56a71 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 508442c867797c460490a41ef46e6f4d87599c2a..2d1babf8182b60a53032001d844ebfaef5f9faeb 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 e6ebadfe85cf7ecb56f49a30eec3ce0c0bd10b86..f94167040ad2f1f8b3cdb1f1e1d4f970d80c8877 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