zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Sergio Ferraris
2013-06-20 17:49:18 +01:00
parent 11656a5fba 20726d5371
commit 1c65f234da
51 changed files with 292 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H
View File

@ -52,7 +52,6 @@
phiAbs = phi;
phiAbs.oldTime() = phi;
fvc::makeRelative(phi, U);
phi.oldTime() = phi;
}
}
}

3
applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
View File

@ -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);

2
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
View File

@ -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)

2
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
View File

@ -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")));

12
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
View File

@ -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)
{

3
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C
View File

@ -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);

10
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -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)
{

36
src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
View File

@ -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;
}
// ************************************************************************* //

3
src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.H
View File

@ -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);
};

4
tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
View File

@ -24,13 +24,13 @@ boundaryField
movingWall
{
type compressible::epsilonWallFunction;
value uniform 0;
value $internalField;
}
fixedWalls
{
type compressible::epsilonWallFunction;
value uniform 0;
value $internalField;
}
frontAndBack

4
tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon
View File

@ -24,13 +24,13 @@ boundaryField
rotor
{
type epsilonWallFunction;
value uniform 0;
value $internalField;
}
stator
{
type epsilonWallFunction;
value uniform 0;
value $internalField;
}
front

81
tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/polyMesh/boundary
View File

@ -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;
}
)
// ************************************************************************* //

2
tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
View File

@ -43,7 +43,7 @@ boundaryField
defaultFaces
{
type epsilonWallFunction;
value uniform 0;
value $internalField;
}
}

4
tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon
View File

@ -24,13 +24,13 @@ boundaryField
rotor
{
type epsilonWallFunction;
value uniform 0;
value $internalField;
}
stator
{
type epsilonWallFunction;
value uniform 0;
value $internalField;
}
front

2
tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega
View File

@ -54,7 +54,7 @@ boundaryField
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0;
value $internalField;
}
}

2
tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega
View File

@ -54,7 +54,7 @@ boundaryField
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0;
value $internalField;
}
}

2
tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/omega
View File

@ -54,7 +54,7 @@ boundaryField
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0;
value $internalField;
}
}

2
tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.org/omega
View File

@ -54,7 +54,7 @@ boundaryField
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0;
value $internalField;
}
}

2
tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega
View File

@ -54,7 +54,7 @@ boundaryField
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0;
value $internalField;
}
}

11
tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
View File

@ -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;

11
tutorials/multiphase/MRFInterFoam/mixerVessel2D/system/fvSolution
View File

@ -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;
}

12
tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
View File

@ -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;
}

10
tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
View File

@ -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;
}

10
tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
View File

@ -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;
}

16
tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSolution
View File

@ -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

9
tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/system/fvSolution
View File

@ -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;
}

10
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
View File

@ -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;

10
tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
View File

@ -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;
}

10
tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
View File

@ -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);

10
tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
View File

@ -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);

10
tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
View File

@ -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);

10
tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
View File

@ -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);

10
tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
View File

@ -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);

10
tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
View File

@ -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);

10
tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
View File

@ -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;
}

10
tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
View File

@ -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;
}

10
tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
View File

@ -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

19
tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
View File

@ -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;

11
tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
View File

@ -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

10
tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
View File

@ -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;
}

6
tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution
View File

@ -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

6
tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution
View File

@ -17,6 +17,11 @@ FoamFile
solvers
{
alpha
{
nAlphaSubCycles 3;
}
p
{
solver GAMG;
@ -83,7 +88,6 @@ PIMPLE
{
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nAlphaSubCycles 3;
}
relaxationFactors

6
tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution
View File

@ -17,6 +17,11 @@ FoamFile
solvers
{
alpha
{
nAlphaSubCycles 3;
}
p
{
solver GAMG;
@ -83,7 +88,6 @@ PIMPLE
{
nCorrectors 3;
nNonOrthogonalCorrectors 0;
nAlphaSubCycles 3;
}
relaxationFactors

7
tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution
View File

@ -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;
}

8
tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
View File

@ -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

8
tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
View File

@ -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

6
tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution
View File

@ -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);
}

32
tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
View File

@ -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;
}

25
tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
View File

@ -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;
}

25
tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
View File

@ -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;
}

17
tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/system/fvSolution
View File

@ -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;
}