diff --git a/applications/solvers/combustion/XiFoam/pEqn.H b/applications/solvers/combustion/XiFoam/pEqn.H
index 995a59a737e66fca4ba33ac70b917af8f3d69d4d..915f1af653aac8ac9f8e83b81df13a658037a90b 100644
--- a/applications/solvers/combustion/XiFoam/pEqn.H
+++ b/applications/solvers/combustion/XiFoam/pEqn.H
@@ -31,8 +31,6 @@ if (pimple.transonic())
fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
@@ -65,8 +63,6 @@ else
fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/engineFoam/pEqn.H
index bd12a82495b7b8bb8ee00733d5cc374c6b44a0d6..aee12f4dc048385ea9d937c458ee6d1e31c18efe 100644
--- a/applications/solvers/combustion/engineFoam/pEqn.H
+++ b/applications/solvers/combustion/engineFoam/pEqn.H
@@ -34,8 +34,6 @@ if (pimple.transonic())
fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
@@ -69,8 +67,6 @@ else
fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H
index 6652eab56495d5e1ea25a4544d944a85ed61206b..5112326eac3618578d3729375201c9a55453217a 100644
--- a/applications/solvers/combustion/fireFoam/pEqn.H
+++ b/applications/solvers/combustion/fireFoam/pEqn.H
@@ -45,8 +45,6 @@ while (pimple.correctNonOrthogonal())
+ fvOptions(psi, p_rgh, rho.name())
);
- fvOptions.constrain(p_rghEqn);
-
p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/combustion/reactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/pEqn.H
index f7a3004ac212d83ab7ebfd4ce4f877e4d4d5d6f6..0033563a7de9e330d7c4ede8c9c94823b7b52d65 100644
--- a/applications/solvers/combustion/reactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pEqn.H
@@ -31,8 +31,6 @@ if (pimple.transonic())
fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
@@ -65,8 +63,6 @@ else
fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
index 8894c7a9d766b783292a22de3ff602158d7be028..becb0aa7012f50c6c4e198a56e0641bc8407a1b9 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H
@@ -52,8 +52,6 @@
- fvm::laplacian(rhorAUf, p_rgh)
);
- fvOptions.constrain(p_rghEqn);
-
p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
index f9b1bd65e41ea05198f2ee77603b2eaaaae6155f..ea5449ee99f3bc393af9302e424fc2eb95274dc6 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
@@ -44,8 +44,6 @@
fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
@@ -83,8 +81,6 @@
- fvm::laplacian(rhorAUf, p)
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index e0619a513b9ce25a35dde6fbc18802482476b616..2675fe5257468234272f84a52ff807b09a368b35 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -39,8 +39,6 @@ if (pimple.transonic())
fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
@@ -74,8 +72,6 @@ else
fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
index 7363add2b9ffc4c52420aff19e9295933f80ab63..c18f0590d89962e312a0a5bb23bcb3ee6679cf9e 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
@@ -50,8 +50,6 @@ if (pimple.transonic())
fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
@@ -89,8 +87,6 @@ else
fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index b1fc930be9381de6fc600acc96245dd6dd84ca1d..d5e26fceff660022a8b4e068d7319ef0b55700f5 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -31,8 +31,6 @@
// Relax the pressure equation to ensure diagonal-dominance
pEqn.relax();
- fvOptions.constrain(pEqn);
-
pEqn.setReference(pRefCell, pRefValue);
pEqn.solve();
@@ -67,8 +65,6 @@
pEqn.setReference(pRefCell, pRefValue);
- fvOptions.constrain(pEqn);
-
pEqn.solve();
if (simple.finalNonOrthogonalIter())
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
index af15b48adaec3172cf76ad1ec758b418b20044ee..fbc3b01f235915effd351b005ac74b1d55a1ac5a 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H
@@ -43,8 +43,6 @@ if (simple.transonic())
// Relax the pressure equation to maintain diagonal dominance
pEqn.relax();
- fvOptions.constrain(pEqn);
-
pEqn.setReference(pRefCell, pRefValue);
pEqn.solve();
@@ -82,8 +80,6 @@ else
fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.setReference(pRefCell, pRefValue);
pEqn.solve();
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
index eb97fe494452f02235be672ec544d090f369e14c..38eac983f31cfccdee9280df84355c866f30bdb5 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@@ -52,8 +52,6 @@
- fvm::laplacian(rAUf, p_rgh)
);
- fvOptions.constrain(p_rghEqn);
-
p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
index fce4b6e64da208836fbe0d09d78d05797a22a287..479d9d7af655a1a630adb0333d5eeeb43da4c9fe 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
@@ -32,8 +32,6 @@ if (pimple.transonic())
+ fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
@@ -67,8 +65,6 @@ else
+ fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
index 6652eab56495d5e1ea25a4544d944a85ed61206b..5112326eac3618578d3729375201c9a55453217a 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
@@ -45,8 +45,6 @@ while (pimple.correctNonOrthogonal())
+ fvOptions(psi, p_rgh, rho.name())
);
- fvOptions.constrain(p_rghEqn);
-
p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
index 56b22dba9caab96e4769eae137c6100d29a49466..dd68eb37572041926082329617b3b33256aa928f 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
@@ -39,8 +39,6 @@
- fvm::laplacian(rhorAUf, p)
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
index db14dfaa86a3b06636436e01da73fbead3212e3c..e965d94c88ea2edd259d21232024aa213cd79b11 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H
@@ -28,8 +28,6 @@
+ fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve();
if (simple.finalNonOrthogonalIter())
diff --git a/applications/solvers/lagrangian/sprayFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/pEqn.H
index b0c09f9e08448be43c9da6c4ca1654cd6aca972d..338f29f538f9b6417d0294af2c61f815fed7a878 100644
--- a/applications/solvers/lagrangian/sprayFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/pEqn.H
@@ -32,8 +32,6 @@ if (pimple.transonic())
+ fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
@@ -67,8 +65,6 @@ else
+ fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
index d23ec0f95058a2ea46ee547ba9833b2e4851e9e9..8aba61102694fd2bcbb364980632cd3e1c54b29e 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
@@ -35,8 +35,6 @@ if (pimple.transonic())
+ fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
@@ -71,8 +69,6 @@ else
+ fvOptions(psi, p, rho.name())
);
- fvOptions.constrain(pEqn);
-
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
index 9ea4e74a5e908a2a231b82a00a450ef039648f35..1c5a9e471aa9f0830a1832605e78a541775b92a6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
@@ -129,8 +129,7 @@
pEqnComp1 =
(
- fvc::ddt(alpha1, rho1) + fvc::div(alphaRhoPhi1)
- - (fvOptions(alpha1, rho1)&rho1)
+ contErr1
- fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
)/rho1
+ (alpha1/rho1)*correction
@@ -143,10 +142,8 @@
pEqnComp2 =
(
- fvc::ddt(alpha2, rho2) + fvc::div(alphaRhoPhi2)
- - (fvOptions(alpha2, rho2)&rho2)
+ contErr2
- fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
-
)/rho2
+ (alpha2/rho2)*correction
(
@@ -160,16 +157,14 @@
{
pEqnComp1 =
(
- fvc::ddt(alpha1, rho1) + fvc::div(alphaRhoPhi1)
- - (fvOptions(alpha1, rho1)&rho1)
+ contErr1
- fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
)/rho1
+ (alpha1*psi1/rho1)*correction(fvm::ddt(p));
pEqnComp2 =
(
- fvc::ddt(alpha2, rho2) + fvc::div(alphaRhoPhi2)
- - (fvOptions(alpha2, rho2)&rho2)
+ contErr2
- fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
)/rho2
+ (alpha2*psi2/rho2)*correction(fvm::ddt(p));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index 63ab2f5549237dc8d22088f881b662440f5b209b..f22298377e7d0a4c4afb6e695165f39c05538e74 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
(
"contErr2",
fvc::ddt(alpha2, rho2) + fvc::div(alphaRhoPhi2)
- - (fvOptions(alpha2, rho2)&rho2)
+ - (fvOptions(alpha2, rho2)&rho2)
);