From fced0e30b04c1c7f41f453daba00cb1eba2cfa20 Mon Sep 17 00:00:00 2001
From: Kutscher <kutscher@irmb.tu-bs.de>
Date: Mon, 16 Oct 2023 14:53:55 +0200
Subject: [PATCH] fixes attributes naming in BCStrategy
---
.../BoundaryConditions/MultiphaseVelocityBC.cpp | 2 +-
.../MultiphaseBoundaryConditionsBlockVisitor.cpp | 2 +-
.../RheologyBoundaryConditionsBlockVisitor.cpp | 2 +-
src/cpu/VirtualFluidsCore/BoundaryConditions/BC.h | 12 ++++++------
.../BoundaryConditions/BCStrategy.h | 2 +-
.../BoundaryConditions/DensityBC.cpp | 2 +-
.../VirtualFluidsCore/BoundaryConditions/NoSlipBC.h | 2 +-
.../VirtualFluidsCore/BoundaryConditions/SlipBC.cpp | 2 +-
.../BoundaryConditions/VelocityBC.cpp | 2 +-
.../Visitors/BoundaryConditionsBlockVisitor.cpp | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.cpp b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.cpp
index 80e2922ba..6a79904e6 100644
--- a/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.cpp
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.cpp
@@ -280,7 +280,7 @@ void MultiphaseVelocityBC::adaptBCForDirection( const D3Q27Interactor& interacto
void MultiphaseVelocityBC::adaptBC( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const real& worldX1, const real& worldX2, const real& worldX3, const real& time )
{
this->setNodeVelocity(interactor,bc,worldX1,worldX2,worldX3,time);
- bc->setBCStrategyType(algorithmType);
+ bc->setBCStrategyType(strategyType);
}
/*==========================================================*/
void MultiphaseVelocityBC::setNodeVelocity( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const real& worldX1, const real& worldX2, const real& worldX3, const real& timestep)
diff --git a/src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp b/src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp
index 81e9f1b6d..ba8e9c4f1 100644
--- a/src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp
+++ b/src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp
@@ -136,7 +136,7 @@ void MultiphaseBoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Blo
//////////////////////////////////////////////////////////////////////////
void MultiphaseBoundaryConditionsBlockVisitor::addBC(SPtr<BC> bc)
{
- bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getAlgorithm()));
+ bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getBCStrategy()));
}
diff --git a/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.cpp b/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.cpp
index 69c65b6ec..3bcd257e2 100644
--- a/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.cpp
+++ b/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.cpp
@@ -136,5 +136,5 @@ void BoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> bloc
//////////////////////////////////////////////////////////////////////////
void BoundaryConditionsBlockVisitor::addBC(SPtr<BC> bc)
{
- bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getAlgorithm()));
+ bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getBCStrategy()));
}
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BC.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BC.h
index 7dc4e4d41..5c699bf28 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BC.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BC.h
@@ -68,19 +68,19 @@ public:
void setBCStrategy(SPtr<BCStrategy> alg)
{
- algorithmType = alg->getType();
- algorithm = alg;
+ strategyType = alg->getType();
+ strategy = alg;
}
- SPtr<BCStrategy> getAlgorithm() { return algorithm; }
- char getBCStrategyType() { return algorithmType; }
+ SPtr<BCStrategy> getBCStrategy() { return strategy; }
+ char getBCStrategyType() { return strategyType; }
protected:
short secondaryBcOption{ 0 };
char type{ 0 };
- SPtr<BCStrategy> algorithm;
- char algorithmType{ -1 };
+ SPtr<BCStrategy> strategy;
+ char strategyType{ -1 };
static const char TIMEDEPENDENT = 1 << 0; //'1';
static const char TIMEPERIODIC = 1 << 1; //'2';
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.h
index ae41e6fc6..fafbf9046 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.h
@@ -43,7 +43,7 @@ class BCArray3D;
class BoundaryConditions;
class Block3D;
-//! \brief Abstract class of baundary conditions algorithm
+//! \brief Abstract class of baundary conditions strategy
//! \details BCStrategy provides interface for implementation of diferent boundary conditions
class BCStrategy
{
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.cpp
index ecfeff73b..5dacf756c 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.cpp
@@ -149,7 +149,7 @@ void DensityBC::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditio
const real &worldX2, const real &worldX3, const real &time)
{
this->setNodeDensity(interactor, bc, worldX1, worldX2, worldX3, time);
- bc->setBCStrategyType(algorithmType);
+ bc->setBCStrategyType(strategyType);
}
/*==========================================================*/
void DensityBC::setNodeDensity(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc,
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.h
index fe7eecebb..fdb8e5854 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.h
@@ -56,7 +56,7 @@ public:
void adaptBC(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc, const real & /*worldX1*/,
const real & /*worldX2*/, const real & /*worldX3*/, const real & /*time*/ = 0) override
{
- bc->setBCStrategyType(algorithmType);
+ bc->setBCStrategyType(strategyType);
}
private:
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp
index eb2541603..7f5e69835 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp
@@ -71,5 +71,5 @@ void SlipBC::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditions>
else if (bc->hasSlipBoundaryFlag(DIR_00M))
bc->setNormalVector(vf::basics::constant::c0o1, vf::basics::constant::c0o1, -vf::basics::constant::c1o1);
- bc->setBCStrategyType(algorithmType);
+ bc->setBCStrategyType(strategyType);
}
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.cpp
index 1ffc44700..4318cfabb 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.cpp
@@ -302,7 +302,7 @@ void VelocityBC::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditi
const real &worldX2, const real &worldX3, const real &time)
{
this->setNodeVelocity(interactor, bc, worldX1, worldX2, worldX3, time);
- bc->setBCStrategyType(algorithmType);
+ bc->setBCStrategyType(strategyType);
}
/*==========================================================*/
void VelocityBC::setNodeVelocity(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc,
diff --git a/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
index db18f090a..af0fb29ca 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
@@ -112,5 +112,5 @@ void BoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> bloc
//////////////////////////////////////////////////////////////////////////
void BoundaryConditionsBlockVisitor::addBC(SPtr<BC> bc)
{
- bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getAlgorithm()));
+ bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getBCStrategy()));
}
--
GitLab