Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

This commit is contained in:
Henry Weller
2021-03-17 14:21:21 +00:00
76 changed files with 166 additions and 194 deletions

View File

@ -11,13 +11,6 @@ autoPtr<phaseSystem> fluidPtr
phaseSystem& fluid = fluidPtr();
phaseSystem::phaseModelList& phases = fluid.phases();
dimensionedScalar pMin
(
"pMin",
dimPressure,
fluid
);
#include "gh.H"
volScalarField& p = phases[0].thermoRef().p();
@ -36,32 +29,41 @@ volScalarField p_rgh
mesh
);
label pRefCell = 0;
scalar pRefValue = 0.0;
if (fluid.incompressible())
if (fluid.found("pMin"))
{
p = max(p_rgh + fluid.rho()*gh, pMin);
IOWarningInFunction(fluid)
<< "Pressure limits, pMin and pMax, are now read from "
<< pimple.dict().name() << endl;
}
if (p_rgh.needReference())
{
setRefCell
(
pressureControl pressureControl
(
p,
p_rgh,
fluid.rho(),
pimple.dict(),
pRefCell,
pRefValue
);
fluid.incompressible()
);
if (fluid.incompressible())
{
p = p_rgh + fluid.rho()*gh;
pressureControl.limit(p);
}
if (p_rgh.needReference() && fluid.incompressible())
{
p += dimensionedScalar
(
"p",
p.dimensions(),
pRefValue - getRefCellValue(p, pRefCell)
pressureControl.refValue()
- getRefCellValue(p, pressureControl.refCell())
);
p_rgh = p - fluid.rho()*gh;
}
}
p_rgh = p - fluid.rho()*gh;
mesh.setFluxRequired(p_rgh.name());
PtrList<volScalarField> rAUs;

View File

@ -38,6 +38,7 @@ Description
#include "phaseSystem.H"
#include "phaseCompressibleMomentumTransportModel.H"
#include "pimpleControl.H"
#include "pressureControl.H"
#include "localEulerDdtScheme.H"
#include "fvcSmooth.H"

View File

@ -257,7 +257,11 @@ while (pimple.correct())
if (fluid.incompressible())
{
pEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
pEqn.setReference
(
pressureControl.refCell(),
pressureControl.refValue()
);
}
pEqn.solve();
@ -327,7 +331,8 @@ while (pimple.correct())
}
// Update and limit the static pressure
p = max(p_rgh + rho*gh, pMin);
p = p_rgh + rho*gh;
pressureControl.limit(p);
// Account for static pressure reference
if (p_rgh.needReference() && fluid.incompressible())
@ -336,7 +341,8 @@ while (pimple.correct())
(
"p",
p.dimensions(),
pRefValue - getRefCellValue(p, pRefCell)
pressureControl.refValue()
- getRefCellValue(p, pressureControl.refCell())
);
}

View File

@ -248,7 +248,11 @@ while (pimple.correct())
if (fluid.incompressible())
{
pEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
pEqn.setReference
(
pressureControl.refCell(),
pressureControl.refValue()
);
}
pEqn.solve();
@ -305,7 +309,8 @@ while (pimple.correct())
}
// Update and limit the static pressure
p = max(p_rgh + rho*gh, pMin);
p = p_rgh + rho*gh;
pressureControl.limit(p);
// Account for static pressure reference
if (p_rgh.needReference() && fluid.incompressible())
@ -314,7 +319,8 @@ while (pimple.correct())
(
"p",
p.dimensions(),
pRefValue - getRefCellValue(p, pRefCell)
pressureControl.refValue()
- getRefCellValue(p, pressureControl.refCell())
);
}

View File

@ -187,7 +187,4 @@ turbulentDispersion
(
);
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -53,6 +53,9 @@ PIMPLE
nOuterCorrectors 5;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
pMin 1e4;
pRefCell 0;
pRefValue 1e5;
}

View File

@ -144,7 +144,4 @@ turbulentDispersion
(
);
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -53,6 +53,9 @@ PIMPLE
nOuterCorrectors 5;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
pMin 1e4;
pRefCell 0;
pRefValue 1e5;
}

View File

@ -183,8 +183,4 @@ wallLubrication
turbulentDispersion
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -58,6 +58,8 @@ PIMPLE
nOuterCorrectors 2;
nCorrectors 1;
pMin 1e4;
pRefCell 0;
pRefValue 1e5;
}

View File

@ -184,8 +184,4 @@ wallLubrication
turbulentDispersion
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -58,6 +58,8 @@ PIMPLE
nOuterCorrectors 2;
nCorrectors 1;
pMin 1e4;
pRefCell 0;
pRefValue 1e5;
}

View File

@ -226,8 +226,4 @@ wallLubrication
turbulentDispersion
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -58,6 +58,8 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 1;
pMin 1e4;
pRefCell 0;
pRefValue 1e5;
}

View File

@ -151,8 +151,4 @@ wallLubrication
turbulentDispersion
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -58,6 +58,8 @@ PIMPLE
nOuterCorrectors 2;
nCorrectors 1;
pMin 1e4;
pRefCell 0;
pRefValue 1e5;

View File

@ -198,6 +198,4 @@ virtualMass
wallLubrication
();
pMin 10000;
// ************************************************************************* //

View File

@ -57,7 +57,10 @@ PIMPLE
{
nOuterCorrectors 3;
nCorrectors 2;
faceMomentum true;
pMin 1e4;
}
relaxationFactors

View File

@ -145,8 +145,4 @@ wallLubrication
turbulentDispersion
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -58,6 +58,8 @@ PIMPLE
nOuterCorrectors 2;
nCorrectors 1;
pMin 1e4;
pRefCell 0;
pRefValue 1e5;

View File

@ -189,8 +189,4 @@ wallLubrication
turbulentDispersion
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -58,6 +58,8 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 1;
pMin 1e4;
pRefCell 0;
pRefValue 1e5;
}

View File

@ -141,7 +141,4 @@ turbulentDispersion
(
);
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -53,6 +53,9 @@ PIMPLE
nOuterCorrectors 5;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
pMin 1e4;
pRefCell 0;
pRefValue 1e5;
}

View File

@ -168,8 +168,4 @@ turbulentDispersion
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -70,6 +70,8 @@ PIMPLE
nOuterCorrectors 3;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
pMin 1e4;
}
relaxationFactors

View File

@ -141,8 +141,4 @@ phaseTransfer
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -74,7 +74,10 @@ PIMPLE
nCorrectors 1;
nNonOrthogonalCorrectors 0;
nEnergyCorrectors 1;
faceMomentum yes;
pMin 1e4;
}
relaxationFactors

View File

@ -115,8 +115,4 @@ turbulentDispersion
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -89,7 +89,10 @@ PIMPLE
nOuterCorrectors 3;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
faceMomentum yes;
pMin 1e4;
}
relaxationFactors

View File

@ -168,8 +168,4 @@ turbulentDispersion
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -70,6 +70,8 @@ PIMPLE
nOuterCorrectors 3;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
pMin 1e4;
}
relaxationFactors

View File

@ -213,8 +213,4 @@ turbulentDispersion
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -80,6 +80,8 @@ PIMPLE
nOuterCorrectors 5;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
pMin 1e4;
}
relaxationFactors

View File

@ -278,8 +278,4 @@ turbulentDispersion
}
);
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -70,7 +70,10 @@ PIMPLE
nOuterCorrectors 2;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
faceMomentum true;
pMin 1e4;
}
relaxationFactors

View File

@ -114,8 +114,4 @@ turbulentDispersion
(
);
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -88,7 +88,10 @@ PIMPLE
nOuterCorrectors 3;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
faceMomentum no;
pMin 1e4;
}
relaxationFactors

View File

@ -176,8 +176,4 @@ phaseTransfer
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -65,7 +65,10 @@ PIMPLE
nCorrectors 1;
nNonOrthogonalCorrectors 0;
nEnergyCorrectors 1;
faceMomentum yes;
pMin 1e4;
}
relaxationFactors

View File

@ -216,8 +216,4 @@ phaseTransfer
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -73,7 +73,10 @@ PIMPLE
nCorrectors 1;
nNonOrthogonalCorrectors 0;
nEnergyCorrectors 1;
faceMomentum yes;
pMin 1e4;
}
relaxationFactors

View File

@ -259,8 +259,4 @@ phaseTransfer
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -82,7 +82,10 @@ PIMPLE
nCorrectors 1;
nNonOrthogonalCorrectors 0;
nEnergyCorrectors 1;
faceMomentum yes;
pMin 1e4;
}
relaxationFactors

View File

@ -373,8 +373,4 @@ surfaceTension
phaseTransfer
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -82,7 +82,10 @@ PIMPLE
nCorrectors 1;
nNonOrthogonalCorrectors 0;
nEnergyCorrectors 1;
faceMomentum yes;
pMin 1e4;
}
relaxationFactors

View File

@ -206,6 +206,4 @@ turbulentDispersion
interfaceCompression
();
pMin 10000;
// ************************************************************************* //

View File

@ -61,6 +61,8 @@ PIMPLE
nOuterCorrectors 3;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
pMin 1e4;
}
relaxationFactors

View File

@ -173,8 +173,4 @@ wallLubrication
turbulentDispersion
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -61,6 +61,8 @@ PIMPLE
nOuterCorrectors 3;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
pMin 1e4;
}
relaxationFactors

View File

@ -224,8 +224,4 @@ turbulentDispersion
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -71,6 +71,8 @@ PIMPLE
nOuterCorrectors 5;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
pMin 1e4;
}
relaxationFactors

View File

@ -232,7 +232,4 @@ turbulentDispersion
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -68,6 +68,8 @@ PIMPLE
nOuterCorrectors 5;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
pMin 1e4;
}
relaxationFactors

View File

@ -191,8 +191,4 @@ turbulentDispersion
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -60,6 +60,8 @@ PIMPLE
nOuterCorrectors 3;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
pMin 1e4;
}
relaxationFactors

View File

@ -197,8 +197,4 @@ wallLubrication
turbulentDispersion
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -77,6 +77,8 @@ PIMPLE
{
nCorrectors 3;
nNonOrthogonalCorrectors 0;
pMin 1e4;
}
relaxationFactors

View File

@ -111,8 +111,4 @@ turbulentDispersion
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -88,7 +88,10 @@ PIMPLE
nOuterCorrectors 3;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
faceMomentum no;
pMin 1e4;
}
relaxationFactors

View File

@ -169,8 +169,4 @@ turbulentDispersion
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -61,6 +61,8 @@ PIMPLE
nOuterCorrectors 3;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
pMin 1e4;
}
relaxationFactors

View File

@ -16,7 +16,7 @@ FoamFile
dimensions [1 -1 -2 0 0 0 0];
internalField uniform 1e5;
internalField uniform 0;
boundaryField
{

View File

@ -58,11 +58,10 @@ mercury
air
{
type purePhaseModel;
diameterModel isothermal;
isothermalCoeffs
diameterModel constant;
constantCoeffs
{
d0 1e-3;
p0 1e5;
d 1e-3;
}
residualAlpha 1e-3;
@ -468,8 +467,4 @@ wallLubrication
turbulentDispersion
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -21,7 +21,7 @@ thermoType
mixture pureMixture;
transport const;
thermo hConst;
equationOfState perfectGas;
equationOfState rhoConst;
specie specie;
energy sensibleInternalEnergy;
}
@ -32,6 +32,10 @@ mixture
{
molWeight 28.9;
}
equationOfState
{
rho 1.16;
}
thermodynamics
{
Cp 1007;

View File

@ -21,7 +21,7 @@ thermoType
mixture pureMixture;
transport const;
thermo eConst;
equationOfState rPolynomial;
equationOfState rhoConst;
specie specie;
energy sensibleInternalEnergy;
}
@ -34,7 +34,7 @@ mixture
}
equationOfState
{
C (0.001278 -2.1055e-06 3.9689e-09 4.3772e-13 -2.0225e-16);
rho 1000;
}
thermodynamics
{

View File

@ -468,8 +468,4 @@ wallLubrication
turbulentDispersion
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -79,6 +79,7 @@ PIMPLE
nOuterCorrectors 1;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
correctPhi yes;
pRefCell 0;

View File

@ -138,8 +138,4 @@ turbulentDispersion
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -82,7 +82,10 @@ PIMPLE
nCorrectors 1;
nNonOrthogonalCorrectors 0;
nEnergyCorrectors 2;
faceMomentum yes;
pMin 1e4;
}
relaxationFactors

View File

@ -213,8 +213,4 @@ turbulentDispersion
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -84,7 +84,10 @@ PIMPLE
nCorrectors 1;
nEnergyCorrectors 1;
nNonOrthogonalCorrectors 0;
faceMomentum yes;
pMin 1e4;
}
relaxationFactors

View File

@ -225,8 +225,4 @@ turbulentDispersion
interfaceCompression
();
// Minimum allowable pressure
pMin 10000;
// ************************************************************************* //

View File

@ -84,7 +84,10 @@ PIMPLE
nCorrectors 1;
nEnergyCorrectors 1;
nNonOrthogonalCorrectors 0;
faceMomentum yes;
pMin 1e4;
}
relaxationFactors

View File

@ -191,6 +191,4 @@ turbulentDispersion
interfaceCompression
();
pMin 10000;
// ************************************************************************* //

View File

@ -61,7 +61,10 @@ PIMPLE
nOuterCorrectors 3;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
partialElimination true;
pMin 1e4;
}
relaxationFactors