diff --git a/apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp b/apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp index e73ff544b59991bf95874e058e3df3b7113370a0..1f84848cfe434c3b658af44404938974d8506032 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 102a1ad7d16fa7cd343449fd27fab73aae70c92f..fef2c10a0017b0f943e478fc65118f3e8ad754e6 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 6c7e28f5abba629a7ad9c59204b70fb3d7e03574..0eb2bf413ae37e48596b059b2292eb758993c6be 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 54db263d163ece870074be82f3b4e865a336a44f..c1b490784b1c2e2c615f0e63647b149c9f503334 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 3e5be5e080a5702e9608bf037d492b8cbc809dfc..59a42d8e609f2a0a0b5c6e6ff0a4496223d97477 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 90ae44b62f18e412c4f3e0bd8ba88de56b01650a..9d8346b87195bd3fbf8c810e8d6671bdd88df853 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 de2f5b95035f8a2b786848941a897ad65cb9cf61..88cb53182f69a3f8843cbb2a599220acf63c2dbb 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 53927b7378db9bfca0693c1808610e0d6b532d66..ec103d763da8e99a2bf9c4b90d99534d5ba9ff4d 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 07b5a661f2c6ead2c57d09b2c05869f86058d1ad..576c9288334dc7ef8e0c79774480c65e30b32faf 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 6a8b41189ba46ed4edbf6fa4523a1ed1afcda5f2..cc3f1625d35f79b53eb0b525f6414a26277414e7 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 dffd5fde6c71dfd0ab647cee2c3e6ee1a81455d0..34b249bd98f3051c8de12ac55731874006f73a94 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 90c912152f7e3cfbc8cf27a8d7170ca74ae71919..148506af2ca936b3d01c60bca1f97455348538cd 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 87ea7ab473acb19396a66709bdb437593151f927..dd9cd54758a56f872bdefb4df934e8d89b2f6afb 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 7db98670e2325825a76b60559d09d818838f9430..95b1d524cc24401bd4c9620de70d20583ca1bc0c 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 68db541bc922d3c269d3f626e19ddd6a1001d071..cf8e30ec142e31165fcbdc6ecadbceac6f50b367 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 5411449c79fcbf0bece01517eb81c4b7f1d4d52f..89e3888083f4a8bc96325daabdd393aeb14a0200 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;