diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C index fbe29e652ff16e168cd24aa8ac42b1154d9ad936..b4951e5b0c96ecc3f7005706431f0914c5dc84e4 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 76cfbc4658b0fad1661249661c40a4f727334c2b..c1effcd60d089adeeb17c6a071da4f52f6a837b5 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 6bb80b1eaff865d6aff49df705db7e88aa015160..39939333c207c56a5739b08035f06c5e4bd40b44 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 4fa4799ff208fda64e21b62bfdfdb10e3813c90a..9953e83007a5c259fba22385a89a293023ddadb6 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 9172736266bc283174ae859c6f8ac422f7a658da..0a8a6ce9d04a4ba13dbb1267e410787547c9bb62 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 9b5d81522a5924c1f304a266216fe30413d33e55..7f312e5030e046b5880b156987aef2db801045ef 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 7a5c717cff712da15a12e99911e4580fe6a96845..461e1ca8fbef7cdf3b89febc784b60e302ae5832 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 78f4ddb0316da812837722fde3d8baba8540512b..fcc40881a1deeef5d248c78d6d734af131922cd1 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 7b4118658bd3dbeaaaede6d3e91f104dfcabbef3..c1ceb88c174555758fa5f2d10ead31f1aaee7845 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 7d843b62e045c9a993ae11c9d174c344eb9df665..de09cb53e223e002b183881c42e7ea26ccbe8629 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 0f5bbdb1629c1cb5c31e57565c1623b0f8ea9432..364d26a50b394d0b21c4088c75675170706e3d86 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 2d9a8f40d4e229526a6e9afc5d7b76842bd08ba5..229579ea3137548cf6496a9c28d0d19f9db7c065 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 92643394f9c01ddf1b5b30b7058924df6fc6e46a..cc66c5cca0996e227349c8e76209b8fdb16be8dc 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 91d6eaf84e4acffb177ac01fcf390cbf70a7ffa2..482642bde81b432b4594ccfa0ed0a1e1735bdc09 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 161dff5447ce24fe3d2ba2ef741a440bec1872a3..6e14684ee6e192b207293989c6e4a5f93b030681 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 58ee6ae1b4de74c0f640d5d959c10ea4ff84f261..d5346be47d2c784b095a600f2e2ddf1aed857811 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 f085e548cea7fe11ae9c43efdb3c2f9782103cdb..a7f5edf1a6205cb1eb5cb052f153aeff10a25d2f 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 9bd829d3f1c976c5d2c4719a4a14d3e036c38c38..4d669c8db223c072e5e158492c4a45b6755bdcaa 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 bb906cc8c6632e20e9c4bab2ffae0a46ed550c77..07497dccc56fb941ef383f331eb292d662146518 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 03e9033edb3860effa7e077e543b8248a5f5028f..82f1e9ff634e793cf14f1c95ff7f932ccd546dff 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 26c3a6f062528e9ec15c86880e814f7e4ef35992..7df99b9b94ff341ae0aa6cf5a30748478dc24220 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 fb2e125a5813803e0e7d91ea4ae33e7f06e5bf17..6dd16f0bdb9e56eeb0ed972e2b9ca9342aba4535 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 0d1aa2e2387c3ad5d52c518414060634bbb2200b..66ac49892317b49035932152d7a4fbd256374de6 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 590e00d81fc09a2cf57e1ce30790cba55a93c7c6..af65d3016bb17c85464a6a2664fe81c4ca7c6607 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 b7998b9e848b266fe910fbfb645a86c05c6b24c8..cf7acbd602e503b2e0e22627530257d02a7bb083 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 f5f349f227403235bdec6936159991aca8f6fc79..5d2acc8b68402e5b1a9457b865dc65ecf0d7f120 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 edca66903e032dc12d97ba72d5d69f31beac4e3f..8677157de4cdf10362691dd3ba1f63f54a166fe1 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 f74ef12513cd362a9d7971c5c8e44b693fe72b92..a4c5a87bbe147a0f328731a61294153de436951d 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 823216897c886ac5a3a15490bd2215d524aa8605..e7f4c3ac8ee08800000e028e97c170a2ffbcd185 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 11dfa8a5200efcf9e848c25d00844edf9b2a0f41..024598673f0cde1429247d5f96220ca5eeb11ccb 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 256769674b2198446e47d5918dae6d3281ed37f9..864b9c7afb75ba633af6e940d9ef35a70c41764c 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 e0275a6238217ba8f88cb5f3ece5495fd14a8b7e..697371c04440e6740780fb4d6a0edf7b7bc33ed3 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 78f4ddb0316da812837722fde3d8baba8540512b..fcc40881a1deeef5d248c78d6d734af131922cd1 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 15c7e6cb0e68ff73070e53a77e9c74397ccd0ddc..f1c03482a77a20958fe95a900526084acce75d24 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 5d379f2e40a8adb56fdd4613e6d9150d08d20b13..22559deb385702e79bae318aae38662a0b1fb776 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 9d111be38073b67ea9110d9d0de5bad1161a2410..fcc18322a0bedb7d93ed981378edb2ec55af198b 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 a2311c52c892686f445fdbbafc4efc919539c4fb..7db0d19686af5bda10df6a1f2c46d7c021c121db 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 bc68775f083ac40ea176b38e2c4c16416869b334..0751b64c77a00b7c66f7204931adb49e47839506 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 a3cb760f5f9c7eed12d1b45239469641ecf66ed2..0f8896827bf7a9252fc93b91d3177d3656c617d2 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 e5736a2935987fcb4badff609ac9990ff20492c4..5329aa1243d123008c8f798e850603b4ef2ae590 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 6ee2b32cc9460fc82057e79139f0066ad9e74940..0d5b6abdb53505237502b2f7a7927e8c34945509 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 b3eaa5eafd4734552e2e8584a113bed6eb46d305..d61e10f362741c1677bcbd58531cf4ca1d6c7654 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 7dccdf8c7cd77feda190ee5ec8a239b453503f6f..0b3da28cc4049183adce08e2aba3b82a1b1f8333 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