From 052d81785a9dddea6587e1ac12f95a3b6809702f Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 20 Jun 2013 16:32:39 +0100
Subject: [PATCH] multiphase: move alpha solution controls into the appropriate
sub-dictionary of fvSolution:solvers
---
.../multiphaseSystem/multiphaseSystem.C | 2 +-
.../multiphaseMixture/multiphaseMixture.C | 2 +-
.../LTSInterFoam/wigleyHull/system/fvSolution | 11 ++++---
.../mixerVessel2D/system/fvSolution | 11 +++++--
.../mixerVessel2D/system/fvSolution | 12 ++++---
.../laminar/depthCharge2D/system/fvSolution | 10 ++++--
.../laminar/depthCharge3D/system/fvSolution | 10 ++++--
.../bubbleColumn/system/fvSolution | 16 ++++------
.../mixerVessel2D/system/fvSolution | 9 ++++--
.../damBreakWithObstacle/system/fvSolution | 10 ++++--
.../ras/floatingObject/system/fvSolution | 10 ++++--
.../ras/sloshingTank2D/system/fvSolution | 10 ++++--
.../ras/sloshingTank2D3DoF/system/fvSolution | 10 ++++--
.../ras/sloshingTank3D/system/fvSolution | 10 ++++--
.../ras/sloshingTank3D3DoF/system/fvSolution | 10 ++++--
.../ras/sloshingTank3D6DoF/system/fvSolution | 10 ++++--
.../ras/testTubeMixer/system/fvSolution | 10 ++++--
.../les/nozzleFlow2D/system/fvSolution | 10 ++++--
.../interFoam/ras/damBreak/system/fvSolution | 10 ++++--
.../damBreakPorousBaffle/system/fvSolution | 10 ++++--
.../LTSInterFoam/system/fvSolution | 19 ++++-------
.../ras/waterChannel/system/fvSolution | 11 ++++---
.../ras/weirOverflow/system/fvSolution | 10 ++++--
.../bubbleColumn/system/fvSolution | 6 +++-
.../damBreak4phase/system/fvSolution | 6 +++-
.../damBreak4phaseFine/system/fvSolution | 6 +++-
.../mixerVessel2D/system/fvSolution | 7 +++-
.../laminar/damBreak4phase/system/fvSolution | 8 +++--
.../damBreak4phaseFine/system/fvSolution | 8 +++--
.../lockExchange/system/fvSolution | 6 ++--
.../twoPhaseEulerFoam/bed/system/fvSolution | 32 +++++++------------
.../twoPhaseEulerFoam/bed2/system/fvSolution | 25 ++++-----------
.../bubbleColumn/system/fvSolution | 25 ++++-----------
.../mixerVessel2D/system/fvSolution | 17 ++++------
34 files changed, 220 insertions(+), 159 deletions(-)
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index a19b6a3d9b5..0e3527cfae0 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -812,7 +812,7 @@ void Foam::multiphaseSystem::solve()
const Time& runTime = mesh_.time();
- const dictionary& alphaControls = mesh_.solverDict(phases_.first().name());
+ const dictionary& alphaControls = mesh_.solverDict("alpha");
label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
if (nAlphaSubCycles > 1)
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index a1545657473..7b1a0e027df 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -246,7 +246,7 @@ void Foam::multiphaseMixture::solve()
volScalarField& alpha = phases_.first();
- const dictionary& alphaControls = mesh_.solverDict(alpha.name());
+ const dictionary& alphaControls = mesh_.solverDict("alpha");
label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
scalar cAlpha(readScalar(alphaControls.lookup("cAlpha")));
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
index 7d940c54e81..76eaf8fd2a3 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 1;
+ cAlpha 1;
+ }
+
pcorr
{
solver PCG;
@@ -79,10 +86,6 @@ PIMPLE
nCorrectors 1;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 1;
- cAlpha 1;
-
maxCo 0.9;
maxAlphaCo 0.2;
nAlphaSweepIter 1;
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution
index 190bdc4e1b9..87856ee3ca1 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 2;
+ cAlpha 1;
+ }
+
pcorr
{
solver PCG;
@@ -55,9 +62,7 @@ PIMPLE
momentumPredictor no;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 2;
- cAlpha 1;
+
pRefCell 0;
pRefValue 0;
}
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
index 19a9d9e0f3e..c4f3932da60 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha
+ {
+ nAlphaCorr 4;
+ nAlphaSubCycles 4;
+ cAlpha 2;
+ }
+
pcorr
{
solver PCG;
@@ -55,10 +62,7 @@ PIMPLE
momentumPredictor no;
nCorrectors 4;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 4;
- nAlphaSubCycles 4;
- cycleAlpha yes;
- cAlpha 2;
+
pRefCell 0;
pRefValue 0;
}
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
index 7577b94f211..4e1aa83dc74 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alphawater
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 1;
+ cAlpha 1;
+ }
+
pcorr
{
solver PCG;
@@ -107,9 +114,6 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 1;
- cAlpha 1;
}
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
index 7577b94f211..4e1aa83dc74 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alphawater
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 1;
+ cAlpha 1;
+ }
+
pcorr
{
solver PCG;
@@ -107,9 +114,6 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 1;
- cAlpha 1;
}
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSolution
index 067ac927d02..1689fc35198 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSolution
@@ -17,6 +17,12 @@ FoamFile
solvers
{
+ alphaair
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 2;
+ }
+
p
{
solver GAMG;
@@ -55,14 +61,6 @@ solvers
relTol 0;
}
- "alpha.*"
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- }
-
"(k|epsilon|Theta).*"
{
solver PBiCG;
@@ -77,8 +75,6 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 2;
}
relaxationFactors
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSolution
index 97c8cb32d1a..5e6a4b0b212 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSolution
@@ -17,6 +17,12 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 2;
+ }
+
p
{
solver GAMG;
@@ -67,8 +73,7 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 2;
+
pRefCell 0;
pRefValue 0;
}
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
index a4e2403cfbb..63d54a7c3db 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1;
+ }
+
pcorr
{
solver PCG;
@@ -102,9 +109,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 3;
- cAlpha 1;
pRefPoint (0.51 0.51 0.51);
pRefValue 0;
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
index c93b34506bf..1202013c58c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
@@ -29,6 +29,13 @@ solvers
mergeLevels 1;
}
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1;
+ }
+
pcorr
{
solver PCG;
@@ -115,9 +122,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 3;
- cAlpha 1;
correctPhi yes;
}
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
index ae85bdfaba7..696ba9cc798 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1.5;
+ }
+
pcorr
{
solver PCG;
@@ -94,9 +101,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 3;
- cAlpha 1.5;
correctPhi no;
pRefPoint (0 0 0.15);
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
index ae85bdfaba7..696ba9cc798 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1.5;
+ }
+
pcorr
{
solver PCG;
@@ -94,9 +101,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 3;
- cAlpha 1.5;
correctPhi no;
pRefPoint (0 0 0.15);
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
index ae85bdfaba7..696ba9cc798 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1.5;
+ }
+
pcorr
{
solver PCG;
@@ -94,9 +101,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 3;
- cAlpha 1.5;
correctPhi no;
pRefPoint (0 0 0.15);
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
index ae85bdfaba7..696ba9cc798 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1.5;
+ }
+
pcorr
{
solver PCG;
@@ -94,9 +101,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 3;
- cAlpha 1.5;
correctPhi no;
pRefPoint (0 0 0.15);
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
index ae85bdfaba7..696ba9cc798 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1.5;
+ }
+
pcorr
{
solver PCG;
@@ -94,9 +101,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 3;
- cAlpha 1.5;
correctPhi no;
pRefPoint (0 0 0.15);
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
index d6ad27dc796..54f20e5253f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1.5;
+ }
+
pcorr
{
solver PCG;
@@ -94,9 +101,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 3;
- cAlpha 1.5;
correctPhi no;
pRefPoint (0.0013 0.0017 0.0017);
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
index 2cc9d133e6d..d7383123a6a 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 4;
+ cAlpha 2;
+ }
+
pcorr
{
solver PCG;
@@ -100,9 +107,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 1;
- nAlphaCorr 1;
- nAlphaSubCycles 4;
- cAlpha 2;
}
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
index 21ae680f263..a30ce4ddb8c 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 4;
+ cAlpha 2;
+ }
+
pcorr
{
solver PCG;
@@ -63,9 +70,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 4;
- cAlpha 2;
}
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
index 97d24d6130f..96c64a2a1c9 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 4;
+ cAlpha 2;
+ }
+
pcorr
{
solver PCG;
@@ -63,9 +70,6 @@ PIMPLE
momentumPredictor yes;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 4;
- cAlpha 2;
}
relaxationFactors
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
index 7a6ad628f6c..62774a76104 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1;
+ }
+
pcorr
{
solver PCG;
@@ -39,14 +46,6 @@ solvers
maxIter 100;
}
-/* pcorr
- {
- solver PCG;
- preconditioner DIC;
- tolerance 1e-10;
- relTol 0;
- };
-*/
p_rgh
{
$pcorr;
@@ -79,10 +78,6 @@ PIMPLE
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 3;
- cAlpha 1;
-
maxCo 0.5;
maxAlphaCo 0.2;
nAlphaSweepIter 1;
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
index 8b86c656c8f..e2db3124d4d 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1;
+ }
+
pcorr
{
solver PCG;
@@ -68,10 +75,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
-
- nAlphaCorr 1;
- nAlphaSubCycles 3;
- cAlpha 1;
}
relaxationFactors
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
index b8d411303f4..3693fa3dfe4 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
@@ -16,6 +16,13 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 2;
+ cAlpha 1;
+ }
+
pcorr
{
solver PCG;
@@ -58,9 +65,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 2;
- cAlpha 1;
}
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
index cf4ce79ecf2..73cb43356b8 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
@@ -17,6 +17,11 @@ FoamFile
solvers
{
+ alpha
+ {
+ nAlphaSubCycles 2;
+ }
+
p
{
solver GAMG;
@@ -92,7 +97,6 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaSubCycles 2;
}
relaxationFactors
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
index 296b0cd4883..94423be84d3 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
@@ -17,6 +17,11 @@ FoamFile
solvers
{
+ alpha
+ {
+ nAlphaSubCycles 3;
+ }
+
p
{
solver GAMG;
@@ -83,7 +88,6 @@ PIMPLE
{
nCorrectors 3;
nNonOrthogonalCorrectors 0;
- nAlphaSubCycles 3;
}
relaxationFactors
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
index 296b0cd4883..94423be84d3 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
@@ -17,6 +17,11 @@ FoamFile
solvers
{
+ alpha
+ {
+ nAlphaSubCycles 3;
+ }
+
p
{
solver GAMG;
@@ -83,7 +88,6 @@ PIMPLE
{
nCorrectors 3;
nNonOrthogonalCorrectors 0;
- nAlphaSubCycles 3;
}
relaxationFactors
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
index 89fe68c6fb3..4c352dce5f8 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
@@ -17,6 +17,11 @@ FoamFile
solvers
{
+ alpha
+ {
+ nAlphaSubCycles 2;
+ }
+
p
{
solver GAMG;
@@ -84,7 +89,7 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
- nAlphaSubCycles 2;
+
pRefCell 0;
pRefValue 0;
}
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index 3c8c89ad22b..d0c3c2764f3 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -17,6 +17,12 @@ FoamFile
solvers
{
+ alpha
+ {
+ nAlphaSubCycles 4;
+ cAlpha 2;
+ }
+
pcorr
{
solver PCG;
@@ -98,8 +104,6 @@ PIMPLE
{
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaSubCycles 4;
- cAlpha 2;
}
relaxationFactors
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
index 34ad1289b35..c2eac8b7750 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
@@ -17,6 +17,12 @@ FoamFile
solvers
{
+ alpha
+ {
+ nAlphaSubCycles 4;
+ cAlpha 2;
+ }
+
pcorr
{
solver PCG;
@@ -92,8 +98,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaSubCycles 4;
- cAlpha 2;
}
relaxationFactors
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
index 962f2cdfd60..af87b0880fb 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
@@ -19,6 +19,9 @@ solvers
{
"alpha1.*"
{
+ nAlphaSubCycles 2;
+ nAlphaCorr 1;
+
solver smoothSolver;
smoother GaussSeidel;
tolerance 1e-9;
@@ -66,8 +69,7 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaSubCycles 2;
- nAlphaCorr 1;
+
pRefValue 0;
pRefPoint (0.1 0.1 1);
}
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
index 3a47e5857c1..357d2a8442c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
@@ -17,6 +17,17 @@ FoamFile
solvers
{
+ "alpha1.*"
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-10;
+ relTol 0.1;
+ }
+
p
{
solver GAMG;
@@ -52,26 +63,6 @@ solvers
$k;
relTol 0;
}
-
- alpha1
- {
- nAlphaCorr 2;
- nAlphaSubCycles 3;
- }
-
- alpha
- {
- solver PCG;
- preconditioner DIC;
- tolerance 1e-10;
- relTol 0.1;
- }
-
- alpha1Final
- {
- $alpha;
- relTol 0;
- }
}
PIMPLE
@@ -79,6 +70,7 @@ PIMPLE
nCorrectors 2;
nNonOrthogonalCorrectors 0;
correctAlpha yes;
+
pRefCell 0;
pRefValue 0;
}
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
index 2e3cdfa4aae..efd034ad8bf 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
@@ -17,6 +17,12 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ }
+
p
{
solver GAMG;
@@ -54,31 +60,14 @@ solvers
tolerance 1e-05;
relTol 0;
}
-
- alpha
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0.1;
- }
-
- alpha1Final
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- }
}
PIMPLE
{
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 3;
correctAlpha yes;
+
pRefCell 0;
pRefValue 0;
}
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
index 76a95c8327c..381ca29a11e 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
@@ -17,6 +17,12 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 2;
+ }
+
p
{
solver GAMG;
@@ -54,31 +60,14 @@ solvers
tolerance 1e-05;
relTol 0;
}
-
- alpha
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0.1;
- }
-
- alpha1Final
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- }
}
PIMPLE
{
nCorrectors 2;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 2;
correctAlpha yes;
+
pRefCell 0;
pRefValue 0;
}
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution
index 69208cbe950..f281016b47a 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution
@@ -17,6 +17,12 @@ FoamFile
solvers
{
+ alpha1
+ {
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ }
+
p
{
solver GAMG;
@@ -53,14 +59,6 @@ solvers
relTol 0;
}
- "alpha.*"
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- }
-
"(k|epsilon|Theta|T).*"
{
solver PBiCG;
@@ -75,9 +73,8 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 3;
correctAlpha yes;
+
pRefCell 0;
pRefValue 0;
}
--
GitLab