From 16a90e82ffd011d11d5dd17cb744c6f58789e749 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 17 Feb 2015 10:47:34 +0000
Subject: [PATCH] applications/solvers: Update trans-sonic option in pEqns to
 by consistent with sonic-solvers

---
 applications/solvers/combustion/PDRFoam/pEqn.H              | 5 +++--
 applications/solvers/combustion/XiFoam/pEqn.H               | 6 +++---
 applications/solvers/combustion/engineFoam/pEqn.H           | 6 +++---
 applications/solvers/combustion/reactingFoam/pEqn.H         | 6 +++---
 .../solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H  | 6 +++---
 applications/solvers/lagrangian/coalChemistryFoam/pEqn.H    | 6 +++---
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/applications/solvers/combustion/PDRFoam/pEqn.H b/applications/solvers/combustion/PDRFoam/pEqn.H
index 3053d4c68c8..714a3e84e8b 100644
--- a/applications/solvers/combustion/PDRFoam/pEqn.H
+++ b/applications/solvers/combustion/PDRFoam/pEqn.H
@@ -12,9 +12,10 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
+            (fvc::interpolate(HbyA) & mesh.Sf())
           + fvc::interpolate(rho*rAU)*fvc::ddtCorr(rho, U, phi)
-        )/fvc::interpolate(rho)
+           /fvc::interpolate(rho)
+        )
     );
 
     while (pimple.correctNonOrthogonal())
diff --git a/applications/solvers/combustion/XiFoam/pEqn.H b/applications/solvers/combustion/XiFoam/pEqn.H
index 915f1af653a..213cfd1332f 100644
--- a/applications/solvers/combustion/XiFoam/pEqn.H
+++ b/applications/solvers/combustion/XiFoam/pEqn.H
@@ -13,9 +13,9 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
-          + rhorAUf*fvc::ddtCorr(rho, U, phi)
-        )/fvc::interpolate(rho)
+            (fvc::interpolate(HbyA) & mesh.Sf())
+          + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
+        )
     );
 
     fvOptions.makeRelative(fvc::interpolate(psi), phid);
diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/engineFoam/pEqn.H
index aee12f4dc04..664e99d0c71 100644
--- a/applications/solvers/combustion/engineFoam/pEqn.H
+++ b/applications/solvers/combustion/engineFoam/pEqn.H
@@ -14,9 +14,9 @@ if (pimple.transonic())
         fvc::interpolate(psi)
        *(
             (
-                (fvc::interpolate(rho*HbyA) & mesh.Sf())
-              + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)
-            )/fvc::interpolate(rho)
+                (fvc::interpolate(HbyA) & mesh.Sf())
+              + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)/fvc::interpolate(rho)
+            )
         )
     );
 
diff --git a/applications/solvers/combustion/reactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/pEqn.H
index 0033563a7de..9768825317d 100644
--- a/applications/solvers/combustion/reactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pEqn.H
@@ -13,9 +13,9 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
-          + rhorAUf*fvc::ddtCorr(rho, U, phi)
-        )/fvc::interpolate(rho)
+            (fvc::interpolate(HbyA) & mesh.Sf())
+          + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
+        )
     );
 
     fvOptions.makeRelative(fvc::interpolate(psi), phid);
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
index ea5449ee99f..f17f8bcd76e 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H
@@ -17,9 +17,9 @@
         (
             "phiHbyA",
             (
-                (fvc::interpolate(rho*HbyA) & mesh.Sf())
-              + rhorAUf*fvc::ddtCorr(rho, U, phi)
-            )/fvc::interpolate(rho)
+                (fvc::interpolate(HbyA) & mesh.Sf())
+              + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
+            )
         );
 
         fvOptions.makeRelative(phiHbyA);
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
index 479d9d7af65..c75fd95bb94 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
@@ -13,9 +13,9 @@ if (pimple.transonic())
         "phid",
         fvc::interpolate(psi)
        *(
-            (fvc::interpolate(rho*HbyA) & mesh.Sf())
-          + rhorAUf*fvc::ddtCorr(rho, U, phi)
-        )/fvc::interpolate(rho)
+            (fvc::interpolate(HbyA) & mesh.Sf())
+          + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
+        )
     );
 
     fvOptions.makeRelative(fvc::interpolate(psi), phid);
-- 
GitLab