diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H
index 8d3e60da4044ce89d0a23c54e8a532d26067f143..75560b6337fbeb5870e60a496bf1d798a40de7d9 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H
@@ -52,7 +52,6 @@
phiAbs = phi;
phiAbs.oldTime() = phi;
fvc::makeRelative(phi, U);
- phi.oldTime() = phi;
}
}
}
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index 3ccfa73fee62d91fb88baf889291d6c9af3950ac..0c22dd01b7527fa7fb4ba8e5a39d7e861e38d093 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -81,6 +81,9 @@ int main(int argc, char *argv[])
scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
{
+ // Ensure old-time U exists for mapping
+ U.oldTime();
+
// Calculate the relative velocity used to map the relative flux phi
volVectorField Urel("Urel", U);
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index a19b6a3d9b5f61d9d5fd0028438cf6712f9cd468..0e3527cfae0bbd81c9de6691895d9943d9461a02 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 a1545657473523bdfea37a8c4ba3d5fe0aa7afff..7b1a0e027df758527fc2eafa9b629aec768d555d 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/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
index 411500e8c0c8c9ca531d6a5f7df683d27c75ec2d..0898ac44ada0abc34091b4d289d466ecd07d0b04 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
@@ -219,8 +219,10 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
true
);
- scalarField internalClosenessPointField =
- patchInterpolate.faceToPointInterpolate(internalCloseness);
+ scalarField internalClosenessPointField
+ (
+ patchInterpolate.faceToPointInterpolate(internalCloseness)
+ );
forAll(pointCellSize, pI)
{
@@ -254,8 +256,10 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
true
);
- scalarField featureProximityPointField =
- patchInterpolate.faceToPointInterpolate(featureProximity);
+ scalarField featureProximityPointField
+ (
+ patchInterpolate.faceToPointInterpolate(featureProximity)
+ );
forAll(pointCellSize, pI)
{
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C
index a72630ad36a2d35132ea962ad6344935e71ab37c..7034ec58dd2ea7848ed4c76b10b458e5ee625dd2 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C
@@ -80,7 +80,8 @@ Foam::searchableBoxFeatures::features() const
{
autoPtr<extendedFeatureEdgeMesh> features;
- vectorField faceNormals(List<vector>(treeBoundBox::faceNormals));
+ List<vector> faceNormalsList(treeBoundBox::faceNormals);
+ vectorField faceNormals(faceNormalsList);
vectorField edgeDirections(12);
labelListList normalDirections(12);
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index 93e4f6269098cbee0eb5550804b34a1a96467028..debb7b05887894fd43e7a6a2f2843873705df512 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -370,7 +370,10 @@ int main(int argc, char *argv[])
DynamicList<vector> normals(2*nFeatEds);
vectorField edgeDirections(nFeatEds, vector::zero);
- DynamicList<label> normalVolumeTypes(2*nFeatEds);
+ DynamicList<extendedFeatureEdgeMesh::sideVolumeType> normalVolumeTypes
+ (
+ 2*nFeatEds
+ );
List<DynamicList<label> > edgeNormals(nFeatEds);
List<DynamicList<label> > normalDirections(nFeatEds);
@@ -551,7 +554,10 @@ int main(int argc, char *argv[])
// Region edges are not explicitly supported by surfaceIntersection
vectorField normalsTmp(normals);
- PackedList<2> normalVolumeTypesTmp(normalVolumeTypes);
+ List<extendedFeatureEdgeMesh::sideVolumeType> normalVolumeTypesTmp
+ (
+ normalVolumeTypes
+ );
labelListList edgeNormalsTmp(edgeNormals.size());
forAll(edgeNormalsTmp, i)
{
diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
index 50e3e3e4580ecf06293a338ecb4231aecd6d2a37..05c86b78833d8d5be4a7fb429769e5a40af76720 100644
--- a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
+++ b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
@@ -1380,4 +1380,40 @@ bool Foam::extendedFeatureEdgeMesh::writeData(Ostream& os) const
}
+Foam::Istream& Foam::operator>>
+(
+ Istream& is,
+ Foam::extendedFeatureEdgeMesh::sideVolumeType& vt
+)
+{
+ // Read beginning of sideVolumeType
+ is.readBegin("sideVolumeType");
+
+ int type;
+ is >> type;
+
+ vt = static_cast<Foam::extendedFeatureEdgeMesh::sideVolumeType>(type);
+
+ // Read end of volumeType
+ is.readEnd("sideVolumeType");
+
+ // Check state of Istream
+ is.check("operator>>(Istream&, sideVolumeType&)");
+
+ return is;
+}
+
+
+Foam::Ostream& Foam::operator<<
+(
+ Ostream& os,
+ const Foam::extendedFeatureEdgeMesh::sideVolumeType& vt
+)
+{
+ os << static_cast<int>(vt);
+
+ return os;
+}
+
+
// ************************************************************************* //
diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
index ead6ef63ca14c53fec333d4b5559a402c95f9d8d..dec5c416965d8c2a98bed81581f3f1a8ed67737f 100644
--- a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
+++ b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
@@ -465,6 +465,9 @@ public:
//- WriteData function required for regIOobject write operation
virtual bool writeData(Ostream&) const;
+
+ friend Istream& operator>>(Istream& is, sideVolumeType& vt);
+ friend Ostream& operator<<(Ostream& os, const sideVolumeType& vt);
};
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
index 698ff247d3588ecf485750ed392cd0745e137d2c..6f1ace6a16236d72811a5f268fcaad2d93db66a8 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
@@ -24,13 +24,13 @@ boundaryField
movingWall
{
type compressible::epsilonWallFunction;
- value uniform 0;
+ value $internalField;
}
fixedWalls
{
type compressible::epsilonWallFunction;
- value uniform 0;
+ value $internalField;
}
frontAndBack
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon
index a07beadefa25bb5a71c6f19e2e71ed406657ed71..7413e6a02ecff85d2e947660a36f84fb5a0ba914 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon
@@ -24,13 +24,13 @@ boundaryField
rotor
{
type epsilonWallFunction;
- value uniform 0;
+ value $internalField;
}
stator
{
type epsilonWallFunction;
- value uniform 0;
+ value $internalField;
}
front
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/polyMesh/boundary
deleted file mode 100644
index f6e6726c6bc2912dada27f59fca03ea17e1b68d8..0000000000000000000000000000000000000000
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,81 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class polyBoundaryMesh;
- location "constant/polyMesh";
- object boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-8
-(
- inlet
- {
- type patch;
- nFaces 40;
- startFace 21464;
- }
- outlet
- {
- type patch;
- nFaces 96;
- startFace 21504;
- }
- walls
- {
- type wall;
- nFaces 320;
- startFace 21600;
- }
- defaultFaces
- {
- type empty;
- inGroups 1(empty);
- nFaces 21760;
- startFace 21920;
- }
- ACMI1_blockage
- {
- type wall;
- nFaces 40;
- startFace 43680;
- }
- ACMI1_couple
- {
- type cyclicACMI;
- inGroups 1(cyclicACMI);
- nFaces 40;
- startFace 43720;
- matchTolerance 0.0001;
- transform noOrdering;
- neighbourPatch ACMI2_couple;
- nonOverlapPatch ACMI1_blockage;
- }
- ACMI2_blockage
- {
- type wall;
- nFaces 96;
- startFace 43760;
- }
- ACMI2_couple
- {
- type cyclicACMI;
- inGroups 1(cyclicACMI);
- nFaces 96;
- startFace 43856;
- matchTolerance 0.0001;
- transform noOrdering;
- neighbourPatch ACMI1_couple;
- nonOverlapPatch ACMI2_blockage;
- }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon b/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
index a81220d8aa87f22bf9cf0dadf700576cba0b6df9..00cbd4d30bf13b699f9ca66861bb5b18359742b0 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
@@ -43,7 +43,7 @@ boundaryField
defaultFaces
{
type epsilonWallFunction;
- value uniform 0;
+ value $internalField;
}
}
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon
index ddb0f60d60f37746da6c73e25569c0f6f3d823e9..84f822890eac7bc4374cbdf8ed0ab2a82bb34152 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon
@@ -24,13 +24,13 @@ boundaryField
rotor
{
type epsilonWallFunction;
- value uniform 0;
+ value $internalField;
}
stator
{
type epsilonWallFunction;
- value uniform 0;
+ value $internalField;
}
front
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega
index efd2924775d02edef8c912c48bed1fab405616a0..c1aa352a73f5adee542f1cfcee7ed95e842872e8 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega
@@ -54,7 +54,7 @@ boundaryField
Cmu 0.09;
kappa 0.41;
E 9.8;
- value uniform 0;
+ value $internalField;
}
}
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega
index efd2924775d02edef8c912c48bed1fab405616a0..c1aa352a73f5adee542f1cfcee7ed95e842872e8 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega
@@ -54,7 +54,7 @@ boundaryField
Cmu 0.09;
kappa 0.41;
E 9.8;
- value uniform 0;
+ value $internalField;
}
}
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega
index efd2924775d02edef8c912c48bed1fab405616a0..c1aa352a73f5adee542f1cfcee7ed95e842872e8 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega
@@ -54,7 +54,7 @@ boundaryField
Cmu 0.09;
kappa 0.41;
E 9.8;
- value uniform 0;
+ value $internalField;
}
}
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega
index efd2924775d02edef8c912c48bed1fab405616a0..c1aa352a73f5adee542f1cfcee7ed95e842872e8 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega
@@ -54,7 +54,7 @@ boundaryField
Cmu 0.09;
kappa 0.41;
E 9.8;
- value uniform 0;
+ value $internalField;
}
}
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega
index efd2924775d02edef8c912c48bed1fab405616a0..c1aa352a73f5adee542f1cfcee7ed95e842872e8 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega
@@ -54,7 +54,7 @@ boundaryField
Cmu 0.09;
kappa 0.41;
E 9.8;
- value uniform 0;
+ value $internalField;
}
}
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
index 7d940c54e8121d663fcee5eb723101d8d89a8e4f..76eaf8fd2a3d1ce01aa7564134a7737d9b5e6f28 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 190bdc4e1b9bbb5ab71a62d9a23cbc697358a63d..87856ee3ca139aff10b36730998d69bc6218bd33 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 19a9d9e0f3ecbf4de125c079b3b1d703b756ee2b..c4f3932da60c089c236da174316a0876d4d1a226 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 7577b94f2117c0747b8af59a35a1d46738d3b7ab..4e1aa83dc74d3db686ea7a3ae3c8ea442091cd1e 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 7577b94f2117c0747b8af59a35a1d46738d3b7ab..4e1aa83dc74d3db686ea7a3ae3c8ea442091cd1e 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 067ac927d023c4e5e173c4c1ed6b2cada94c6f4e..1689fc3519883a0af17454b6842bfb264a5690a3 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 97c8cb32d1a050b21c7c11eed1acef7e4320ec6a..5e6a4b0b21269cbbd6cbde062c090325a1bf1e5e 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 a4e2403cfbbd6c61c9646e7c9803020682d2f35f..63d54a7c3dbbdc49c061706b661442631467b6fc 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 c93b34506bf660eb43f6f13df73ecc48be3a00c9..1202013c58cab93c03b199125dc462a675f6acaa 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 ae85bdfaba79415bf8d80a6659b8136c483796ed..696ba9cc7988e7447b0d9ed7a1010f2f75f44098 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 ae85bdfaba79415bf8d80a6659b8136c483796ed..696ba9cc7988e7447b0d9ed7a1010f2f75f44098 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 ae85bdfaba79415bf8d80a6659b8136c483796ed..696ba9cc7988e7447b0d9ed7a1010f2f75f44098 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 ae85bdfaba79415bf8d80a6659b8136c483796ed..696ba9cc7988e7447b0d9ed7a1010f2f75f44098 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 ae85bdfaba79415bf8d80a6659b8136c483796ed..696ba9cc7988e7447b0d9ed7a1010f2f75f44098 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 d6ad27dc796fd3b5f2cee6bb3421f6bf19c95a13..54f20e5253f0b6a6fbd838c1014ab2c65a3755ce 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 2cc9d133e6d90f92b313821e2e5e8a4bd23de958..d7383123a6a4cd8b8924813ec9144cded6e2bf9c 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 21ae680f263d399a0dae1f57fc88666e08cc333f..a30ce4ddb8c0709187beec070c39ff9db7977595 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 97d24d6130ffd7e01954d2f82a1b8dc7b376b8d8..96c64a2a1c9145b0573c148c95d84c02bf34ad47 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 7a6ad628f6c69e159b6b4997898f85cf4de756c2..62774a76104c171e959156b9bbbea564a9a0b3ba 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 8b86c656c8faba7ef608611e75efa34a06d04365..e2db3124d4d72d0925b097bd652e638b8e6f6d60 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 b8d411303f41ffe1b2722fc28817c4470164f3b5..3693fa3dfe48cba3d696c111e4bc81c9c149c8d1 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 cf4ce79ecf23c40a9c8a6335556f98005881425d..73cb43356b88c947783befe2a0f62fc9cf4ad96d 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 296b0cd48839b3ce647e02a066bcaaa341e692f1..94423be84d3c0342998a107f1e9c221dcf442a66 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 296b0cd48839b3ce647e02a066bcaaa341e692f1..94423be84d3c0342998a107f1e9c221dcf442a66 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 89fe68c6fb32b4329a953f28dd32c0fb630710e6..4c352dce5f874c1c50aa6f1e2494cb94e9264a01 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 3c8c89ad22b85685f9a189472d90f0f180a438d2..d0c3c2764f316b6cc094b09c0f8b36efa416f3b9 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 34ad1289b35d559848fbd643fb9a3c5553f7151b..c2eac8b7750cf010c5ab62e968fea5af953fb7ed 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 962f2cdfd602b003125d7dcea347374b3442e273..af87b0880fb25609cc492b87363236bd3065e01e 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 3a47e5857c1307ec855eb02f64a67e250c467750..357d2a8442c2eeae0580244deb18b4149a419428 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 2e3cdfa4aaee926062296b0c2d40cb381f41ebcb..efd034ad8bf106537ea18fca8bcfbd9f2b90e3cb 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 76a95c8327cadc21206927893a86f255c8cd1c8c..381ca29a11e5a1a25302a4548358c17c9d9085ee 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 69208cbe950050e6f399b103952793cc7037bdf1..f281016b47a9a002bd4e6be554b74990eb7129e6 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;
}