From 046f740f0e25445fc3b37fcf4212b1e2b3daf9cf Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 20 Aug 2013 15:40:00 +0100
Subject: [PATCH] Renamed relativeFlux -> makeRelative and absoluteFlux ->
makeAbsolute
---
.../basic/potentialFoam/potentialFoam.C | 4 +--
applications/solvers/combustion/XiFoam/pEqn.H | 4 +--
.../solvers/combustion/engineFoam/pEqn.H | 4 +--
.../solvers/combustion/fireFoam/pEqn.H | 2 +-
.../solvers/combustion/reactingFoam/pEqn.H | 4 +--
.../rhoReactingBuoyantFoam/pEqn.H | 2 +-
.../reactingFoam/rhoReactingFoam/pEqn.H | 4 +--
.../solvers/compressible/rhoPimpleFoam/pEqn.H | 4 +--
.../rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H | 4 +--
.../rhoPimpleFoam/rhoPimplecFoam/pEqn.H | 4 +--
.../solvers/compressible/rhoSimpleFoam/pEqn.H | 4 +--
.../rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H | 2 +-
.../heatTransfer/buoyantPimpleFoam/pEqn.H | 2 +-
.../heatTransfer/buoyantSimpleFoam/pEqn.H | 2 +-
.../chtMultiRegionSimpleFoam/fluid/pEqn.H | 2 +-
.../chtMultiRegionFoam/fluid/pEqn.H | 2 +-
.../solvers/incompressible/pimpleFoam/pEqn.H | 2 +-
.../solvers/incompressible/simpleFoam/pEqn.H | 2 +-
.../simpleFoam/porousSimpleFoam/pEqn.H | 2 +-
.../lagrangian/coalChemistryFoam/pEqn.H | 4 +--
.../lagrangian/reactingParcelFilmFoam/pEqn.H | 2 +-
.../lagrangian/reactingParcelFoam/pEqn.H | 2 +-
.../simpleReactingParcelFoam/pEqn.H | 2 +-
.../solvers/lagrangian/sprayFoam/pEqn.H | 4 +--
.../sprayFoam/sprayEngineFoam/pEqn.H | 4 +--
.../multiphase/interFoam/MRFInterFoam/pEqn.H | 2 +-
.../multiphase/multiphaseEulerFoam/pEqn.H | 10 +++----
.../phaseModel/phaseModel/phaseModel.C | 2 ++
.../MRFMultiphaseInterFoam/pEqn.H | 2 +-
.../potentialFreeSurfaceFoam/pEqn.H | 2 +-
.../multiphase/twoPhaseEulerFoam/pEqn.H | 29 +++++++------------
.../twoPhaseSystem/phaseModel/phaseModel.C | 2 ++
applications/test/RhoPimpleFoam/pEqn.H | 4 +--
.../cfdTools/general/MRF/MRFZone.C | 8 ++---
.../cfdTools/general/MRF/MRFZone.H | 8 ++---
.../cfdTools/general/MRF/MRFZoneList.C | 16 +++++-----
.../cfdTools/general/MRF/MRFZoneList.H | 8 ++---
src/fvOptions/fvOptions/fvOption.C | 8 ++---
src/fvOptions/fvOptions/fvOption.H | 8 ++---
src/fvOptions/fvOptions/fvOptionList.C | 16 +++++-----
src/fvOptions/fvOptions/fvOptionList.H | 8 ++---
.../sources/derived/MRFSource/MRFSource.C | 16 +++++-----
.../sources/derived/MRFSource/MRFSource.H | 8 ++---
43 files changed, 114 insertions(+), 117 deletions(-)
diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C
index fbe29e652ff..b4951e5b0c9 100644
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
// function objects so do it ourselves
runTime.functionObjects().start();
- fvOptions.relativeFlux(phi);
+ fvOptions.makeRelative(phi);
adjustPhi(phi, U, p);
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
}
}
- fvOptions.absoluteFlux(phi);
+ fvOptions.makeAbsolute(phi);
Info<< "continuity error = "
<< mag(fvc::div(phi))().weightedAverage(mesh.V()).value()
diff --git a/applications/solvers/combustion/XiFoam/pEqn.H b/applications/solvers/combustion/XiFoam/pEqn.H
index 76cfbc4658b..c1effcd60d0 100644
--- a/applications/solvers/combustion/XiFoam/pEqn.H
+++ b/applications/solvers/combustion/XiFoam/pEqn.H
@@ -16,7 +16,7 @@ if (pimple.transonic())
)
);
- fvOptions.relativeFlux(fvc::interpolate(psi), phid);
+ fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (pimple.correctNonOrthogonal())
{
@@ -51,7 +51,7 @@ else
)
);
- fvOptions.relativeFlux(phiHbyA);
+ fvOptions.makeRelative(phiHbyA);
while (pimple.correctNonOrthogonal())
{
diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/engineFoam/pEqn.H
index 6bb80b1eaff..39939333c20 100644
--- a/applications/solvers/combustion/engineFoam/pEqn.H
+++ b/applications/solvers/combustion/engineFoam/pEqn.H
@@ -13,7 +13,7 @@ if (pimple.transonic())
*((fvc::interpolate(HbyA) & mesh.Sf()) - fvc::meshPhi(rho, U))
);
- fvOptions.relativeFlux(fvc::interpolate(psi), phid);
+ fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (pimple.correctNonOrthogonal())
{
@@ -45,7 +45,7 @@ else
*((fvc::interpolate(HbyA) & mesh.Sf()) - fvc::meshPhi(rho, U))
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
while (pimple.correctNonOrthogonal())
{
diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H
index 4fa4799ff20..9953e83007a 100644
--- a/applications/solvers/combustion/fireFoam/pEqn.H
+++ b/applications/solvers/combustion/fireFoam/pEqn.H
@@ -21,7 +21,7 @@ surfaceScalarField phiHbyA
+ phig
);
-fvOptions.relativeFlux(phiHbyA);
+fvOptions.makeRelative(phiHbyA);
while (pimple.correctNonOrthogonal())
{
diff --git a/applications/solvers/combustion/reactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/pEqn.H
index 9172736266b..0a8a6ce9d04 100644
--- a/applications/solvers/combustion/reactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pEqn.H
@@ -16,7 +16,7 @@ if (pimple.transonic())
)
);
- fvOptions.relativeFlux(fvc::interpolate(psi), phid);
+ fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (pimple.correctNonOrthogonal())
{
@@ -51,7 +51,7 @@ else
)
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
while (pimple.correctNonOrthogonal())
{
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
index 9b5d81522a5..7f312e5030e 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
@@ -24,7 +24,7 @@
+ phig
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
fvScalarMatrix p_rghDDtEqn
(
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
index 7a5c717cff7..461e1ca8fbe 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
@@ -18,7 +18,7 @@
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
- fvOptions.relativeFlux(phiHbyA);
+ fvOptions.makeRelative(phiHbyA);
surfaceScalarField phid("phid", fvc::interpolate(thermo.psi())*phiHbyA);
@@ -62,7 +62,7 @@
)
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
fvScalarMatrix pDDtEqn
(
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index 78f4ddb0316..fcc40881a1d 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -24,7 +24,7 @@ if (pimple.transonic())
)
);
- fvOptions.relativeFlux(fvc::interpolate(psi), phid);
+ fvOptions.makeRelative(fvc::interpolate(psi), phid);
volScalarField Dp("Dp", rho*rAU);
@@ -61,7 +61,7 @@ else
)
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
volScalarField Dp("Dp", rho*rAU);
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
index 7b4118658bd..c1ceb88c174 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
@@ -24,7 +24,7 @@ if (pimple.transonic())
)
);
- fvOptions.relativeFlux(fvc::interpolate(psi), phid);
+ fvOptions.makeRelative(fvc::interpolate(psi), phid);
volScalarField Dp("Dp", rho*rAU);
@@ -62,7 +62,7 @@ else
)
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
volScalarField Dp("Dp", rho*rAU);
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
index 7d843b62e04..de09cb53e22 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
@@ -25,7 +25,7 @@ if (pimple.transonic())
)
);
- fvOptions.relativeFlux(fvc::interpolate(psi), phid);
+ fvOptions.makeRelative(fvc::interpolate(psi), phid);
surfaceScalarField phic
(
@@ -71,7 +71,7 @@ else
)
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
phiHbyA += fvc::interpolate(rho*(rAtU - rAU))*fvc::snGrad(p)*mesh.magSf();
HbyA -= (rAU - rAtU)*fvc::grad(p);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index 0f5bbdb1629..364d26a50b3 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -15,7 +15,7 @@
fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
);
- fvOptions.relativeFlux(fvc::interpolate(psi), phid);
+ fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (simple.correctNonOrthogonal())
{
@@ -50,7 +50,7 @@
fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
closedVolume = adjustPhi(phiHbyA, U, p);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
index 2d9a8f40d4e..229579ea313 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
@@ -22,7 +22,7 @@
fvc::interpolate(rho*HbyA) & mesh.Sf()
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
closedVolume = adjustPhi(phiHbyA, U, p);
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
index 92643394f9c..cc66c5cca09 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@@ -24,7 +24,7 @@
+ phig
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
fvScalarMatrix p_rghDDtEqn
(
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index 91d6eaf84e4..482642bde81 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -17,7 +17,7 @@
fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
bool closedVolume = adjustPhi(phiHbyA, U, p_rgh);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
index 161dff5447c..6e14684ee6e 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
@@ -19,7 +19,7 @@
fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
bool closedVolume = adjustPhi(phiHbyA, U, p_rgh);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
index 58ee6ae1b4d..d5346be47d2 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
@@ -24,7 +24,7 @@
+ phig
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
{
fvScalarMatrix p_rghDDtEqn
diff --git a/applications/solvers/incompressible/pimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pEqn.H
index f085e548cea..a7f5edf1a62 100644
--- a/applications/solvers/incompressible/pimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pEqn.H
@@ -13,7 +13,7 @@ surfaceScalarField phiHbyA
+ fvc::ddtPhiCorr(rAU, U, phi)
);
-fvOptions.relativeFlux(phiHbyA);
+fvOptions.makeRelative(phiHbyA);
adjustPhi(phiHbyA, U, p);
diff --git a/applications/solvers/incompressible/simpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/pEqn.H
index 9bd829d3f1c..4d669c8db22 100644
--- a/applications/solvers/incompressible/simpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/pEqn.H
@@ -6,7 +6,7 @@
surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
- fvOptions.relativeFlux(phiHbyA);
+ fvOptions.makeRelative(phiHbyA);
adjustPhi(phiHbyA, U, p);
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
index bb906cc8c66..07497dccc56 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
@@ -11,7 +11,7 @@ else
UEqn.clear();
surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
-mrfZones.relativeFlux(phiHbyA);
+mrfZones.makeRelative(phiHbyA);
adjustPhi(phiHbyA, U, p);
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
index 03e9033edb3..82f1e9ff634 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
@@ -16,7 +16,7 @@ if (pimple.transonic())
)
);
- fvOptions.relativeFlux(fvc::interpolate(psi), phid);
+ fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (pimple.correctNonOrthogonal())
{
@@ -52,7 +52,7 @@ else
)
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
while (pimple.correctNonOrthogonal())
{
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
index 26c3a6f0625..7df99b9b94f 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
@@ -18,7 +18,7 @@ surfaceScalarField phiHbyA
+ phig
);
-fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
while (pimple.correctNonOrthogonal())
{
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
index fb2e125a581..6dd16f0bdb9 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
@@ -19,7 +19,7 @@
)
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
fvScalarMatrix pDDtEqn
(
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
index 0d1aa2e2387..66ac4989231 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
@@ -17,7 +17,7 @@
fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
while (simple.correctNonOrthogonal())
{
diff --git a/applications/solvers/lagrangian/sprayFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/pEqn.H
index 590e00d81fc..af65d3016bb 100644
--- a/applications/solvers/lagrangian/sprayFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/pEqn.H
@@ -16,7 +16,7 @@ if (pimple.transonic())
)
);
- fvOptions.relativeFlux(fvc::interpolate(psi), phid);
+ fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (pimple.correctNonOrthogonal())
{
@@ -52,7 +52,7 @@ else
)
);
- fvOptions.relativeFlux(fvc::interpolate(psi), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(psi), phiHbyA);
while (pimple.correctNonOrthogonal())
{
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
index b7998b9e848..cf7acbd602e 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
@@ -16,7 +16,7 @@ if (pimple.transonic())
)
);
- fvOptions.relativeFlux(fvc::interpolate(psi), phid);
+ fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (pimple.correctNonOrthogonal())
{
@@ -52,7 +52,7 @@ else
)
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
while (pimple.correctNonOrthogonal())
{
diff --git a/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H b/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
index f5f349f2274..5d2acc8b684 100644
--- a/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
@@ -12,7 +12,7 @@
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
adjustPhi(phiHbyA, U, p_rgh);
- mrfZones.relativeFlux(phiHbyA);
+ mrfZones.makeRelative(phiHbyA);
phi = phiHbyA;
surfaceScalarField phig
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index edca66903e0..8677157de4c 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -35,8 +35,8 @@
{
phaseModel& phase = iter();
- mrfZones.absoluteFlux(phase.phi().oldTime());
- mrfZones.absoluteFlux(phase.phi());
+ mrfZones.makeAbsolute(phase.phi().oldTime());
+ mrfZones.makeAbsolute(phase.phi());
HbyAs.set(phasei, new volVectorField(phase.U()));
phiHbyAs.set(phasei, new surfaceScalarField(1.0*phase.phi()));
@@ -96,7 +96,7 @@
(fvc::interpolate(HbyAs[phasei]) & mesh.Sf())
+ fvc::ddtPhiCorr(rAUs[phasei], alpha, phase.U(), phase.phi())
);
- mrfZones.relativeFlux(phiHbyAs[phasei]);
+ mrfZones.makeRelative(phiHbyAs[phasei]);
phiHbyAs[phasei] +=
rAlphaAUfs[phasei]
@@ -168,8 +168,8 @@
phase.phi().boundaryField() ==
(mesh.Sf().boundaryField() & phase.U().boundaryField());
- mrfZones.relativeFlux(phase.phi().oldTime());
- mrfZones.relativeFlux(phase.phi());
+ mrfZones.makeRelative(phase.phi().oldTime());
+ mrfZones.makeRelative(phase.phi());
// Update phi BCs before pEqn
phi.boundaryField() +=
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.C
index f74ef12513c..a4c5a87bbe1 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.C
@@ -27,6 +27,7 @@ License
#include "diameterModel.H"
#include "fixedValueFvPatchFields.H"
#include "slipFvPatchFields.H"
+#include "partialSlipFvPatchFields.H"
#include "surfaceInterpolate.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -157,6 +158,7 @@ Foam::phaseModel::phaseModel
(
isA<fixedValueFvPatchVectorField>(U_.boundaryField()[i])
|| isA<slipFvPatchVectorField>(U_.boundaryField()[i])
+ || isA<partialSlipFvPatchVectorField>(U_.boundaryField()[i])
)
{
phiTypes[i] = fixedValueFvPatchScalarField::typeName;
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
index 823216897c8..e7f4c3ac8ee 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
@@ -12,7 +12,7 @@
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
adjustPhi(phiHbyA, U, p_rgh);
- mrfZones.relativeFlux(phiHbyA);
+ mrfZones.makeRelative(phiHbyA);
phi = phiHbyA;
surfaceScalarField phig
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
index 11dfa8a5200..024598673f0 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
@@ -18,7 +18,7 @@ surfaceScalarField phiHbyA
adjustPhi(phiHbyA, U, p_gh);
-fvOptions.relativeFlux(phiHbyA);
+fvOptions.makeRelative(phiHbyA);
// Update the phi BCs from U before p BCs are updated
phi.boundaryField() = mesh.Sf().boundaryField() & U.boundaryField();
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
index 256769674b2..864b9c7afb7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
@@ -8,13 +8,6 @@
surfaceScalarField rAlphaAU1f(fvc::interpolate(alpha1*rAU1));
surfaceScalarField rAlphaAU2f(fvc::interpolate(alpha2*rAU2));
- // Update the phi BCs from Us before p BCs are updated
- phi.boundaryField() =
- alpha1f.boundaryField()
- *(mesh.Sf().boundaryField() & U1.boundaryField())
- + alpha2f.boundaryField()
- *(mesh.Sf().boundaryField() & U2.boundaryField());
-
volVectorField HbyA1
(
IOobject::groupName("HbyA", phase1.name()),
@@ -29,10 +22,10 @@
);
HbyA2 = rAU2*U2Eqn.H();
- mrfZones.absoluteFlux(phi1.oldTime());
- mrfZones.absoluteFlux(phi1);
- mrfZones.absoluteFlux(phi2.oldTime());
- mrfZones.absoluteFlux(phi2);
+ mrfZones.makeAbsolute(phi1.oldTime());
+ mrfZones.makeAbsolute(phi1);
+ mrfZones.makeAbsolute(phi2.oldTime());
+ mrfZones.makeAbsolute(phi2);
// Phase-1 pressure flux (e.g. due to particle-particle pressure)
surfaceScalarField phiP1
@@ -65,7 +58,7 @@
);
phi = alpha1f*phiHbyA1 + alpha2f*phiHbyA2;
- mrfZones.relativeFlux(phi);
+ mrfZones.makeRelative(phi);
phiHbyA1 +=
(
@@ -73,7 +66,7 @@
- phiP1
+ rAlphaAU1f*(g & mesh.Sf())
);
- mrfZones.relativeFlux(phiHbyA1);
+ mrfZones.makeRelative(phiHbyA1);
phiHbyA2 +=
(
@@ -81,12 +74,12 @@
- phiP2
+ rAlphaAU2f*(g & mesh.Sf())
);
- mrfZones.relativeFlux(phiHbyA2);
+ mrfZones.makeRelative(phiHbyA2);
- mrfZones.relativeFlux(phi1.oldTime());
- mrfZones.relativeFlux(phi1);
- mrfZones.relativeFlux(phi2.oldTime());
- mrfZones.relativeFlux(phi2);
+ mrfZones.makeRelative(phi1.oldTime());
+ mrfZones.makeRelative(phi1);
+ mrfZones.makeRelative(phi2.oldTime());
+ mrfZones.makeRelative(phi2);
surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
index e0275a62382..697371c0444 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
@@ -30,6 +30,7 @@ License
#include "heatTransferModel.H"
#include "fixedValueFvPatchFields.H"
#include "slipFvPatchFields.H"
+#include "partialSlipFvPatchFields.H"
#include "surfaceInterpolate.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -122,6 +123,7 @@ Foam::phaseModel::phaseModel
(
isA<fixedValueFvPatchVectorField>(U_.boundaryField()[i])
|| isA<slipFvPatchVectorField>(U_.boundaryField()[i])
+ || isA<partialSlipFvPatchVectorField>(U_.boundaryField()[i])
)
{
phiTypes[i] = fixedValueFvPatchScalarField::typeName;
diff --git a/applications/test/RhoPimpleFoam/pEqn.H b/applications/test/RhoPimpleFoam/pEqn.H
index 78f4ddb0316..fcc40881a1d 100644
--- a/applications/test/RhoPimpleFoam/pEqn.H
+++ b/applications/test/RhoPimpleFoam/pEqn.H
@@ -24,7 +24,7 @@ if (pimple.transonic())
)
);
- fvOptions.relativeFlux(fvc::interpolate(psi), phid);
+ fvOptions.makeRelative(fvc::interpolate(psi), phid);
volScalarField Dp("Dp", rho*rAU);
@@ -61,7 +61,7 @@ else
)
);
- fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
+ fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
volScalarField Dp("Dp", rho*rAU);
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index 15c7e6cb0e6..f1c03482a77 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -499,13 +499,13 @@ void Foam::MRFZone::absoluteVelocity(volVectorField& U) const
}
-void Foam::MRFZone::relativeFlux(surfaceScalarField& phi) const
+void Foam::MRFZone::makeRelative(surfaceScalarField& phi) const
{
relativeRhoFlux(geometricOneField(), phi);
}
-void Foam::MRFZone::relativeFlux
+void Foam::MRFZone::makeRelative
(
const surfaceScalarField& rho,
surfaceScalarField& phi
@@ -515,13 +515,13 @@ void Foam::MRFZone::relativeFlux
}
-void Foam::MRFZone::absoluteFlux(surfaceScalarField& phi) const
+void Foam::MRFZone::makeAbsolute(surfaceScalarField& phi) const
{
absoluteRhoFlux(geometricOneField(), phi);
}
-void Foam::MRFZone::absoluteFlux
+void Foam::MRFZone::makeAbsolute
(
const surfaceScalarField& rho,
surfaceScalarField& phi
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index 5d379f2e40a..22559deb385 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -214,20 +214,20 @@ public:
void absoluteVelocity(volVectorField& U) const;
//- Make the given absolute flux relative within the MRF region
- void relativeFlux(surfaceScalarField& phi) const;
+ void makeRelative(surfaceScalarField& phi) const;
//- Make the given absolute mass-flux relative within the MRF region
- void relativeFlux
+ void makeRelative
(
const surfaceScalarField& rho,
surfaceScalarField& phi
) const;
//- Make the given relative flux absolute within the MRF region
- void absoluteFlux(surfaceScalarField& phi) const;
+ void makeAbsolute(surfaceScalarField& phi) const;
//- Make the given relative mass-flux absolute within the MRF region
- void absoluteFlux
+ void makeAbsolute
(
const surfaceScalarField& rho,
surfaceScalarField& phi
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
index 9d111be3807..fcc18322a0b 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
@@ -178,16 +178,16 @@ void Foam::MRFZoneList::absoluteVelocity(volVectorField& U) const
}
-void Foam::MRFZoneList::relativeFlux(surfaceScalarField& phi) const
+void Foam::MRFZoneList::makeRelative(surfaceScalarField& phi) const
{
forAll(*this, i)
{
- operator[](i).relativeFlux(phi);
+ operator[](i).makeRelative(phi);
}
}
-void Foam::MRFZoneList::relativeFlux
+void Foam::MRFZoneList::makeRelative
(
const surfaceScalarField& rho,
surfaceScalarField& phi
@@ -195,21 +195,21 @@ void Foam::MRFZoneList::relativeFlux
{
forAll(*this, i)
{
- operator[](i).relativeFlux(rho, phi);
+ operator[](i).makeRelative(rho, phi);
}
}
-void Foam::MRFZoneList::absoluteFlux(surfaceScalarField& phi) const
+void Foam::MRFZoneList::makeAbsolute(surfaceScalarField& phi) const
{
forAll(*this, i)
{
- operator[](i).absoluteFlux(phi);
+ operator[](i).makeAbsolute(phi);
}
}
-void Foam::MRFZoneList::absoluteFlux
+void Foam::MRFZoneList::makeAbsolute
(
const surfaceScalarField& rho,
surfaceScalarField& phi
@@ -217,7 +217,7 @@ void Foam::MRFZoneList::absoluteFlux
{
forAll(*this, i)
{
- operator[](i).absoluteFlux(rho, phi);
+ operator[](i).makeAbsolute(rho, phi);
}
}
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
index a2311c52c89..7db0d19686a 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
@@ -109,20 +109,20 @@ public:
void absoluteVelocity(volVectorField& U) const;
//- Make the given absolute flux relative within the MRF region
- void relativeFlux(surfaceScalarField& phi) const;
+ void makeRelative(surfaceScalarField& phi) const;
//- Make the given absolute mass-flux relative within the MRF region
- void relativeFlux
+ void makeRelative
(
const surfaceScalarField& rho,
surfaceScalarField& phi
) const;
//- Make the given relative flux absolute within the MRF region
- void absoluteFlux(surfaceScalarField& phi) const;
+ void makeAbsolute(surfaceScalarField& phi) const;
//- Make the given relative mass-flux absolute within the MRF region
- void absoluteFlux
+ void makeAbsolute
(
const surfaceScalarField& rho,
surfaceScalarField& phi
diff --git a/src/fvOptions/fvOptions/fvOption.C b/src/fvOptions/fvOptions/fvOption.C
index bc68775f083..0751b64c77a 100644
--- a/src/fvOptions/fvOptions/fvOption.C
+++ b/src/fvOptions/fvOptions/fvOption.C
@@ -474,13 +474,13 @@ void Foam::fv::option::setValue(fvMatrix<tensor>& eqn, const label fieldI)
}
-void Foam::fv::option::relativeFlux(surfaceScalarField& phi) const
+void Foam::fv::option::makeRelative(surfaceScalarField& phi) const
{
// do nothing
}
-void Foam::fv::option::relativeFlux
+void Foam::fv::option::makeRelative
(
const surfaceScalarField& rho,
surfaceScalarField& phi
@@ -490,13 +490,13 @@ void Foam::fv::option::relativeFlux
}
-void Foam::fv::option::absoluteFlux(surfaceScalarField& phi) const
+void Foam::fv::option::makeAbsolute(surfaceScalarField& phi) const
{
// do nothing
}
-void Foam::fv::option::absoluteFlux
+void Foam::fv::option::makeAbsolute
(
const surfaceScalarField& rho,
surfaceScalarField& phi
diff --git a/src/fvOptions/fvOptions/fvOption.H b/src/fvOptions/fvOptions/fvOption.H
index a3cb760f5f9..0f8896827bf 100644
--- a/src/fvOptions/fvOptions/fvOption.H
+++ b/src/fvOptions/fvOptions/fvOption.H
@@ -425,20 +425,20 @@ public:
// Flux manipulations
//- Make the given absolute flux relative
- virtual void relativeFlux(surfaceScalarField& phi) const;
+ virtual void makeRelative(surfaceScalarField& phi) const;
//- Make the given absolute mass-flux relative
- virtual void relativeFlux
+ virtual void makeRelative
(
const surfaceScalarField& rho,
surfaceScalarField& phi
) const;
//- Make the given relative flux absolute
- virtual void absoluteFlux(surfaceScalarField& phi) const;
+ virtual void makeAbsolute(surfaceScalarField& phi) const;
//- Make the given relative mass-flux absolute
- virtual void absoluteFlux
+ virtual void makeAbsolute
(
const surfaceScalarField& rho,
surfaceScalarField& phi
diff --git a/src/fvOptions/fvOptions/fvOptionList.C b/src/fvOptions/fvOptions/fvOptionList.C
index e5736a29359..5329aa1243d 100644
--- a/src/fvOptions/fvOptions/fvOptionList.C
+++ b/src/fvOptions/fvOptions/fvOptionList.C
@@ -107,16 +107,16 @@ void Foam::fv::optionList::reset(const dictionary& dict)
}
-void Foam::fv::optionList::relativeFlux(surfaceScalarField& phi) const
+void Foam::fv::optionList::makeRelative(surfaceScalarField& phi) const
{
forAll(*this, i)
{
- this->operator[](i).relativeFlux(phi);
+ this->operator[](i).makeRelative(phi);
}
}
-void Foam::fv::optionList::relativeFlux
+void Foam::fv::optionList::makeRelative
(
const surfaceScalarField& rho,
surfaceScalarField& phi
@@ -124,21 +124,21 @@ void Foam::fv::optionList::relativeFlux
{
forAll(*this, i)
{
- this->operator[](i).relativeFlux(rho, phi);
+ this->operator[](i).makeRelative(rho, phi);
}
}
-void Foam::fv::optionList::absoluteFlux(surfaceScalarField& phi) const
+void Foam::fv::optionList::makeAbsolute(surfaceScalarField& phi) const
{
forAll(*this, i)
{
- this->operator[](i).absoluteFlux(phi);
+ this->operator[](i).makeAbsolute(phi);
}
}
-void Foam::fv::optionList::absoluteFlux
+void Foam::fv::optionList::makeAbsolute
(
const surfaceScalarField& rho,
surfaceScalarField& phi
@@ -146,7 +146,7 @@ void Foam::fv::optionList::absoluteFlux
{
forAll(*this, i)
{
- this->operator[](i).absoluteFlux(rho, phi);
+ this->operator[](i).makeAbsolute(rho, phi);
}
}
diff --git a/src/fvOptions/fvOptions/fvOptionList.H b/src/fvOptions/fvOptions/fvOptionList.H
index 6ee2b32cc94..0d5b6abdb53 100644
--- a/src/fvOptions/fvOptions/fvOptionList.H
+++ b/src/fvOptions/fvOptions/fvOptionList.H
@@ -157,20 +157,20 @@ public:
// Flux manipulations
//- Make the given absolute flux relative
- void relativeFlux(surfaceScalarField& phi) const;
+ void makeRelative(surfaceScalarField& phi) const;
//- Make the given absolute mass-flux relative
- void relativeFlux
+ void makeRelative
(
const surfaceScalarField& rho,
surfaceScalarField& phi
) const;
//- Make the given relative flux absolute
- void absoluteFlux(surfaceScalarField& phi) const;
+ void makeAbsolute(surfaceScalarField& phi) const;
//- Make the given relative mass-flux absolute
- void absoluteFlux
+ void makeAbsolute
(
const surfaceScalarField& rho,
surfaceScalarField& phi
diff --git a/src/fvOptions/sources/derived/MRFSource/MRFSource.C b/src/fvOptions/sources/derived/MRFSource/MRFSource.C
index b3eaa5eafd4..d61e10f3627 100644
--- a/src/fvOptions/sources/derived/MRFSource/MRFSource.C
+++ b/src/fvOptions/sources/derived/MRFSource/MRFSource.C
@@ -120,35 +120,35 @@ void Foam::fv::MRFSource::addSup
}
-void Foam::fv::MRFSource::relativeFlux(surfaceScalarField& phi) const
+void Foam::fv::MRFSource::makeRelative(surfaceScalarField& phi) const
{
- mrfPtr_->relativeFlux(phi);
+ mrfPtr_->makeRelative(phi);
}
-void Foam::fv::MRFSource::relativeFlux
+void Foam::fv::MRFSource::makeRelative
(
const surfaceScalarField& rho,
surfaceScalarField& phi
) const
{
- mrfPtr_->relativeFlux(rho, phi);
+ mrfPtr_->makeRelative(rho, phi);
}
-void Foam::fv::MRFSource::absoluteFlux(surfaceScalarField& phi) const
+void Foam::fv::MRFSource::makeAbsolute(surfaceScalarField& phi) const
{
- mrfPtr_->absoluteFlux(phi);
+ mrfPtr_->makeAbsolute(phi);
}
-void Foam::fv::MRFSource::absoluteFlux
+void Foam::fv::MRFSource::makeAbsolute
(
const surfaceScalarField& rho,
surfaceScalarField& phi
) const
{
- mrfPtr_->absoluteFlux(rho, phi);
+ mrfPtr_->makeAbsolute(rho, phi);
}
diff --git a/src/fvOptions/sources/derived/MRFSource/MRFSource.H b/src/fvOptions/sources/derived/MRFSource/MRFSource.H
index 7dccdf8c7cd..0b3da28cc40 100644
--- a/src/fvOptions/sources/derived/MRFSource/MRFSource.H
+++ b/src/fvOptions/sources/derived/MRFSource/MRFSource.H
@@ -138,20 +138,20 @@ public:
// Flux manipulations
//- Make the given absolute flux relative
- virtual void relativeFlux(surfaceScalarField& phi) const;
+ virtual void makeRelative(surfaceScalarField& phi) const;
//- Make the given absolute mass-flux relative
- virtual void relativeFlux
+ virtual void makeRelative
(
const surfaceScalarField& rho,
surfaceScalarField& phi
) const;
//- Make the given relative flux absolute
- virtual void absoluteFlux(surfaceScalarField& phi) const;
+ virtual void makeAbsolute(surfaceScalarField& phi) const;
//- Make the given relative mass-flux absolute
- virtual void absoluteFlux
+ virtual void makeAbsolute
(
const surfaceScalarField& rho,
surfaceScalarField& phi
--
GitLab