From 4439183d96f3f9b687236154cfa5b01f48c5fc01 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 7 Jul 2009 22:56:02 +0100
Subject: [PATCH] Corrected handling of the wall BCs of p for buoyant flows.
---
.../solvers/compressible/rhoPimpleFoam/pEqn.H | 2 --
.../buoyantBoussinesqSimpleFoam/pEqn.H | 1 +
.../heatTransfer/buoyantSimpleFoam/pEqn.H | 1 +
.../incompressible/pimpleDyMFoam/correctPhi.H | 6 +++-
.../compressibleInterDyMFoam.C | 6 ----
.../compressibleInterDyMFoam/createFields.H | 11 +++---
.../multiphase/interDyMFoam/correctPhi.H | 4 +--
.../multiphase/interDyMFoam/createFields.H | 6 +++-
.../multiphase/interDyMFoam/interDyMFoam.C | 3 --
.../solvers/multiphase/interDyMFoam/pEqn.H | 14 ++++----
.../solvers/multiphase/interFoam/correctPhi.H | 10 ++++--
.../solvers/multiphase/interFoam/pEqn.H | 7 ++--
.../interPhaseChangeFoam/correctPhi.H | 8 +++--
.../multiphase/interPhaseChangeFoam/pEqn.H | 4 +--
.../multiphase/multiphaseInterFoam/pEqn.H | 4 +--
etc/controlDict | 2 +-
src/finiteVolume/Make/files | 2 +-
.../general/include/readPISOControls.H | 4 ---
.../buoyantPressureFvPatchScalarField.C} | 34 +++++++++---------
.../buoyantPressureFvPatchScalarField.H} | 36 +++++++++----------
.../buoyantBoussinesqPisoFoam/hotRoom/0/p | 6 ++--
.../buoyantBoussinesqSimpleFoam/hotRoom/0/p | 6 ++--
.../iglooWithFridges/0/p | 8 ++---
.../heatTransfer/buoyantPisoFoam/hotRoom/0/p | 6 ++--
.../buoyantSimpleFoam/hotRoom/0/p | 6 ++--
.../hotRadiationRoom/0/p | 8 ++---
.../hotRadiationRoomFvDOM/0/p | 8 ++---
.../chtMultiRegionFoam/multiRegionHeater/0/p | 12 +++----
.../system/bottomAir/changeDictionaryDict | 16 ++++-----
.../system/topAir/changeDictionaryDict | 14 ++++----
.../system/bottomAir/changeDictionaryDict | 16 ++++-----
.../system/topAir/changeDictionaryDict | 14 ++++----
32 files changed, 144 insertions(+), 141 deletions(-)
rename src/finiteVolume/fields/fvPatchFields/derived/{fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.C => buoyantPressure/buoyantPressureFvPatchScalarField.C} (81%)
rename src/finiteVolume/fields/fvPatchFields/derived/{fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.H => buoyantPressure/buoyantPressureFvPatchScalarField.H} (78%)
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index 9c4e9658cc7..0f3dfe450bc 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -58,8 +58,6 @@ else
//+ fvc::ddtPhiCorr(rUA, rho, U, phi)
);
- //bool closedVolume = adjustPhi(phi, U, p);
-
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
{
// Pressure corrector
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
index e1d42d738e8..6408c7ccc80 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
@@ -7,6 +7,7 @@
phi = fvc::interpolate(U) & mesh.Sf();
adjustPhi(phi, U, p);
+
surfaceScalarField buoyancyPhi =
rUAf*fvc::interpolate(rhok)*(g & mesh.Sf());
phi += buoyancyPhi;
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index e680e9421ae..4bbb449df72 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -9,6 +9,7 @@
phi = fvc::interpolate(rho)*(fvc::interpolate(U) & mesh.Sf());
bool closedVolume = adjustPhi(phi, U, p);
+
surfaceScalarField buoyancyPhi =
rhorUAf*fvc::interpolate(rho)*(g & mesh.Sf());
phi += buoyancyPhi;
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
index 493c4e09297..023ecc6d5a7 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
@@ -1,5 +1,9 @@
{
- wordList pcorrTypes(p.boundaryField().types());
+ wordList pcorrTypes
+ (
+ p.boundaryField().size(),
+ zeroGradientFvPatchScalarField::typeName
+ );
for (label i=0; i<p.boundaryField().size(); i++)
{
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 65afde39c2d..176900f0c63 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -104,12 +104,6 @@ int main(int argc, char *argv[])
#include "meshCourantNo.H"
}
- if (mesh.changing())
- {
- gh = g & mesh.C();
- ghf = g & mesh.Cf();
- }
-
turbulence->correct();
// --- Outer-corrector loop
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H b/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H
index 6b8e67cc492..3da1b5e9c19 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H
@@ -46,11 +46,6 @@
#include "createPhi.H"
- Info<< "Calculating field g.h\n" << endl;
- volScalarField gh("gh", g & mesh.C());
- surfaceScalarField ghf("ghf", g & mesh.Cf());
-
-
Info<< "Reading transportProperties\n" << endl;
twoPhaseMixture twoPhaseProperties(U, phi);
@@ -134,7 +129,11 @@
);
- wordList pcorrTypes(p.boundaryField().types());
+ wordList pcorrTypes
+ (
+ p.boundaryField().size(),
+ zeroGradientFvPatchScalarField::typeName
+ );
for (label i=0; i<p.boundaryField().size(); i++)
{
diff --git a/applications/solvers/multiphase/interDyMFoam/correctPhi.H b/applications/solvers/multiphase/interDyMFoam/correctPhi.H
index 1f7845f347d..0854a68b8e3 100644
--- a/applications/solvers/multiphase/interDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interDyMFoam/correctPhi.H
@@ -1,5 +1,5 @@
{
-# include "continuityErrs.H"
+ #include "continuityErrs.H"
volScalarField pcorr
(
@@ -36,5 +36,5 @@
}
}
-# include "continuityErrs.H"
+ #include "continuityErrs.H"
}
diff --git a/applications/solvers/multiphase/interDyMFoam/createFields.H b/applications/solvers/multiphase/interDyMFoam/createFields.H
index 26644e17f47..905ba0d6465 100644
--- a/applications/solvers/multiphase/interDyMFoam/createFields.H
+++ b/applications/solvers/multiphase/interDyMFoam/createFields.H
@@ -92,7 +92,11 @@
incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
);
- wordList pcorrTypes(p.boundaryField().types());
+ wordList pcorrTypes
+ (
+ p.boundaryField().size(),
+ zeroGradientFvPatchScalarField::typeName
+ );
for (label i=0; i<p.boundaryField().size(); i++)
{
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index cf8ec8eb323..466333ff301 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -86,9 +86,6 @@ int main(int argc, char *argv[])
<< " s" << endl;
}
- volScalarField gh("gh", g & mesh.C());
- surfaceScalarField ghf("ghf", g & mesh.Cf());
-
if (mesh.changing() && correctPhi)
{
#include "correctPhi.H"
diff --git a/applications/solvers/multiphase/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interDyMFoam/pEqn.H
index 8825661c830..2af289a76f3 100644
--- a/applications/solvers/multiphase/interDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interDyMFoam/pEqn.H
@@ -5,19 +5,19 @@
U = rAU*UEqn.H();
surfaceScalarField phiU("phiU", (fvc::interpolate(U) & mesh.Sf()));
+ if (p.needReference())
+ {
+ fvc::makeRelative(phiU, U);
+ adjustPhi(phiU, U, p);
+ fvc::makeAbsolute(phiU, U);
+ }
+
phi = phiU +
(
fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)*mesh.magSf()
+ fvc::interpolate(rho)*(g & mesh.Sf())
)*rAUf;
- if (p.needReference())
- {
- fvc::makeRelative(phi, U);
- adjustPhi(phi, U, p);
- fvc::makeAbsolute(phi, U);
- }
-
for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
{
fvScalarMatrix pEqn
diff --git a/applications/solvers/multiphase/interFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/correctPhi.H
index 642aa1c5d2a..0274b7e9ed8 100644
--- a/applications/solvers/multiphase/interFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/correctPhi.H
@@ -1,7 +1,11 @@
{
-# include "continuityErrs.H"
+ #include "continuityErrs.H"
- wordList pcorrTypes(p.boundaryField().types());
+ wordList pcorrTypes
+ (
+ p.boundaryField().size(),
+ zeroGradientFvPatchScalarField::typeName
+ );
for (label i=0; i<p.boundaryField().size(); i++)
{
@@ -46,5 +50,5 @@
}
}
-# include "continuityErrs.H"
+ #include "continuityErrs.H"
}
diff --git a/applications/solvers/multiphase/interFoam/pEqn.H b/applications/solvers/multiphase/interFoam/pEqn.H
index 25482fa9944..7aa172b8584 100644
--- a/applications/solvers/multiphase/interFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/pEqn.H
@@ -7,17 +7,18 @@
surfaceScalarField phiU
(
"phiU",
- (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi)
+ (fvc::interpolate(U) & mesh.Sf())
+ + fvc::ddtPhiCorr(rUA, rho, U, phi)
);
+ adjustPhi(phiU, U, p);
+
phi = phiU +
(
fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)*mesh.magSf()
+ fvc::interpolate(rho)*(g & mesh.Sf())
)*rUAf;
- adjustPhi(phi, U, p);
-
for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
{
fvScalarMatrix pEqn
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
index 642aa1c5d2a..17377302f0e 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
@@ -1,7 +1,11 @@
{
-# include "continuityErrs.H"
+ #include "continuityErrs.H"
- wordList pcorrTypes(p.boundaryField().types());
+ wordList pcorrTypes
+ (
+ p.boundaryField().size(),
+ zeroGradientFvPatchScalarField::typeName
+ );
for (label i=0; i<p.boundaryField().size(); i++)
{
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
index 4f290157f64..3c164cc5743 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
@@ -11,14 +11,14 @@
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
);
+ adjustPhi(phiU, U, p);
+
phi = phiU +
(
fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)*mesh.magSf()
+ fvc::interpolate(rho)*(g & mesh.Sf())
)*rUAf;
- adjustPhi(phi, U, p);
-
Pair<tmp<volScalarField> > vDotP = twoPhaseProperties->vDotP();
const volScalarField& vDotcP = vDotP[0]();
const volScalarField& vDotvP = vDotP[1]();
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
index 9d7e36dc95a..4bec77f950d 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
@@ -10,14 +10,14 @@
(fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi)
);
+ adjustPhi(phiU, U, p);
+
phi = phiU +
(
mixture.surfaceTensionForce()*mesh.magSf()
+ fvc::interpolate(rho)*(g & mesh.Sf())
)*rUAf;
- adjustPhi(phi, U, p);
-
for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
{
fvScalarMatrix pEqn
diff --git a/etc/controlDict b/etc/controlDict
index d7824f102ed..f06bbbd9612 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -424,7 +424,7 @@ DebugSwitches
filteredLinear3 0;
filteredLinear3V 0;
fixedEnthalpy 0;
- fixedFluxBuoyantPressure 0;
+ buoyantPressure 0;
fixedFluxBoussinesqBuoyantPressure 0;
fixedFluxPressure 0;
fixedGradient 0;
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 37b59c523a3..54bfbc7cf6e 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -108,7 +108,7 @@ $(derivedFvPatchFields)/advective/advectiveFvPatchFields.C
$(derivedFvPatchFields)/directMappedFixedValue/directMappedFixedValueFvPatchFields.C
$(derivedFvPatchFields)/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
$(derivedFvPatchFields)/fan/fanFvPatchFields.C
-$(derivedFvPatchFields)/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.C
+$(derivedFvPatchFields)/buoyantPressure/buoyantPressureFvPatchScalarField.C
$(derivedFvPatchFields)/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
$(derivedFvPatchFields)/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.C
$(derivedFvPatchFields)/fixedNormalSlip/fixedNormalSlipFvPatchFields.C
diff --git a/src/finiteVolume/cfdTools/general/include/readPISOControls.H b/src/finiteVolume/cfdTools/general/include/readPISOControls.H
index 5f14c2bcae2..de763e00b0c 100644
--- a/src/finiteVolume/cfdTools/general/include/readPISOControls.H
+++ b/src/finiteVolume/cfdTools/general/include/readPISOControls.H
@@ -13,7 +13,3 @@
int nOuterCorr =
piso.lookupOrDefault<int>("nOuterCorrectors", 1);
-
- bool ddtPhiCorr =
- piso.lookupOrDefault<Switch>("ddtPhiCorr", false);
-
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
similarity index 81%
rename from src/finiteVolume/fields/fvPatchFields/derived/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.C
rename to src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
index 279918b47af..cafc55aa3a5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "fixedFluxBuoyantPressureFvPatchScalarField.H"
+#include "buoyantPressureFvPatchScalarField.H"
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
@@ -36,8 +36,8 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-fixedFluxBuoyantPressureFvPatchScalarField::
-fixedFluxBuoyantPressureFvPatchScalarField
+buoyantPressureFvPatchScalarField::
+buoyantPressureFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@@ -48,8 +48,8 @@ fixedFluxBuoyantPressureFvPatchScalarField
{}
-fixedFluxBuoyantPressureFvPatchScalarField::
-fixedFluxBuoyantPressureFvPatchScalarField
+buoyantPressureFvPatchScalarField::
+buoyantPressureFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@@ -64,10 +64,10 @@ fixedFluxBuoyantPressureFvPatchScalarField
}
-fixedFluxBuoyantPressureFvPatchScalarField::
-fixedFluxBuoyantPressureFvPatchScalarField
+buoyantPressureFvPatchScalarField::
+buoyantPressureFvPatchScalarField
(
- const fixedFluxBuoyantPressureFvPatchScalarField& ptf,
+ const buoyantPressureFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
@@ -78,10 +78,10 @@ fixedFluxBuoyantPressureFvPatchScalarField
{}
-fixedFluxBuoyantPressureFvPatchScalarField::
-fixedFluxBuoyantPressureFvPatchScalarField
+buoyantPressureFvPatchScalarField::
+buoyantPressureFvPatchScalarField
(
- const fixedFluxBuoyantPressureFvPatchScalarField& ptf
+ const buoyantPressureFvPatchScalarField& ptf
)
:
fixedGradientFvPatchScalarField(ptf),
@@ -89,10 +89,10 @@ fixedFluxBuoyantPressureFvPatchScalarField
{}
-fixedFluxBuoyantPressureFvPatchScalarField::
-fixedFluxBuoyantPressureFvPatchScalarField
+buoyantPressureFvPatchScalarField::
+buoyantPressureFvPatchScalarField
(
- const fixedFluxBuoyantPressureFvPatchScalarField& ptf,
+ const buoyantPressureFvPatchScalarField& ptf,
const DimensionedField<scalar, volMesh>& iF
)
:
@@ -103,7 +103,7 @@ fixedFluxBuoyantPressureFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void fixedFluxBuoyantPressureFvPatchScalarField::updateCoeffs()
+void buoyantPressureFvPatchScalarField::updateCoeffs()
{
if (updated())
{
@@ -134,7 +134,7 @@ void fixedFluxBuoyantPressureFvPatchScalarField::updateCoeffs()
}
-void fixedFluxBuoyantPressureFvPatchScalarField::write(Ostream& os) const
+void buoyantPressureFvPatchScalarField::write(Ostream& os) const
{
fixedGradientFvPatchScalarField::write(os);
os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
@@ -147,7 +147,7 @@ void fixedFluxBuoyantPressureFvPatchScalarField::write(Ostream& os) const
makePatchTypeField
(
fvPatchScalarField,
- fixedFluxBuoyantPressureFvPatchScalarField
+ buoyantPressureFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.H
similarity index 78%
rename from src/finiteVolume/fields/fvPatchFields/derived/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.H
rename to src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.H
index ec5dc7dd990..d698487e365 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::fixedFluxBuoyantPressureFvPatchScalarField
+ Foam::buoyantPressureFvPatchScalarField
Description
Set the pressure gradient boundary condition appropriately for buoyant flow.
@@ -32,12 +32,12 @@ Description
appropriately. Otherwise assume the variable is the static pressure.
SourceFiles
- fixedFluxBuoyantPressureFvPatchScalarField.C
+ buoyantPressureFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
-#ifndef fixedFluxBuoyantPressureFvPatchScalarFields_H
-#define fixedFluxBuoyantPressureFvPatchScalarFields_H
+#ifndef buoyantPressureFvPatchScalarFields_H
+#define buoyantPressureFvPatchScalarFields_H
#include "fvPatchFields.H"
#include "fixedGradientFvPatchFields.H"
@@ -48,10 +48,10 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class fixedFluxBuoyantPressureFvPatch Declaration
+ Class buoyantPressureFvPatch Declaration
\*---------------------------------------------------------------------------*/
-class fixedFluxBuoyantPressureFvPatchScalarField
+class buoyantPressureFvPatchScalarField
:
public fixedGradientFvPatchScalarField
{
@@ -64,20 +64,20 @@ class fixedFluxBuoyantPressureFvPatchScalarField
public:
//- Runtime type information
- TypeName("fixedFluxBuoyantPressure");
+ TypeName("buoyantPressure");
// Constructors
//- Construct from patch and internal field
- fixedFluxBuoyantPressureFvPatchScalarField
+ buoyantPressureFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
- fixedFluxBuoyantPressureFvPatchScalarField
+ buoyantPressureFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
@@ -85,19 +85,19 @@ public:
);
//- Construct by mapping given
- // fixedFluxBuoyantPressureFvPatchScalarField onto a new patch
- fixedFluxBuoyantPressureFvPatchScalarField
+ // buoyantPressureFvPatchScalarField onto a new patch
+ buoyantPressureFvPatchScalarField
(
- const fixedFluxBuoyantPressureFvPatchScalarField&,
+ const buoyantPressureFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
- fixedFluxBuoyantPressureFvPatchScalarField
+ buoyantPressureFvPatchScalarField
(
- const fixedFluxBuoyantPressureFvPatchScalarField&
+ const buoyantPressureFvPatchScalarField&
);
//- Construct and return a clone
@@ -105,14 +105,14 @@ public:
{
return tmp<fvPatchScalarField>
(
- new fixedFluxBuoyantPressureFvPatchScalarField(*this)
+ new buoyantPressureFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
- fixedFluxBuoyantPressureFvPatchScalarField
+ buoyantPressureFvPatchScalarField
(
- const fixedFluxBuoyantPressureFvPatchScalarField&,
+ const buoyantPressureFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@@ -124,7 +124,7 @@ public:
{
return tmp<fvPatchScalarField>
(
- new fixedFluxBuoyantPressureFvPatchScalarField(*this, iF)
+ new buoyantPressureFvPatchScalarField(*this, iF)
);
}
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/p
index 2014ca6e8c0..502fb88dfaf 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/p
@@ -22,21 +22,21 @@ boundaryField
{
floor
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
rho rhok;
value uniform 0;
}
ceiling
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
rho rhok;
value uniform 0;
}
fixedWalls
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
rho rhok;
value uniform 0;
}
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
index 2014ca6e8c0..502fb88dfaf 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
@@ -22,21 +22,21 @@ boundaryField
{
floor
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
rho rhok;
value uniform 0;
}
ceiling
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
rho rhok;
value uniform 0;
}
fixedWalls
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
rho rhok;
value uniform 0;
}
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
index 2b90b18e74e..6835a61b125 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
@@ -22,28 +22,28 @@ boundaryField
{
ground
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
rho rhok;
value uniform 0;
}
igloo_region0
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
rho rhok;
value uniform 0;
}
twoFridgeFreezers_seal_0
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
rho rhok;
value uniform 0;
}
twoFridgeFreezers_herring_1
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
rho rhok;
value uniform 0;
}
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/p
index 188522464ac..349cfb544ec 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/p
@@ -22,19 +22,19 @@ boundaryField
{
floor
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 1e5;
}
ceiling
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 1e5;
}
fixedWalls
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 1e5;
}
}
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p
index 188522464ac..349cfb544ec 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p
@@ -22,19 +22,19 @@ boundaryField
{
floor
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 1e5;
}
ceiling
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 1e5;
}
fixedWalls
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 1e5;
}
}
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
index bb1ff51259a..f36884c5b2b 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
@@ -22,25 +22,25 @@ boundaryField
{
floor
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 100000;
}
ceiling
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 100000;
}
fixedWalls
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 100000;
}
box
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 100000;
}
}
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p
index bb1ff51259a..f36884c5b2b 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p
@@ -22,25 +22,25 @@ boundaryField
{
floor
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 100000;
}
ceiling
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 100000;
}
fixedWalls
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 100000;
}
box
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value uniform 100000;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
index 8a2a5d0a878..385ded3bb38 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
@@ -22,33 +22,33 @@ boundaryField
{
minX
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
maxX
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
minY
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
maxY
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
minZ
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
maxZ
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
index 7ee62d4bd7a..6c80174e355 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -232,42 +232,42 @@ dictionaryReplacement
{
minX
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
maxX
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
minY
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
minZ
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
maxZ
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
bottomAir_to_leftSolid
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
bottomAir_to_heater
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
bottomAir_to_rightSolid
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index f4f44ee6d49..a437f44d5d5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -231,7 +231,7 @@ dictionaryReplacement
{
minX
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
maxX
@@ -249,34 +249,34 @@ dictionaryReplacement
minY
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
minZ
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
maxZ
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
topAir_to_leftSolid
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
topAir_to_heater
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
topAir_to_rightSolid
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
}
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/changeDictionaryDict b/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/changeDictionaryDict
index afb08c33c83..f3d186d1e81 100644
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/changeDictionaryDict
+++ b/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/changeDictionaryDict
@@ -255,42 +255,42 @@ dictionaryReplacement
{
minX
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
maxX
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
minY
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
minZ
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
maxZ
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
bottomAir_to_leftSolid
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
bottomAir_to_heater
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
bottomAir_to_rightSolid
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
}
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/changeDictionaryDict b/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/changeDictionaryDict
index 51104c879f1..ad82755773e 100644
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/changeDictionaryDict
+++ b/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/changeDictionaryDict
@@ -265,7 +265,7 @@ dictionaryReplacement
{
minX
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
maxX
@@ -283,34 +283,34 @@ dictionaryReplacement
maxY
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
minZ
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
maxZ
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
topAir_to_leftSolid
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
topAir_to_heater
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
topAir_to_rightSolid
{
- type fixedFluxBuoyantPressure;
+ type buoyantPressure;
value 1e5;
}
}
--
GitLab