diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C index a19b6a3d9b..0e3527cfae 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 a154565747..7b1a0e027d 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 7d940c54e8..76eaf8fd2a 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 190bdc4e1b..87856ee3ca 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 19a9d9e0f3..c4f3932da6 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 7577b94f21..4e1aa83dc7 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 7577b94f21..4e1aa83dc7 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 067ac927d0..1689fc3519 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 97c8cb32d1..5e6a4b0b21 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 a4e2403cfb..63d54a7c3d 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 c93b34506b..1202013c58 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 ae85bdfaba..696ba9cc79 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 ae85bdfaba..696ba9cc79 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 ae85bdfaba..696ba9cc79 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 ae85bdfaba..696ba9cc79 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 ae85bdfaba..696ba9cc79 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 d6ad27dc79..54f20e5253 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 2cc9d133e6..d7383123a6 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 21ae680f26..a30ce4ddb8 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 97d24d6130..96c64a2a1c 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 7a6ad628f6..62774a7610 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 8b86c656c8..e2db3124d4 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 b8d411303f..3693fa3dfe 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 cf4ce79ecf..73cb43356b 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 296b0cd488..94423be84d 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 296b0cd488..94423be84d 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 89fe68c6fb..4c352dce5f 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 3c8c89ad22..d0c3c2764f 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 34ad1289b3..c2eac8b775 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 962f2cdfd6..af87b0880f 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 3a47e5857c..357d2a8442 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 2e3cdfa4aa..efd034ad8b 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 76a95c8327..381ca29a11 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 69208cbe95..f281016b47 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; }