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

Renamed relativeFlux -> makeRelative and absoluteFlux -> makeAbsolute

Browse Source
This commit is contained in:
Henry
2013-08-20 15:40:00 +01:00
parent 0175bc3615
commit 046f740f0e
43 changed files with 114 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/basic/potentialFoam/potentialFoam.C
View File

@ -59,7 +59,7 @@ int main(int argc, char *argv[])
// function objects so do it ourselves // function objects so do it ourselves
runTime.functionObjects().start(); runTime.functionObjects().start();
fvOptions.relativeFlux(phi); fvOptions.makeRelative(phi);
adjustPhi(phi, U, p); adjustPhi(phi, U, p);
@ -91,7 +91,7 @@ int main(int argc, char *argv[])
} }
} }
fvOptions.absoluteFlux(phi); fvOptions.makeAbsolute(phi);
Info<< "continuity error = " Info<< "continuity error = "
<< mag(fvc::div(phi))().weightedAverage(mesh.V()).value() << mag(fvc::div(phi))().weightedAverage(mesh.V()).value()

4
applications/solvers/combustion/XiFoam/pEqn.H
View File

@ -16,7 +16,7 @@ if (pimple.transonic())
) )
); );
fvOptions.relativeFlux(fvc::interpolate(psi), phid); fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {
@ -51,7 +51,7 @@ else
) )
); );
fvOptions.relativeFlux(phiHbyA); fvOptions.makeRelative(phiHbyA);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {

4
applications/solvers/combustion/engineFoam/pEqn.H
View File

@ -13,7 +13,7 @@ if (pimple.transonic())
*((fvc::interpolate(HbyA) & mesh.Sf()) - fvc::meshPhi(rho, U)) *((fvc::interpolate(HbyA) & mesh.Sf()) - fvc::meshPhi(rho, U))
); );
fvOptions.relativeFlux(fvc::interpolate(psi), phid); fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {
@ -45,7 +45,7 @@ else
*((fvc::interpolate(HbyA) & mesh.Sf()) - fvc::meshPhi(rho, U)) *((fvc::interpolate(HbyA) & mesh.Sf()) - fvc::meshPhi(rho, U))
); );
fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA); fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {

2
applications/solvers/combustion/fireFoam/pEqn.H
View File

@ -21,7 +21,7 @@ surfaceScalarField phiHbyA
+ phig + phig
); );
fvOptions.relativeFlux(phiHbyA); fvOptions.makeRelative(phiHbyA);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {

4
applications/solvers/combustion/reactingFoam/pEqn.H
View File

@ -16,7 +16,7 @@ if (pimple.transonic())
) )
); );
fvOptions.relativeFlux(fvc::interpolate(psi), phid); fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {
@ -51,7 +51,7 @@ else
) )
); );
fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA); fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {

2
applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
View File

@ -24,7 +24,7 @@
+ phig + phig
); );
fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA); fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
fvScalarMatrix p_rghDDtEqn fvScalarMatrix p_rghDDtEqn
( (

4
applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
View File

@ -18,7 +18,7 @@
+ fvc::ddtPhiCorr(rAU, rho, U, phi) + fvc::ddtPhiCorr(rAU, rho, U, phi)
); );
fvOptions.relativeFlux(phiHbyA); fvOptions.makeRelative(phiHbyA);
surfaceScalarField phid("phid", fvc::interpolate(thermo.psi())*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 fvScalarMatrix pDDtEqn
( (

4
applications/solvers/compressible/rhoPimpleFoam/pEqn.H
View File

@ -24,7 +24,7 @@ if (pimple.transonic())
) )
); );
fvOptions.relativeFlux(fvc::interpolate(psi), phid); fvOptions.makeRelative(fvc::interpolate(psi), phid);
volScalarField Dp("Dp", rho*rAU); 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); volScalarField Dp("Dp", rho*rAU);

4
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/pEqn.H
View File

@ -24,7 +24,7 @@ if (pimple.transonic())
) )
); );
fvOptions.relativeFlux(fvc::interpolate(psi), phid); fvOptions.makeRelative(fvc::interpolate(psi), phid);
volScalarField Dp("Dp", rho*rAU); 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); volScalarField Dp("Dp", rho*rAU);

4
applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
View File

@ -25,7 +25,7 @@ if (pimple.transonic())
) )
); );
fvOptions.relativeFlux(fvc::interpolate(psi), phid); fvOptions.makeRelative(fvc::interpolate(psi), phid);
surfaceScalarField phic 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(); phiHbyA += fvc::interpolate(rho*(rAtU - rAU))*fvc::snGrad(p)*mesh.magSf();
HbyA -= (rAU - rAtU)*fvc::grad(p); HbyA -= (rAU - rAtU)*fvc::grad(p);

4
applications/solvers/compressible/rhoSimpleFoam/pEqn.H
View File

@ -15,7 +15,7 @@
fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf()) fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
); );
fvOptions.relativeFlux(fvc::interpolate(psi), phid); fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (simple.correctNonOrthogonal()) while (simple.correctNonOrthogonal())
{ {
@ -50,7 +50,7 @@
fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf()) 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); closedVolume = adjustPhi(phiHbyA, U, p);

2
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
View File

@ -22,7 +22,7 @@
fvc::interpolate(rho*HbyA) & mesh.Sf() fvc::interpolate(rho*HbyA) & mesh.Sf()
); );
fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA); fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
closedVolume = adjustPhi(phiHbyA, U, p); closedVolume = adjustPhi(phiHbyA, U, p);

2
applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
View File

@ -24,7 +24,7 @@
+ phig + phig
); );
fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA); fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
fvScalarMatrix p_rghDDtEqn fvScalarMatrix p_rghDDtEqn
( (

2
applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
View File

@ -17,7 +17,7 @@
fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf()) 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); bool closedVolume = adjustPhi(phiHbyA, U, p_rgh);

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
View File

@ -19,7 +19,7 @@
fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf()) 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); bool closedVolume = adjustPhi(phiHbyA, U, p_rgh);

2
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
View File

@ -24,7 +24,7 @@
+ phig + phig
); );
fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA); fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
{ {
fvScalarMatrix p_rghDDtEqn fvScalarMatrix p_rghDDtEqn

2
applications/solvers/incompressible/pimpleFoam/pEqn.H
View File

@ -13,7 +13,7 @@ surfaceScalarField phiHbyA
+ fvc::ddtPhiCorr(rAU, U, phi) + fvc::ddtPhiCorr(rAU, U, phi)
); );
fvOptions.relativeFlux(phiHbyA); fvOptions.makeRelative(phiHbyA);
adjustPhi(phiHbyA, U, p); adjustPhi(phiHbyA, U, p);

2
applications/solvers/incompressible/simpleFoam/pEqn.H
View File

@ -6,7 +6,7 @@
surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf()); surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
fvOptions.relativeFlux(phiHbyA); fvOptions.makeRelative(phiHbyA);
adjustPhi(phiHbyA, U, p); adjustPhi(phiHbyA, U, p);

2
applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
View File

@ -11,7 +11,7 @@ else
UEqn.clear(); UEqn.clear();
surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf()); surfaceScalarField phiHbyA("phiHbyA", fvc::interpolate(HbyA) & mesh.Sf());
mrfZones.relativeFlux(phiHbyA); mrfZones.makeRelative(phiHbyA);
adjustPhi(phiHbyA, U, p); adjustPhi(phiHbyA, U, p);

4
applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
View File

@ -16,7 +16,7 @@ if (pimple.transonic())
) )
); );
fvOptions.relativeFlux(fvc::interpolate(psi), phid); fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {
@ -52,7 +52,7 @@ else
) )
); );
fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA); fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {

2
applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
View File

@ -18,7 +18,7 @@ surfaceScalarField phiHbyA
+ phig + phig
); );
fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA); fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {

2
applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
View File

@ -19,7 +19,7 @@
) )
); );
fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA); fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
fvScalarMatrix pDDtEqn fvScalarMatrix pDDtEqn
( (

2
applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
View File

@ -17,7 +17,7 @@
fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf()) fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
); );
fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA); fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
while (simple.correctNonOrthogonal()) while (simple.correctNonOrthogonal())
{ {

4
applications/solvers/lagrangian/sprayFoam/pEqn.H
View File

@ -16,7 +16,7 @@ if (pimple.transonic())
) )
); );
fvOptions.relativeFlux(fvc::interpolate(psi), phid); fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {
@ -52,7 +52,7 @@ else
) )
); );
fvOptions.relativeFlux(fvc::interpolate(psi), phiHbyA); fvOptions.makeRelative(fvc::interpolate(psi), phiHbyA);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {

4
applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
View File

@ -16,7 +16,7 @@ if (pimple.transonic())
) )
); );
fvOptions.relativeFlux(fvc::interpolate(psi), phid); fvOptions.makeRelative(fvc::interpolate(psi), phid);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {
@ -52,7 +52,7 @@ else
) )
); );
fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA); fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
while (pimple.correctNonOrthogonal()) while (pimple.correctNonOrthogonal())
{ {

2
applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
View File

@ -12,7 +12,7 @@
+ fvc::ddtPhiCorr(rAU, rho, U, phi) + fvc::ddtPhiCorr(rAU, rho, U, phi)
); );
adjustPhi(phiHbyA, U, p_rgh); adjustPhi(phiHbyA, U, p_rgh);
mrfZones.relativeFlux(phiHbyA); mrfZones.makeRelative(phiHbyA);
phi = phiHbyA; phi = phiHbyA;
surfaceScalarField phig surfaceScalarField phig

10
applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
View File

@ -35,8 +35,8 @@
{ {
phaseModel& phase = iter(); phaseModel& phase = iter();
mrfZones.absoluteFlux(phase.phi().oldTime()); mrfZones.makeAbsolute(phase.phi().oldTime());
mrfZones.absoluteFlux(phase.phi()); mrfZones.makeAbsolute(phase.phi());
HbyAs.set(phasei, new volVectorField(phase.U())); HbyAs.set(phasei, new volVectorField(phase.U()));
phiHbyAs.set(phasei, new surfaceScalarField(1.0*phase.phi())); phiHbyAs.set(phasei, new surfaceScalarField(1.0*phase.phi()));
@ -96,7 +96,7 @@
(fvc::interpolate(HbyAs[phasei]) & mesh.Sf()) (fvc::interpolate(HbyAs[phasei]) & mesh.Sf())
+ fvc::ddtPhiCorr(rAUs[phasei], alpha, phase.U(), phase.phi()) + fvc::ddtPhiCorr(rAUs[phasei], alpha, phase.U(), phase.phi())
); );
mrfZones.relativeFlux(phiHbyAs[phasei]); mrfZones.makeRelative(phiHbyAs[phasei]);
phiHbyAs[phasei] += phiHbyAs[phasei] +=
rAlphaAUfs[phasei] rAlphaAUfs[phasei]
@ -168,8 +168,8 @@
phase.phi().boundaryField() == phase.phi().boundaryField() ==
(mesh.Sf().boundaryField() & phase.U().boundaryField()); (mesh.Sf().boundaryField() & phase.U().boundaryField());
mrfZones.relativeFlux(phase.phi().oldTime()); mrfZones.makeRelative(phase.phi().oldTime());
mrfZones.relativeFlux(phase.phi()); mrfZones.makeRelative(phase.phi());
// Update phi BCs before pEqn // Update phi BCs before pEqn
phi.boundaryField() += phi.boundaryField() +=

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

@ -27,6 +27,7 @@ License
#include "diameterModel.H" #include "diameterModel.H"
#include "fixedValueFvPatchFields.H" #include "fixedValueFvPatchFields.H"
#include "slipFvPatchFields.H" #include "slipFvPatchFields.H"
#include "partialSlipFvPatchFields.H"
#include "surfaceInterpolate.H" #include "surfaceInterpolate.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -157,6 +158,7 @@ Foam::phaseModel::phaseModel
( (
isA<fixedValueFvPatchVectorField>(U_.boundaryField()[i]) isA<fixedValueFvPatchVectorField>(U_.boundaryField()[i])
|| isA<slipFvPatchVectorField>(U_.boundaryField()[i]) || isA<slipFvPatchVectorField>(U_.boundaryField()[i])
|| isA<partialSlipFvPatchVectorField>(U_.boundaryField()[i])
) )
{ {
phiTypes[i] = fixedValueFvPatchScalarField::typeName; phiTypes[i] = fixedValueFvPatchScalarField::typeName;

2
applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
View File

@ -12,7 +12,7 @@
+ fvc::ddtPhiCorr(rAU, rho, U, phi) + fvc::ddtPhiCorr(rAU, rho, U, phi)
); );
adjustPhi(phiHbyA, U, p_rgh); adjustPhi(phiHbyA, U, p_rgh);
mrfZones.relativeFlux(phiHbyA); mrfZones.makeRelative(phiHbyA);
phi = phiHbyA; phi = phiHbyA;
surfaceScalarField phig surfaceScalarField phig

2
applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H
View File

@ -18,7 +18,7 @@ surfaceScalarField phiHbyA
adjustPhi(phiHbyA, U, p_gh); adjustPhi(phiHbyA, U, p_gh);
fvOptions.relativeFlux(phiHbyA); fvOptions.makeRelative(phiHbyA);
// Update the phi BCs from U before p BCs are updated // Update the phi BCs from U before p BCs are updated
phi.boundaryField() = mesh.Sf().boundaryField() & U.boundaryField(); phi.boundaryField() = mesh.Sf().boundaryField() & U.boundaryField();

29
applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
View File

@ -8,13 +8,6 @@
surfaceScalarField rAlphaAU1f(fvc::interpolate(alpha1*rAU1)); surfaceScalarField rAlphaAU1f(fvc::interpolate(alpha1*rAU1));
surfaceScalarField rAlphaAU2f(fvc::interpolate(alpha2*rAU2)); 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 volVectorField HbyA1
( (
IOobject::groupName("HbyA", phase1.name()), IOobject::groupName("HbyA", phase1.name()),
@ -29,10 +22,10 @@
); );
HbyA2 = rAU2*U2Eqn.H(); HbyA2 = rAU2*U2Eqn.H();
mrfZones.absoluteFlux(phi1.oldTime()); mrfZones.makeAbsolute(phi1.oldTime());
mrfZones.absoluteFlux(phi1); mrfZones.makeAbsolute(phi1);
mrfZones.absoluteFlux(phi2.oldTime()); mrfZones.makeAbsolute(phi2.oldTime());
mrfZones.absoluteFlux(phi2); mrfZones.makeAbsolute(phi2);
// Phase-1 pressure flux (e.g. due to particle-particle pressure) // Phase-1 pressure flux (e.g. due to particle-particle pressure)
surfaceScalarField phiP1 surfaceScalarField phiP1
@ -65,7 +58,7 @@
); );
phi = alpha1f*phiHbyA1 + alpha2f*phiHbyA2; phi = alpha1f*phiHbyA1 + alpha2f*phiHbyA2;
mrfZones.relativeFlux(phi); mrfZones.makeRelative(phi);
phiHbyA1 += phiHbyA1 +=
( (
@ -73,7 +66,7 @@
- phiP1 - phiP1
+ rAlphaAU1f*(g & mesh.Sf()) + rAlphaAU1f*(g & mesh.Sf())
); );
mrfZones.relativeFlux(phiHbyA1); mrfZones.makeRelative(phiHbyA1);
phiHbyA2 += phiHbyA2 +=
( (
@ -81,12 +74,12 @@
- phiP2 - phiP2
+ rAlphaAU2f*(g & mesh.Sf()) + rAlphaAU2f*(g & mesh.Sf())
); );
mrfZones.relativeFlux(phiHbyA2); mrfZones.makeRelative(phiHbyA2);
mrfZones.relativeFlux(phi1.oldTime()); mrfZones.makeRelative(phi1.oldTime());
mrfZones.relativeFlux(phi1); mrfZones.makeRelative(phi1);
mrfZones.relativeFlux(phi2.oldTime()); mrfZones.makeRelative(phi2.oldTime());
mrfZones.relativeFlux(phi2); mrfZones.makeRelative(phi2);
surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2); surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);

2
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
View File

@ -30,6 +30,7 @@ License
#include "heatTransferModel.H" #include "heatTransferModel.H"
#include "fixedValueFvPatchFields.H" #include "fixedValueFvPatchFields.H"
#include "slipFvPatchFields.H" #include "slipFvPatchFields.H"
#include "partialSlipFvPatchFields.H"
#include "surfaceInterpolate.H" #include "surfaceInterpolate.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -122,6 +123,7 @@ Foam::phaseModel::phaseModel
( (
isA<fixedValueFvPatchVectorField>(U_.boundaryField()[i]) isA<fixedValueFvPatchVectorField>(U_.boundaryField()[i])
|| isA<slipFvPatchVectorField>(U_.boundaryField()[i]) || isA<slipFvPatchVectorField>(U_.boundaryField()[i])
|| isA<partialSlipFvPatchVectorField>(U_.boundaryField()[i])
) )
{ {
phiTypes[i] = fixedValueFvPatchScalarField::typeName; phiTypes[i] = fixedValueFvPatchScalarField::typeName;

4
applications/test/RhoPimpleFoam/pEqn.H
View File

@ -24,7 +24,7 @@ if (pimple.transonic())
) )
); );
fvOptions.relativeFlux(fvc::interpolate(psi), phid); fvOptions.makeRelative(fvc::interpolate(psi), phid);
volScalarField Dp("Dp", rho*rAU); 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); volScalarField Dp("Dp", rho*rAU);

8
src/finiteVolume/cfdTools/general/MRF/MRFZone.C
View File

@ -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); relativeRhoFlux(geometricOneField(), phi);
} }
void Foam::MRFZone::relativeFlux void Foam::MRFZone::makeRelative
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi 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); absoluteRhoFlux(geometricOneField(), phi);
} }
void Foam::MRFZone::absoluteFlux void Foam::MRFZone::makeAbsolute
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi

8
src/finiteVolume/cfdTools/general/MRF/MRFZone.H
View File

@ -214,20 +214,20 @@ public:
void absoluteVelocity(volVectorField& U) const; void absoluteVelocity(volVectorField& U) const;
//- Make the given absolute flux relative within the MRF region //- 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 //- Make the given absolute mass-flux relative within the MRF region
void relativeFlux void makeRelative
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi
) const; ) const;
//- Make the given relative flux absolute within the MRF region //- 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 //- Make the given relative mass-flux absolute within the MRF region
void absoluteFlux void makeAbsolute
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi

16
src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
View File

@ -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) forAll(*this, i)
{ {
operator[](i).relativeFlux(phi); operator[](i).makeRelative(phi);
} }
} }
void Foam::MRFZoneList::relativeFlux void Foam::MRFZoneList::makeRelative
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi
@ -195,21 +195,21 @@ void Foam::MRFZoneList::relativeFlux
{ {
forAll(*this, i) 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) forAll(*this, i)
{ {
operator[](i).absoluteFlux(phi); operator[](i).makeAbsolute(phi);
} }
} }
void Foam::MRFZoneList::absoluteFlux void Foam::MRFZoneList::makeAbsolute
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi
@ -217,7 +217,7 @@ void Foam::MRFZoneList::absoluteFlux
{ {
forAll(*this, i) forAll(*this, i)
{ {
operator[](i).absoluteFlux(rho, phi); operator[](i).makeAbsolute(rho, phi);
} }
} }

8
src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H
View File

@ -109,20 +109,20 @@ public:
void absoluteVelocity(volVectorField& U) const; void absoluteVelocity(volVectorField& U) const;
//- Make the given absolute flux relative within the MRF region //- 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 //- Make the given absolute mass-flux relative within the MRF region
void relativeFlux void makeRelative
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi
) const; ) const;
//- Make the given relative flux absolute within the MRF region //- 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 //- Make the given relative mass-flux absolute within the MRF region
void absoluteFlux void makeAbsolute
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi

8
src/fvOptions/fvOptions/fvOption.C
View File

@ -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 // do nothing
} }
void Foam::fv::option::relativeFlux void Foam::fv::option::makeRelative
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi 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 // do nothing
} }
void Foam::fv::option::absoluteFlux void Foam::fv::option::makeAbsolute
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi

8
src/fvOptions/fvOptions/fvOption.H
View File

@ -425,20 +425,20 @@ public:
// Flux manipulations // Flux manipulations
//- Make the given absolute flux relative //- 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 //- Make the given absolute mass-flux relative
virtual void relativeFlux virtual void makeRelative
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi
) const; ) const;
//- Make the given relative flux absolute //- 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 //- Make the given relative mass-flux absolute
virtual void absoluteFlux virtual void makeAbsolute
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi

16
src/fvOptions/fvOptions/fvOptionList.C
View File

@ -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) 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, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi
@ -124,21 +124,21 @@ void Foam::fv::optionList::relativeFlux
{ {
forAll(*this, i) 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) 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, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi
@ -146,7 +146,7 @@ void Foam::fv::optionList::absoluteFlux
{ {
forAll(*this, i) forAll(*this, i)
{ {
this->operator[](i).absoluteFlux(rho, phi); this->operator[](i).makeAbsolute(rho, phi);
} }
} }

8
src/fvOptions/fvOptions/fvOptionList.H
View File

@ -157,20 +157,20 @@ public:
// Flux manipulations // Flux manipulations
//- Make the given absolute flux relative //- Make the given absolute flux relative
void relativeFlux(surfaceScalarField& phi) const; void makeRelative(surfaceScalarField& phi) const;
//- Make the given absolute mass-flux relative //- Make the given absolute mass-flux relative
void relativeFlux void makeRelative
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi
) const; ) const;
//- Make the given relative flux absolute //- Make the given relative flux absolute
void absoluteFlux(surfaceScalarField& phi) const; void makeAbsolute(surfaceScalarField& phi) const;
//- Make the given relative mass-flux absolute //- Make the given relative mass-flux absolute
void absoluteFlux void makeAbsolute
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi

16
src/fvOptions/sources/derived/MRFSource/MRFSource.C
View File

@ -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, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi
) const ) 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, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi
) const ) const
{ {
mrfPtr_->absoluteFlux(rho, phi); mrfPtr_->makeAbsolute(rho, phi);
} }

8
src/fvOptions/sources/derived/MRFSource/MRFSource.H
View File

@ -138,20 +138,20 @@ public:
// Flux manipulations // Flux manipulations
//- Make the given absolute flux relative //- 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 //- Make the given absolute mass-flux relative
virtual void relativeFlux virtual void makeRelative
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi
) const; ) const;
//- Make the given relative flux absolute //- 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 //- Make the given relative mass-flux absolute
virtual void absoluteFlux virtual void makeAbsolute
( (
const surfaceScalarField& rho, const surfaceScalarField& rho,
surfaceScalarField& phi surfaceScalarField& phi