CorrectPhi: Added pressureReference argument to set the reference cell

so that the same reference cell is used for pcorr and p or p_rgh to improve consistency between flux and flux correction.
OpenFOAM · Apr 30, 2021 · e8ff92c · e8ff92c
1 parent 007658b
commit e8ff92c
Show file tree

Hide file tree

Showing 72 changed files with 172 additions and 122 deletions.
diff --git a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H
@@ -96,7 +96,6 @@ pressureReference pressureReference
 (
     p,
     p_rgh,
-    rho,
     pimple.dict(),
     thermo.incompressible()
 );

diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H
@@ -38,7 +38,7 @@ volScalarField& p = thermo.p();
 
 #include "compressibleCreatePhi.H"
 
-pressureReference pressureReference(p, rho, pimple.dict(), false);
+pressureReference pressureReference(p, pimple.dict(), false);
 
 mesh.setFluxRequired(p.name());
 

diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -43,7 +43,6 @@ volVectorField U
 pressureReference pressureReference
 (
     p,
-    rho,
     pimple.dict(),
     thermo.incompressible()
 );

diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -41,7 +41,6 @@ volVectorField U
 pressureReference pressureReference
 (
     p,
-    rho,
     simple.dict(),
     thermo.incompressible()
 );

diff --git a/applications/solvers/electromagnetics/mhdFoam/createFields.H b/applications/solvers/electromagnetics/mhdFoam/createFields.H
@@ -109,10 +109,7 @@ DB.name() = "DB";
 dimensionedScalar DBU = 1.0/(2.0*mu*rho);
 DBU.name() = "DBU";
 
-
-label pRefCell = 0;
-scalar pRefValue = 0.0;
-setRefCell(p, piso.dict(), pRefCell, pRefValue);
+pressureReference pressureReference(p, piso.dict());
 
 mesh.setFluxRequired(p.name());
 mesh.setFluxRequired(pB.name());
diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,6 +50,7 @@ Description
 
 #include "fvCFD.H"
 #include "pisoControl.H"
+#include "pressureReference.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -113,7 +114,12 @@ int main(int argc, char *argv[])
                         fvm::laplacian(rAUf, p) == fvc::div(phiHbyA)
                     );
 
-                    pEqn.setReference(pRefCell, pRefValue);
+                    pEqn.setReference
+                    (
+                        pressureReference.refCell(),
+                        pressureReference.refValue()
+                    );
+
                     pEqn.solve();
 
                     if (piso.finalNonOrthogonalIter())

diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
@@ -83,7 +83,6 @@ pressureReference pressureReference
 (
     p,
     p_rgh,
-    rho,
     pimple.dict(),
     thermo.incompressible()
 );

diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
@@ -81,7 +81,6 @@ pressureReference pressureReference
 (
     p,
     p_rgh,
-    rho,
     simple.dict(),
     thermo.incompressible()
 );

diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidPressureControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidPressureControls.H
@@ -8,7 +8,6 @@ forAll(fluidRegions, i)
         new pressureReference
         (
             p_rghFluid[i],
-            rhoFluid[i],
             pimples.pimple(i).dict(),
             false
         )

diff --git a/...ations/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/...ations/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -49,6 +49,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "kinematicMomentumTransportModel.H"
 #include "simpleControl.H"
+#include "pressureReference.H"
 #include "fvModels.H"
 #include "fvConstraints.H"
 
@@ -143,7 +144,12 @@ int main(int argc, char *argv[])
                     fvm::laplacian(rAU, p) == fvc::div(phiHbyA)
                 );
 
-                pEqn.setReference(pRefCell, pRefValue);
+                pEqn.setReference
+                (
+                    pressureReference.refCell(),
+                    pressureReference.refValue()
+                );
+
                 pEqn.solve();
 
                 if (simple.finalNonOrthogonalIter())

diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
@@ -29,9 +29,8 @@ volVectorField U
 #include "createPhi.H"
 
 
-label pRefCell = 0;
-scalar pRefValue = 0.0;
-setRefCell(p, simple.dict(), pRefCell, pRefValue);
+pressureReference pressureReference(p, simple.dict());
+
 mesh.setFluxRequired(p.name());
 
 

diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
@@ -36,6 +36,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "kinematicMomentumTransportModel.H"
 #include "pimpleControl.H"
+#include "pressureReference.H"
 #include "SRFModel.H"
 #include "fvModels.H"
 #include "fvConstraints.H"

diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H
@@ -40,9 +40,7 @@ surfaceScalarField phi
     linearInterpolate(Urel) & mesh.Sf()
 );
 
-label pRefCell = 0;
-scalar pRefValue = 0.0;
-setRefCell(p, pimple.dict(), pRefCell, pRefValue);
+pressureReference pressureReference(p, pimple.dict());
 mesh.setFluxRequired(p.name());
 
 Info<< "Creating SRF model\n" << endl;

diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
@@ -38,7 +38,11 @@ while (pimple.correctNonOrthogonal())
         fvm::laplacian(rAtUrel(), p) == fvc::div(phiHbyA)
     );
 
-    pEqn.setReference(pRefCell, pRefValue);
+    pEqn.setReference
+    (
+        pressureReference.refCell(),
+        pressureReference.refValue()
+    );
 
     pEqn.solve();
 

diff --git a/applications/solvers/incompressible/pimpleFoam/correctPhi.H b/applications/solvers/incompressible/pimpleFoam/correctPhi.H
@@ -11,6 +11,7 @@ CorrectPhi
     p,
     dimensionedScalar("rAUf", dimTime, 1),
     geometricZeroField(),
+    pressureReference,
     pimple
 );
 

diff --git a/applications/solvers/incompressible/pimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/createFields.H
@@ -30,10 +30,8 @@ volVectorField U
 
 #include "createPhi.H"
 
+pressureReference pressureReference(p, pimple.dict());
 
-label pRefCell = 0;
-scalar pRefValue = 0.0;
-setRefCell(p, pimple.dict(), pRefCell, pRefValue);
 mesh.setFluxRequired(p.name());
 
 

diff --git a/applications/solvers/incompressible/pimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pEqn.H
@@ -42,7 +42,11 @@ while (pimple.correctNonOrthogonal())
         fvm::laplacian(rAtU(), p) == fvc::div(phiHbyA)
     );
 
-    pEqn.setReference(pRefCell, pRefValue);
+    pEqn.setReference
+    (
+        pressureReference.refCell(),
+        pressureReference.refValue()
+    );
 
     pEqn.solve();
 

diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -37,6 +37,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "kinematicMomentumTransportModel.H"
 #include "pimpleControl.H"
+#include "pressureReference.H"
 #include "CorrectPhi.H"
 #include "fvModels.H"
 #include "fvConstraints.H"

diff --git a/applications/solvers/incompressible/pisoFoam/createFields.H b/applications/solvers/incompressible/pisoFoam/createFields.H
@@ -29,9 +29,8 @@ volVectorField U
 #include "createPhi.H"
 
 
-label pRefCell = 0;
-scalar pRefValue = 0.0;
-setRefCell(p, piso.dict(), pRefCell, pRefValue);
+pressureReference pressureReference(p, piso.dict());
+
 mesh.setFluxRequired(p.name());
 
 

diff --git a/applications/solvers/incompressible/pisoFoam/pEqn.H b/applications/solvers/incompressible/pisoFoam/pEqn.H
@@ -24,7 +24,11 @@ while (piso.correctNonOrthogonal())
         fvm::laplacian(rAU, p) == fvc::div(phiHbyA)
     );
 
-    pEqn.setReference(pRefCell, pRefValue);
+    pEqn.setReference
+    (
+        pressureReference.refCell(),
+        pressureReference.refValue()
+    );
 
     pEqn.solve();
 

diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -38,6 +38,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "kinematicMomentumTransportModel.H"
 #include "pisoControl.H"
+#include "pressureReference.H"
 #include "fvModels.H"
 #include "fvConstraints.H"
 

diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
@@ -35,6 +35,7 @@ Description
 #include "kinematicMomentumTransportModel.H"
 #include "SRFModel.H"
 #include "simpleControl.H"
+#include "pressureReference.H"
 #include "fvModels.H"
 #include "fvConstraints.H"
 

diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
@@ -40,9 +40,8 @@ surfaceScalarField phi
     linearInterpolate(Urel) & mesh.Sf()
 );
 
-label pRefCell = 0;
-scalar pRefValue = 0.0;
-setRefCell(p, simple.dict(), pRefCell, pRefValue);
+pressureReference pressureReference(p, simple.dict());
+
 mesh.setFluxRequired(p.name());
 
 Info<< "Creating SRF model\n" << endl;

diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/pEqn.H
@@ -29,7 +29,11 @@
             fvm::laplacian(rAtUrel(), p) == fvc::div(phiHbyA)
         );
 
-        pEqn.setReference(pRefCell, pRefValue);
+        pEqn.setReference
+        (
+            pressureReference.refCell(),
+            pressureReference.refValue()
+        );
 
         pEqn.solve();
 

diff --git a/applications/solvers/incompressible/simpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/createFields.H
@@ -29,9 +29,8 @@ volVectorField U
 #include "createPhi.H"
 
 
-label pRefCell = 0;
-scalar pRefValue = 0.0;
-setRefCell(p, simple.dict(), pRefCell, pRefValue);
+pressureReference pressureReference(p, simple.dict());
+
 mesh.setFluxRequired(p.name());
 
 

diff --git a/applications/solvers/incompressible/simpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/pEqn.H
@@ -28,7 +28,11 @@
             fvm::laplacian(rAtU(), p) == fvc::div(phiHbyA)
         );
 
-        pEqn.setReference(pRefCell, pRefValue);
+        pEqn.setReference
+        (
+            pressureReference.refCell(),
+            pressureReference.refValue()
+        );
 
         pEqn.solve();
 

diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
@@ -31,7 +31,11 @@ while (simple.correctNonOrthogonal())
 
     fvScalarMatrix pEqn = tpEqn.ref();
 
-    pEqn.setReference(pRefCell, pRefValue);
+    pEqn.setReference
+    (
+        pressureReference.refCell(),
+        pressureReference.refValue()
+    );
 
     pEqn.solve();
 

diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
@@ -35,6 +35,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "kinematicMomentumTransportModel.H"
 #include "simpleControl.H"
+#include "pressureReference.H"
 #include "IOporosityModelList.H"
 #include "fvModels.H"
 #include "fvConstraints.H"

diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -34,6 +34,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "kinematicMomentumTransportModel.H"
 #include "simpleControl.H"
+#include "pressureReference.H"
 #include "fvModels.H"
 #include "fvConstraints.H"
 

diff --git a/applications/solvers/lagrangian/denseParticleFoam/correctPhic.H b/applications/solvers/lagrangian/denseParticleFoam/correctPhic.H
@@ -10,6 +10,7 @@ CorrectPhi
     p,
     dimensionedScalar("rAUf", dimTime, 1),
     geometricZeroField(),
+    pressureReference,
     pimple
 );
 

diff --git a/applications/solvers/lagrangian/denseParticleFoam/createFields.H b/applications/solvers/lagrangian/denseParticleFoam/createFields.H
@@ -59,9 +59,8 @@ surfaceScalarField phic
     linearInterpolate(Uc) & mesh.Sf()
 );
 
-label pRefCell = 0;
-scalar pRefValue = 0.0;
-setRefCell(p, pimple.dict(), pRefCell, pRefValue);
+pressureReference pressureReference(p, pimple.dict());
+
 mesh.setFluxRequired(p.name());
 
 Info<< "Creating turbulence model\n" << endl;

diff --git a/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C b/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C
@@ -80,6 +80,7 @@ namespace Foam
 #include "singlePhaseTransportModel.H"
 #include "phaseKinematicMomentumTransportModel.H"
 #include "pimpleControl.H"
+#include "pressureReference.H"
 #include "CorrectPhi.H"
 #include "fvModels.H"
 #include "fvConstraints.H"

diff --git a/applications/solvers/lagrangian/denseParticleFoam/pEqn.H b/applications/solvers/lagrangian/denseParticleFoam/pEqn.H
@@ -34,7 +34,11 @@
           + fvc::div(alphacf*phiHbyASp)
         );
 
-        pEqn.setReference(pRefCell, pRefValue);
+        pEqn.setReference
+        (
+            pressureReference.refCell(),
+            pressureReference.refValue()
+        );
 
         pEqn.solve();
 

diff --git a/...ations/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/createFields.H b/...ations/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/createFields.H
@@ -109,7 +109,6 @@ pressureReference pressureReference
 (
     p,
     p_rgh,
-    rho,
     pimple.dict(),
     thermo.incompressible()
 );

diff --git a/applications/solvers/lagrangian/reactingParticleFoam/createFields.H b/applications/solvers/lagrangian/reactingParticleFoam/createFields.H
@@ -90,7 +90,6 @@ volScalarField K("K", 0.5*magSqr(U));
 pressureReference pressureReference
 (
     p,
-    rho,
     pimple.dict(),
     thermo.incompressible()
 );

diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -50,6 +50,7 @@ Description
 #include "compressibleInterPhaseTransportModel.H"
 #include "noPhaseChange.H"
 #include "pimpleControl.H"
+#include "pressureReference.H"
 #include "fvModels.H"
 #include "fvConstraints.H"
 #include "CorrectPhi.H"

diff --git a/applications/solvers/multiphase/compressibleInterFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterFoam/correctPhi.H
@@ -11,6 +11,7 @@ CorrectPhi
     p_rgh,
     surfaceScalarField("rAUf", fvc::interpolate(rAU())),
     divU(),
+    pressureReference,
     pimple
 );