From d8610465b4d8409e65a6915122afe5c8b27c8246 Mon Sep 17 00:00:00 2001
From: niikonst <niikonst@blogin2.usr.hlrn.de>
Date: Fri, 20 Oct 2023 14:26:58 +0200
Subject: [PATCH] refactoring of applications because of refactoring of
BCStrategy
---
apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp | 9 ++-------
apps/cpu/ConvectionOfVortex/cov.cpp | 1 -
apps/cpu/CouetteFlow/cflow.cpp | 1 -
apps/cpu/DamBreak/main.cpp | 2 --
apps/cpu/FlowAroundCylinder/cylinder.cpp | 3 ---
apps/cpu/HerschelBulkleySphere/hbsphere.cpp | 4 ----
apps/cpu/JetBreakup/JetBreakup.cpp | 11 +++--------
apps/cpu/LaminarTubeFlow/ltf.cpp | 5 +----
apps/cpu/Multiphase/Multiphase.cpp | 4 +---
apps/cpu/MultiphaseDropletTest/droplet.cpp | 2 --
apps/cpu/PoiseuilleFlow/pf1.cpp | 1 -
apps/cpu/RisingBubble2D/RisingBubble2D.cpp | 2 --
apps/cpu/ShotcreteJet/jet.cpp | 5 +----
apps/cpu/ViskomatXL/viskomat.cpp | 10 +++-------
apps/cpu/rheometer/rheometer.cpp | 4 ----
apps/cpu/sphere/sphere.cpp | 4 ----
16 files changed, 11 insertions(+), 57 deletions(-)
diff --git a/apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp b/apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp
index e73ff544b..1f84848cf 100644
--- a/apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp
+++ b/apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp
@@ -300,8 +300,8 @@ void run(string configname)
SPtr<BC> denBC(new DensityBC(rhoLB));
denBC->setBCStrategy(SPtr<BCStrategy>(new MultiphasePressureBCStrategy()));
- SPtr<BC> slipBC(new SlipBC());
- slipBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseSlipBCStrategy()));
+ // SPtr<BC> slipBC(new SlipBC());
+ // slipBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseSlipBCStrategy()));
mu::Parser fctPhi_F1;
fctPhi_F1.SetExpr("phiH");
@@ -322,11 +322,6 @@ void run(string configname)
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
- //bcVisitor.addBC(slipBC);
- bcVisitor.addBC(denBC);
- bcVisitor.addBC(velBCF1);
- bcVisitor.addBC(velBCF2);
// SPtr<D3Q27Interactor> inflowF1Int;
// SPtr<D3Q27Interactor> cylInt;
diff --git a/apps/cpu/ConvectionOfVortex/cov.cpp b/apps/cpu/ConvectionOfVortex/cov.cpp
index 102a1ad7d..fef2c10a0 100644
--- a/apps/cpu/ConvectionOfVortex/cov.cpp
+++ b/apps/cpu/ConvectionOfVortex/cov.cpp
@@ -116,7 +116,6 @@ void run()
outflowBC->setBCStrategy(SPtr<BCStrategy>(new NonReflectingOutflowBCStrategy()));
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(outflowBC);
SPtr<BCSet> bcProc;
bcProc = SPtr<BCSet>(new BCSet());
diff --git a/apps/cpu/CouetteFlow/cflow.cpp b/apps/cpu/CouetteFlow/cflow.cpp
index 6c7e28f5a..0eb2bf413 100644
--- a/apps/cpu/CouetteFlow/cflow.cpp
+++ b/apps/cpu/CouetteFlow/cflow.cpp
@@ -120,7 +120,6 @@ void bflow(string configname)
//BS visitor
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
SPtr<BCSet> bcProc;
bcProc = SPtr<BCSet>(new BCSet());
diff --git a/apps/cpu/DamBreak/main.cpp b/apps/cpu/DamBreak/main.cpp
index 54db263d1..c1b490784 100644
--- a/apps/cpu/DamBreak/main.cpp
+++ b/apps/cpu/DamBreak/main.cpp
@@ -194,8 +194,6 @@ void run(string configname)
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
- bcVisitor.addBC(outflowBC);
SPtr<Grid3D> grid(new Grid3D(comm));
grid->setDeltaX(dx);
diff --git a/apps/cpu/FlowAroundCylinder/cylinder.cpp b/apps/cpu/FlowAroundCylinder/cylinder.cpp
index 3e5be5e08..59a42d8e6 100644
--- a/apps/cpu/FlowAroundCylinder/cylinder.cpp
+++ b/apps/cpu/FlowAroundCylinder/cylinder.cpp
@@ -94,9 +94,6 @@ void run(string configname)
denBC->setBCStrategy(SPtr<BCStrategy>(new NonReflectingOutflowBCStrategy()));
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipAdapter);
- bcVisitor.addBC(velBC);
- bcVisitor.addBC(denBC);
//////////////////////////////////////////////////////////////////////////
//restart
diff --git a/apps/cpu/HerschelBulkleySphere/hbsphere.cpp b/apps/cpu/HerschelBulkleySphere/hbsphere.cpp
index 90ae44b62..9d8346b87 100644
--- a/apps/cpu/HerschelBulkleySphere/hbsphere.cpp
+++ b/apps/cpu/HerschelBulkleySphere/hbsphere.cpp
@@ -130,10 +130,6 @@ void bflow(string configname)
//BS visitor
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
- bcVisitor.addBC(slipBC);
- bcVisitor.addBC(velocityBC);
- bcVisitor.addBC(densityBC);
SPtr<BCSet> bcProc;
bcProc = SPtr<BCSet>(new BCSet());
diff --git a/apps/cpu/JetBreakup/JetBreakup.cpp b/apps/cpu/JetBreakup/JetBreakup.cpp
index de2f5b950..88cb53182 100644
--- a/apps/cpu/JetBreakup/JetBreakup.cpp
+++ b/apps/cpu/JetBreakup/JetBreakup.cpp
@@ -319,8 +319,8 @@ void run(string configname)
SPtr<BC> denBC(new DensityBC(rhoLB));
denBC->setBCStrategy(SPtr<BCStrategy>(new MultiphasePressureBCStrategy()));
- SPtr<BC> slipBC(new SlipBC());
- slipBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseSlipBCStrategy()));
+ // SPtr<BC> slipBC(new SlipBC());
+ // slipBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseSlipBCStrategy()));
mu::Parser fctPhi_F1;
fctPhi_F1.SetExpr("phiH");
@@ -335,17 +335,12 @@ void run(string configname)
fctvel_F2_init.DefineConst("U", 0);
velBCF1->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
- velBCF2->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
+ //velBCF2->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
- //bcVisitor.addBC(slipBC);
- bcVisitor.addBC(denBC);
- bcVisitor.addBC(velBCF1);
- //bcVisitor.addBC(velBCF2);
// SPtr<D3Q27Interactor> inflowF1Int;
// SPtr<D3Q27Interactor> cylInt;
diff --git a/apps/cpu/LaminarTubeFlow/ltf.cpp b/apps/cpu/LaminarTubeFlow/ltf.cpp
index 53927b737..ec103d763 100644
--- a/apps/cpu/LaminarTubeFlow/ltf.cpp
+++ b/apps/cpu/LaminarTubeFlow/ltf.cpp
@@ -93,9 +93,6 @@ void run(string configname)
//////////////////////////////////////////////////////////////////////////////////
//BS visitor
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
- bcVisitor.addBC(denBC);
- //bcVisitor.addBC(velBC1);
SPtr<Grid3D> grid(new Grid3D(comm));
@@ -268,7 +265,7 @@ void run(string configname)
intHelper.setBC();
- bcVisitor.addBC(velBC1);
+ //bcVisitor.addBC(velBC1);
grid->accept(bcVisitor);
//initialization of distributions
diff --git a/apps/cpu/Multiphase/Multiphase.cpp b/apps/cpu/Multiphase/Multiphase.cpp
index 07b5a661f..576c92883 100644
--- a/apps/cpu/Multiphase/Multiphase.cpp
+++ b/apps/cpu/Multiphase/Multiphase.cpp
@@ -183,9 +183,7 @@ void run(string configname)
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
- bcVisitor.addBC(denBC); //Ohne das BB?
- bcVisitor.addBC(velBCF1);
+
SPtr<D3Q27Interactor> inflowF1Int;
SPtr<D3Q27Interactor> cylInt;
diff --git a/apps/cpu/MultiphaseDropletTest/droplet.cpp b/apps/cpu/MultiphaseDropletTest/droplet.cpp
index 6a8b41189..cc3f1625d 100644
--- a/apps/cpu/MultiphaseDropletTest/droplet.cpp
+++ b/apps/cpu/MultiphaseDropletTest/droplet.cpp
@@ -194,8 +194,6 @@ void run(string configname)
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
- bcVisitor.addBC(outflowBC);
SPtr<Grid3D> grid(new Grid3D(comm));
grid->setDeltaX(dx);
diff --git a/apps/cpu/PoiseuilleFlow/pf1.cpp b/apps/cpu/PoiseuilleFlow/pf1.cpp
index dffd5fde6..34b249bd9 100644
--- a/apps/cpu/PoiseuilleFlow/pf1.cpp
+++ b/apps/cpu/PoiseuilleFlow/pf1.cpp
@@ -73,7 +73,6 @@ void pf1()
//boundary conditions visitor
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
//////////////////////////////////////////////////////////////////////////////////
//set boundary conditions for blocks and create process decomposition for MPI
diff --git a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
index 90c912152..148506af2 100644
--- a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
+++ b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
@@ -182,8 +182,6 @@ void run(string configname)
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
- //bcVisitor.addBC(slipBC);
SPtr<Grid3D> grid(new Grid3D(comm));
grid->setDeltaX(dx);
diff --git a/apps/cpu/ShotcreteJet/jet.cpp b/apps/cpu/ShotcreteJet/jet.cpp
index 87ea7ab47..dd9cd5475 100644
--- a/apps/cpu/ShotcreteJet/jet.cpp
+++ b/apps/cpu/ShotcreteJet/jet.cpp
@@ -516,10 +516,7 @@ int main(int argc, char *argv[])
// BC visitor
//BoundaryConditionsBlockVisitor bcVisitor;
MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
- bcVisitor.addBC(inflowConcreteBC);
- bcVisitor.addBC(inflowAirBC1);
- bcVisitor.addBC(outflowBC);
+
// SPtr<LBMKernel> kernel = make_shared<IBcumulantK17LBMKernel>();
//SPtr<LBMKernel> kernel = make_shared<CumulantK17LBMKernel>();
diff --git a/apps/cpu/ViskomatXL/viskomat.cpp b/apps/cpu/ViskomatXL/viskomat.cpp
index 7db98670e..95b1d524c 100644
--- a/apps/cpu/ViskomatXL/viskomat.cpp
+++ b/apps/cpu/ViskomatXL/viskomat.cpp
@@ -108,9 +108,9 @@ void bflow(string configname)
//thix->setOmegaMin(omegaMin);
SPtr<BC> noSlipBC(new NoSlipBC());
- noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
- //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyHerschelBulkleyModelNoSlipBCStrategy()));
- noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyBinghamModelNoSlipBCStrategy()));
+ // noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
+ // //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyHerschelBulkleyModelNoSlipBCStrategy()));
+ // noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyBinghamModelNoSlipBCStrategy()));
SPtr<BC> slipBC(new SlipBC());
slipBC->setBCStrategy(SPtr<BCStrategy>(new SimpleSlipBCStrategy()));
@@ -162,10 +162,6 @@ void bflow(string configname)
//BS visitor
BoundaryConditionsBlockVisitor bcVisitor;
- //bcVisitor.addBC(noSlipBC);
- bcVisitor.addBC(slipBC);
- bcVisitor.addBC(velocityBC);
- //bcVisitor.addBC(densityBC);
SPtr<BCSet> bcProc;
bcProc = SPtr<BCSet>(new BCSet());
diff --git a/apps/cpu/rheometer/rheometer.cpp b/apps/cpu/rheometer/rheometer.cpp
index 68db541bc..cf8e30ec1 100644
--- a/apps/cpu/rheometer/rheometer.cpp
+++ b/apps/cpu/rheometer/rheometer.cpp
@@ -194,10 +194,6 @@ void bflow(string configname)
//BS visitor
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
- //bcVisitor.addBC(slipBC);
- bcVisitor.addBC(velocityBC);
- //bcVisitor.addBC(densityBC);
SPtr<BCSet> bcProc;
bcProc = SPtr<BCSet>(new BCSet());
diff --git a/apps/cpu/sphere/sphere.cpp b/apps/cpu/sphere/sphere.cpp
index 5411449c7..89e388808 100644
--- a/apps/cpu/sphere/sphere.cpp
+++ b/apps/cpu/sphere/sphere.cpp
@@ -64,10 +64,6 @@ void run(string configname)
denBC->setBCStrategy(SPtr<BCStrategy>(new NonEqDensityBCStrategy()));
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBC);
- bcVisitor.addBC(slipBC);
- bcVisitor.addBC(velBC);
- bcVisitor.addBC(denBC);
real dx = 1;
--
GitLab