From 3eea88674a99de1d3c1ed621893931cbb40fe7db Mon Sep 17 00:00:00 2001
From: "h.weller@opencfd.co.uk" <h.weller@opencfd.co.uk>
Date: Fri, 27 Jun 2008 12:42:22 +0100
Subject: [PATCH] Changed the constructor for pd to MUST_READ. Calculate p from
 pd (note p is still read in by the termo package) and correct thermo.

---
 .../solvers/heatTransfer/buoyantFoam/createFields.H    | 10 +++++++---
 .../heatTransfer/buoyantSimpleFoam/createFields.H      | 10 +++++++---
 .../buoyantSimpleRadiationFoam/createFields.H          | 10 +++++++---
 .../chtMultiRegionFoam/fluid/createFluidFields.H       |  2 +-
 .../solvers/heatTransfer/lesBuoyantFoam/createFields.H |  4 ++--
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/applications/solvers/heatTransfer/buoyantFoam/createFields.H b/applications/solvers/heatTransfer/buoyantFoam/createFields.H
index 99cb78bcac..03f021f08d 100644
--- a/applications/solvers/heatTransfer/buoyantFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantFoam/createFields.H
@@ -67,10 +67,14 @@
         (
             "pd",
             runTime.timeName(),
-            mesh
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
         ),
-        p - rho*gh - pRef,
-        p.boundaryField().types()
+        mesh
     );
 
+    p = pd + rho*gh + pRef;
+    thermo->correct();
+
     dimensionedScalar initialMass = fvc::domainIntegrate(rho);
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
index 1bdb4d874b..84d260b9be 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
@@ -64,12 +64,16 @@
         (
             "pd",
             runTime.timeName(),
-            mesh
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
         ),
-        p - rho*gh - pRef,
-        p.boundaryField().types()
+        mesh
     );
 
+    p = pd + rho*gh + pRef;
+    thermo->correct();
+
 
     label pdRefCell = 0;
     scalar pdRefValue = 0.0;
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createFields.H
index 0cdc89f117..ceab125f14 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createFields.H
@@ -65,12 +65,16 @@
         (
             "pd",
             runTime.timeName(),
-            mesh
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
         ),
-        p - rho*gh - pRef,
-        p.boundaryField().types()
+        mesh
     );
 
+    p = pd + rho*gh + pRef;
+    thermo->correct();
+
 
     label pdRefCell = 0;
     scalar pdRefValue = 0.0;
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index aec296a1b3..903ec348b0 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -173,7 +173,7 @@
 
         Info<< "    Updating p from pd\n" << endl;
         thermof[i].p() == pdf[i] + rhof[i]*ghf[i] + pRef;
-
+        thermof[i].correct();
 
         initialMassf[i] = fvc::domainIntegrate(rhof[i]).value();
     }
diff --git a/applications/solvers/heatTransfer/lesBuoyantFoam/createFields.H b/applications/solvers/heatTransfer/lesBuoyantFoam/createFields.H
index 3fd85b36c5..bad19da447 100644
--- a/applications/solvers/heatTransfer/lesBuoyantFoam/createFields.H
+++ b/applications/solvers/heatTransfer/lesBuoyantFoam/createFields.H
@@ -37,7 +37,7 @@
         mesh
     );
 
-#   include "compressibleCreatePhi.H"
+    #include "compressibleCreatePhi.H"
 
 
     Info<< "Creating turbulence model\n" << endl;
@@ -69,7 +69,7 @@
         mesh
     );
 
-    //pd = p - rho*gh - pRef;
     p = pd + rho*gh + pRef;
+    thermo->correct();
 
     dimensionedScalar initialMass = fvc::domainIntegrate(rho);