From cddce4cc5433faad7802bef4e70ea77d475386f0 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 25 Oct 2010 15:58:55 +0100
Subject: [PATCH] ENH: Updated coalChemistryFoam solver

---
 applications/solvers/lagrangian/coalChemistryFoam/UEqn.H   | 4 ++--
 applications/solvers/lagrangian/coalChemistryFoam/YEqn.H   | 2 +-
 applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H  | 4 ++--
 applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
index 5851cdcf95..a6d7127800 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
@@ -5,8 +5,8 @@
       + turbulence->divDevRhoReff(U)
      ==
         rho.dimensionedInternalField()*g
-      + coalParcels.SU()
-      + limestoneParcels.SU()
+      + coalParcels.SU(U)
+      + limestoneParcels.SU(U)
     );
 
     UEqn.relax();
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
index abe03f60c0..0b04bdabba 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
@@ -25,7 +25,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
               + mvConvection->fvmDiv(phi, Yi)
               - fvm::laplacian(turbulence->muEff(), Yi)
               ==
-                coalParcels.Srho(i)
+                coalParcels.SYi(i, Yi)
               + kappa*chemistry.RR(i)().dimensionedInternalField()
             );
 
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H
index 40eb26709e..2dcb13c79f 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H
@@ -6,8 +6,8 @@
       - fvm::laplacian(turbulence->alphaEff(), hs)
      ==
         DpDt
-     +  coalParcels.Sh()
-     +  limestoneParcels.Sh()
+     +  coalParcels.Sh(hs)
+     +  limestoneParcels.Sh(hs)
      +  enthalpySource.Su()
      +  radiation->Shs(thermo)
      +  chemistrySh
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H
index 08fbb120f5..5e4bb09d84 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H
@@ -35,7 +35,7 @@ Description
         fvm::ddt(rho)
       + fvc::div(phi)
       ==
-        coalParcels.Srho()
+        coalParcels.Srho(rho)
     );
 }