From 9f850b6ceadb1db73cd7cdbce74dc7973e687d69 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 22 Nov 2012 11:14:09 +0000
Subject: [PATCH] ENH: Further update to pressure tools function object

---
 .../utilities/pressureTools/pressureTools.C              | 9 +++++----
 .../utilities/pressureTools/pressureTools.H              | 6 +++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
index 29852a42f8..3e28db3090 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
+++ b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
@@ -154,14 +154,15 @@ Foam::tmp<Foam::volScalarField> Foam::pressureTools::pDyn
 
 Foam::tmp<Foam::volScalarField> Foam::pressureTools::convertToCoeff
 (
-    const volScalarField& p
+    const volScalarField& pCalculated,
+    const volScalarField& pIn
 ) const
 {
-    tmp<volScalarField> tCoeff(p);
+    tmp<volScalarField> tCoeff(pCalculated);
 
     if (calcCoeff_)
     {
-        tCoeff() /= pDyn(p);
+        tCoeff() /= pDyn(pIn) + dimensionedScalar("p0", dimPressure, SMALL);
     }
 
     return tCoeff;
@@ -271,7 +272,7 @@ void Foam::pressureTools::write()
                 obr_,
                 IOobject::NO_READ
             ),
-            convertToCoeff(rhoScale(p)*p + pDyn(p) + pRef())
+            convertToCoeff(rhoScale(p)*p + pDyn(p) + pRef(), p)
         );
 
         pResult.write();
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
index 71784edf1d..f823c8faea 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
+++ b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
@@ -153,7 +153,11 @@ class pressureTools
         tmp<volScalarField> pDyn(const volScalarField& p) const;
 
         //- Convert to coeff data by applying the pDyn scaling
-        tmp<volScalarField> convertToCoeff(const volScalarField& p) const;
+        tmp<volScalarField> convertToCoeff
+        (
+            const volScalarField& pCalculated,
+            const volScalarField& pIn
+        ) const;
 
         //- Disallow default bitwise copy construct
         pressureTools(const pressureTools&);