From 0bcb6aa87121788b0df43f9ac3475dd9867a420c Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 5 Dec 2012 16:30:46 +0000
Subject: [PATCH] ENH: rhoSimpleFoam - updated handling of generic sources

---
 applications/solvers/compressible/rhoSimpleFoam/UEqn.H | 2 ++
 applications/solvers/compressible/rhoSimpleFoam/pEqn.H | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
index 21ec2646be..8bbd960281 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
@@ -4,6 +4,8 @@
     (
         fvm::div(phi, U)
       + turbulence->divDevRhoReff(U)
+     ==
+        sources(rho, U)
     );
 
     UEqn().relax();
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index 2ea228f172..4f1ad08b28 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -6,7 +6,7 @@
 
     volScalarField rAU(1.0/UEqn().A());
     volVectorField HbyA("HbyA", U);
-    HbyA = rAU*(UEqn() == sources(rho, U))().H();
+    HbyA = rAU*UEqn().H();
 
     UEqn.clear();
 
@@ -20,6 +20,8 @@
             fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
         );
 
+        sources.relativeFlux(fvc::interpolate(psi), phid);
+
         while (simple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
@@ -53,6 +55,8 @@
             fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
         );
 
+        sources.relativeFlux(fvc::interpolate(rho), phiHbyA);
+
         closedVolume = adjustPhi(phiHbyA, U, p);
 
         while (simple.correctNonOrthogonal())