Skip to content
Snippets Groups Projects
Commit fced0e30 authored by Kutscher's avatar Kutscher
Browse files

fixes attributes naming in BCStrategy

parent 1df7bbfb
No related branches found
No related tags found
2 merge requests!298[CPU] Clean CPU core,!297rename getDistributionInvForDirection to getPostCollisionDistributionForDirection
Showing
with 15 additions and 15 deletions
......@@ -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)
......
......@@ -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()));
}
......
......@@ -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()));
}
......@@ -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';
......
......@@ -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
{
......
......@@ -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,
......
......@@ -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:
......
......@@ -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);
}
......@@ -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,
......
......@@ -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()));
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment