From 577ef5742d57752c73defdc3949c4eae4024d4d7 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 6 Dec 2012 13:30:04 +0000
Subject: [PATCH] ENH: buoyantPimpleFoam - updated equation sources

---
 applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H   | 5 ++++-
 .../heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C       | 1 -
 applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H   | 4 +++-
 .../solvers/heatTransfer/buoyantSimpleFoam/createZones.H     | 3 ---
 4 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 applications/solvers/heatTransfer/buoyantSimpleFoam/createZones.H

diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
index d8f3bb56ce..e12724ed69 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
@@ -5,10 +5,14 @@
         fvm::ddt(rho, U)
       + fvm::div(phi, U)
       + turbulence->divDevRhoReff(U)
+     ==
+        sources(rho, U)
     );
 
     UEqn.relax();
 
+    sources.constrain(UEqn);
+
     if (pimple.momentumPredictor())
     {
         solve
@@ -22,7 +26,6 @@
                   - fvc::snGrad(p_rgh)
                 )*mesh.magSf()
             )
-          + sources(rho, U)
         );
         K = 0.5*magSqr(U);
     }
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
index 79d3fb7f2f..c78c453058 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
@@ -36,7 +36,6 @@ Description
 #include "fvCFD.H"
 #include "rhoThermo.H"
 #include "turbulenceModel.H"
-#include "fixedGradientFvPatchFields.H"
 #include "IObasicSourceList.H"
 #include "pimpleControl.H"
 
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
index 86c314c9c4..e82c1fa97c 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@@ -9,7 +9,7 @@
     surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 
     volVectorField HbyA("HbyA", U);
-    HbyA = rAU*(UEqn == sources(rho, U))().H();
+    HbyA = rAU*UEqn.H();
 
     surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
@@ -24,6 +24,8 @@
       + phig
     );
 
+    sources.relativeFlux(fvc::interpolate(rho), phiHbyA);
+
     fvScalarMatrix p_rghDDtEqn
     (
         fvc::ddt(rho) + psi*correction(fvm::ddt(p_rgh))
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createZones.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createZones.H
deleted file mode 100644
index 08480c68d2..0000000000
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createZones.H
+++ /dev/null
@@ -1,3 +0,0 @@
-    IOMRFZoneList mrfZones(mesh);
-    mrfZones.correctBoundaryVelocity(U);
-