Merge branch 'master' of dm:/home/dm4/OpenFOAM/OpenFOAM-dev

applications/solvers/combustion/XiFoam/EaEqn.H

@@ -25,5 +25,7 @@
 
     EaEqn.solve();
 
+    sources.correct(hea);
+
     thermo.correct();
 }

applications/solvers/combustion/XiFoam/EauEqn.H

@@ -2,7 +2,7 @@ if (ign.ignited())
 {
     volScalarField& heau = thermo.heu();
 
-    solve
+    fvScalarMatrix heauEqn
     (
         fvm::ddt(rho, heau) + mvConvection->fvmDiv(phi, heau)
       + (fvc::ddt(rho, K) + fvc::div(phi, K))*rho/thermo.rhou()
@@ -23,5 +23,14 @@ if (ign.ignited())
         // A possible solution would be to solve for ftu as well as ft.
         //- fvm::div(muEff*fvc::grad(b)/(b + 0.001), heau)
         //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), heau)
+
+     ==
+        sources(rho, heau)
     );
+
+    sources.constrain(heauEqn);
+
+    heauEqn.solve();
+
+    sources.correct(heau);
 }

applications/solvers/combustion/XiFoam/UEqn.H

@@ -15,5 +15,7 @@
     if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
+
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/combustion/XiFoam/XiFoam.C

@@ -69,6 +69,7 @@ int main(int argc, char *argv[])
     #include "readCombustionProperties.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/XiFoam/bEqn.H

@@ -71,6 +71,8 @@ if (ign.ignited())
 
     bEqn.solve();
 
+    sources.correct(b);
+
     Info<< "min(b) = " << min(b).value() << endl;
 
 
@@ -167,6 +169,8 @@ if (ign.ignited())
 
         SuEqn.solve();
 
+        sources.correct(Su);
+
         // Limit the maximum Su
         // ~~~~~~~~~~~~~~~~~~~~
         Su.min(SuMax);
@@ -252,6 +256,8 @@ if (ign.ignited())
 
         XiEqn.solve();
 
+        sources.correct(Xi);
+
         // Correct boundedness of Xi
         // ~~~~~~~~~~~~~~~~~~~~~~~~~
         Xi.max(1.0);

applications/solvers/combustion/XiFoam/createFields.H

@@ -138,5 +138,3 @@
     fields.add(b);
     fields.add(thermo.he());
     fields.add(thermo.heu());
-
-    IObasicSourceList sources(mesh);

applications/solvers/combustion/XiFoam/ftEqn.H

@@ -25,4 +25,6 @@ if (composition.contains("ft"))
     sources.constrain(ftEqn);
 
     ftEqn.solve();
+
+    sources.correct(ft);
 }

applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C

@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
     #include "createEngineTime.H"
     #include "createEngineMesh.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
     #include "readEngineTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/coldEngineFoam/createFields.H

@@ -69,6 +69,3 @@
 
     Info<< "Creating field kinetic energy K\n" << endl;
     volScalarField K("K", 0.5*magSqr(U));
-
-    Info<< "Creating sources\n" << endl;
-    IObasicSourceList sources(mesh);

applications/solvers/combustion/engineFoam/UEqn.H

@@ -10,5 +10,7 @@
     if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
+
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/combustion/engineFoam/engineFoam.C

@@ -71,6 +71,7 @@ int main(int argc, char *argv[])
     #include "createEngineMesh.H"
     #include "readCombustionProperties.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
     #include "readEngineTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/fireFoam/UEqn.H

@@ -27,5 +27,6 @@
             )
         );
 
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/combustion/fireFoam/YEEqn.H

@@ -39,6 +39,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
             YiEqn.solve(mesh.solver("Yi"));
 
+            sources.correct(Yi);
+
             Yi.max(0.0);
             Yt += Yi;
         }
@@ -82,6 +84,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
 
     Info<< "min/max(T) = "

applications/solvers/combustion/fireFoam/createFields.H

@@ -146,6 +146,3 @@
     (
         additionalControlsDict.lookup("solvePrimaryRegion")
     );
-
-    IObasicSourceList sources(mesh);
-

applications/solvers/combustion/fireFoam/fireFoam.C

@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "createClouds.H"
     #include "createSurfaceFilmModel.H"
     #include "createPyrolysisModel.H"

applications/solvers/combustion/fireFoam/rhoEqn.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,6 +43,8 @@ Description
     sources.constrain(rhoEqn);
 
     rhoEqn.solve();
+
+    sources.correct(rho);
 }
 
 // ************************************************************************* //

applications/solvers/combustion/reactingFoam/EEqn.H

@@ -28,6 +28,8 @@
 
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
 
     Info<< "min/max(T) = "

applications/solvers/combustion/reactingFoam/UEqn.H

@@ -15,5 +15,7 @@
     if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
+
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/combustion/reactingFoam/YEqn.H

@@ -37,6 +37,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
             YiEqn.solve(mesh.solver("Yi"));
 
+            sources.correct(Yi);
+
             Yi.max(0.0);
             Yt += Yi;
         }

applications/solvers/combustion/reactingFoam/createFields.H

@@ -99,5 +99,3 @@ volScalarField dQ
     mesh,
     dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
 );
-
-IObasicSourceList sources(mesh);

applications/solvers/combustion/reactingFoam/reactingFoam.C

@@ -45,6 +45,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/rhoReactingFoam/createFields.H

@@ -101,5 +101,3 @@ volScalarField dQ
     mesh,
     dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
 );
-
-IObasicSourceList sources(mesh);

applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C

@@ -46,6 +46,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/compressible/rhoPimpleFoam/EEqn.H

@@ -21,8 +21,12 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
 }

applications/solvers/compressible/rhoPimpleFoam/UEqn.H

@@ -16,5 +16,7 @@ sources.constrain(UEqn());
 if (pimple.momentumPredictor())
 {
     solve(UEqn() == -fvc::grad(p));
+
+    sources.correct(U);
     K = 0.5*magSqr(U);
 }

applications/solvers/compressible/rhoPimpleFoam/createFields.H

@@ -69,6 +69,3 @@
 
     Info<< "Creating field kinetic energy K\n" << endl;
     volScalarField K("K", 0.5*magSqr(U));
-
-    Info<< "Creating sources\n" << endl;
-    IObasicSourceList sources(mesh);

applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C

@@ -54,6 +54,7 @@ int main(int argc, char *argv[])
 
     #include "setInitialrDeltaT.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
     pimpleControl pimple(mesh);
 
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C

@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
     pimpleControl pimple(mesh);
 
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/compressible/rhoSimpleFoam/Allwclean

@@ -3,7 +3,7 @@ cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 wclean
-wclean rhoPorousMRFSimpleFoam
+wclean rhoPorousSimpleFoam
 wclean rhoSimplecFoam
 
 # ----------------------------------------------------------------- end-of-file

applications/solvers/compressible/rhoSimpleFoam/Allwmake

@@ -3,7 +3,7 @@ cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 wmake
-wmake rhoPorousMRFSimpleFoam
+wmake rhoPorousSimpleFoam
 wmake rhoSimplecFoam
 
 # ----------------------------------------------------------------- end-of-file

applications/solvers/compressible/rhoSimpleFoam/EEqn.H

@@ -15,8 +15,12 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
 }

applications/solvers/compressible/rhoSimpleFoam/UEqn.H

@@ -10,4 +10,8 @@
 
     UEqn().relax();
 
+    sources.constrain(UEqn());
+
     solve(UEqn() == -fvc::grad(p));
+
+    sources.correct(U);

applications/solvers/compressible/rhoSimpleFoam/createFields.H

@@ -60,6 +60,3 @@
     );
 
     dimensionedScalar initialMass = fvc::domainIntegrate(rho);
-    
-    Info<< "Creating sources\n" << endl;
-    IObasicSourceList sources(mesh);

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H

@@ -15,8 +15,12 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
 }

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H

@@ -33,6 +33,8 @@
             U = trTU() & ((UEqn() == sources(rho, U))().H() - gradp);
         }
         U.correctBoundaryConditions();
+
+        sources.correct(U);
     }
     else
     {
@@ -42,6 +44,8 @@
 
         solve(UEqn() == -fvc::grad(p) + sources(rho, U));
 
+        sources.correct(U);
+
         trAU = 1.0/UEqn().A();
         trAU().rename("rAU");
     }

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H

@@ -59,6 +59,3 @@
     );
 
     dimensionedScalar initialMass = fvc::domainIntegrate(rho);
-
-    Info<< "Creating sources\n" << endl;
-    IObasicSourceList sources(mesh);

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C

@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
     simpleControl simple(mesh);
 
     #include "createFields.H"
+    #include "createSources.H"
     #include "createZones.H"
     #include "initContinuityErrs.H"
 

applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C

@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
     simpleControl simple(mesh);
 
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C

@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
     simpleControl simple(mesh);
 
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H

@@ -21,8 +21,12 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
 }

applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H

@@ -27,5 +27,7 @@
                 )*mesh.magSf()
             )
         );
+
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C

@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"

applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H

@@ -86,6 +86,3 @@
 
     Info<< "Creating field kinetic energy K\n" << endl;
     volScalarField K("K", 0.5*magSqr(U));
-
-    Info<< "Creating sources\n" << endl;
-    IObasicSourceList sources(mesh);

applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H

@@ -21,6 +21,8 @@
 
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
     radiation->correct();
 }

applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H

@@ -26,4 +26,6 @@
                 )*mesh.magSf()
             )
         );
+
+        sources.correct(U);
     }

applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C

@@ -46,6 +46,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
 

applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H

@@ -87,5 +87,3 @@
 
     dimensionedScalar initialMass = fvc::domainIntegrate(rho);
     dimensionedScalar totalVolume = sum(mesh.V());
-
-    IObasicSourceList sources(mesh);

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C

@@ -45,7 +45,6 @@ Description
 #include "solidRegionDiffNo.H"
 #include "solidThermo.H"
 #include "radiationModel.H"
-#include "IOporosityModelList.H"
 #include "IObasicSourceList.H"
 
 

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H

@@ -21,6 +21,8 @@
 
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
     rad.correct();
 

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H

@@ -23,3 +23,5 @@
             )*mesh.magSf()
         )
     );
+
+    sources.correct(U);

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H

@@ -17,7 +17,7 @@
     PtrList<dimensionedScalar> rhoMax(fluidRegions.size());
     PtrList<dimensionedScalar> rhoMin(fluidRegions.size());
 
-    PtrList<IObasicSourceList> heatSources(fluidRegions.size());
+    PtrList<IObasicSourceList> fluidSources(fluidRegions.size());
 
     // Populate fluid field pointer lists
     forAll(fluidRegions, i)
@@ -194,7 +194,7 @@
         );
 
         Info<< "    Adding sources\n" << endl;
-        heatSources.set
+        fluidSources.set
         (
             i,
             new IObasicSourceList(fluidRegions[i])

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H

@@ -12,7 +12,7 @@
     volScalarField& p = thermo.p();
     const volScalarField& psi = thermo.psi();
 
-    IObasicSourceList& sources = heatSources[i];
+    IObasicSourceList& sources = fluidSources[i];
 
     const dimensionedScalar initialMass
     (

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H

@@ -6,8 +6,14 @@
            - fvm::laplacian(betav*alpha, h, "laplacian(alpha,h)")
            + sources(rho, h)
         );
+
         hEqn.relax();
+
+        sources.constrain(hEqn);
+
         hEqn.solve();
+
+        sources.correct(h);
     }
 }
 

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H

@@ -22,8 +22,13 @@
     );
 
     EEqn.relax();
+
+    sources.constrain(EEqn);
+
     EEqn.solve(mesh.solver(he.select(finalIter)));
 
+    sources.correct(he);
+
     thermo.correct();
     rad.correct();
 

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H

@@ -9,8 +9,7 @@
 
     UEqn().relax();
 
-    // Add porous resistance
+    sources.constrain(UEqn());
-    pZones.addResistance(UEqn());
 
     if (momentumPredictor)
     {
@@ -21,11 +20,13 @@
             fvc::reconstruct
             (
                 (
-                    - ghf*fvc::snGrad(rho)
+                  - ghf*fvc::snGrad(rho)
-                    - fvc::snGrad(p_rgh)
+                  - fvc::snGrad(p_rgh)
                 )*mesh.magSf()
             ),
             mesh.solver(U.select(finalIter))
         );
+
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H

@@ -14,8 +14,7 @@
 
     List<scalar> initialMassFluid(fluidRegions.size());
 
-    PtrList<IObasicSourceList> heatSources(fluidRegions.size());
+    PtrList<IObasicSourceList> fluidSources(fluidRegions.size());
-    PtrList<IOporosityModelList> porousZonesFluid(fluidRegions.size());
 
     // Populate fluid field pointer lists
     forAll(fluidRegions, i)
@@ -192,16 +191,9 @@
         );
 
         Info<< "    Adding sources\n" << endl;
-        heatSources.set
+        fluidSources.set
         (
             i,
             new IObasicSourceList(fluidRegions[i])
         );
-
-        Info<< "    Adding porous zones\n" << endl;
-        porousZonesFluid.set
-        (
-            i,
-            new IOporosityModelList(fluidRegions[i])
-        );
     }

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H

@@ -20,9 +20,7 @@
 
     radiation::radiationModel& rad = radiation[i];
 
-    IObasicSourceList& sources = heatSources[i];
+    IObasicSourceList& sources = fluidSources[i];
-
-    const IOporosityModelList& pZones = porousZonesFluid[i];
 
     const dimensionedScalar initialMass
     (

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H

@@ -19,6 +19,8 @@ if (finalIter)
         sources.constrain(hEqn());
 
         hEqn().solve(mesh.solver(h.select(finalIter)));
+
+        sources.correct(h);
     }
 }
 

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
 
     pimpleControl pimple(mesh);

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H

@@ -12,3 +12,5 @@
     sources.constrain(UrelEqn());
 
     solve(UrelEqn() == -fvc::grad(p) + sources(Urel));
+
+    sources.correct(Urel);

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H

@@ -70,6 +70,3 @@ volVectorField U
     ),
     Urel + SRF->U()
 );
-
-
-IObasicSourceList sources(mesh);

applications/solvers/incompressible/pimpleFoam/UEqn.H

@@ -18,4 +18,6 @@ volScalarField rAU(1.0/UEqn().A());
 if (pimple.momentumPredictor())
 {
     solve(UEqn() == -fvc::grad(p));
+
+    sources.correct(U);
 }

applications/solvers/incompressible/pimpleFoam/createFields.H

@@ -40,6 +40,3 @@ autoPtr<incompressible::turbulenceModel> turbulence
 (
     incompressible::turbulenceModel::New(U, phi, laminarTransport)
 );
-
-
-IObasicSourceList sources(mesh);

applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/UEqn.H

@@ -16,4 +16,6 @@ rAU = 1.0/UEqn().A();
 if (pimple.momentumPredictor())
 {
     solve(UEqn() == -fvc::grad(p) + sources(U));
+
+    sources.correct(U);
 }

applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createFields.H

@@ -56,6 +56,3 @@
         runTime.deltaT(),
         zeroGradientFvPatchScalarField::typeName
     );
-
-
-    IObasicSourceList sources(mesh);

applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "readTimeControls.H"
 
     pimpleControl pimple(mesh);

applications/solvers/incompressible/pimpleFoam/pimpleFoam.C

@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
 
     pimpleControl pimple(mesh);

applications/solvers/incompressible/potentialFreeSurfaceFoam/UEqn.H

@@ -13,4 +13,6 @@ sources.constrain(UEqn());
 if (pimple.momentumPredictor())
 {
     solve(UEqn() == -fvc::grad(p_gh) + sources(U));
+
+    sources.correct(U);
 }

applications/solvers/incompressible/potentialFreeSurfaceFoam/createFields.H

@@ -74,6 +74,3 @@
     label p_ghRefCell = 0;
     scalar p_ghRefValue = 0.0;
     setRefCell(p_gh, pimple.dict(), p_ghRefCell, p_ghRefValue);
-
-
-    IObasicSourceList sources(mesh);

applications/solvers/incompressible/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
     pimpleControl pimple(mesh);
 
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,6 +45,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
 
     simpleControl simple(mesh);

applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H

@@ -14,3 +14,5 @@
     sources.constrain(UrelEqn());
 
     solve(UrelEqn() == -fvc::grad(p));
+
+    sources.correct(Urel);

applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H

@@ -52,9 +52,4 @@
     );
 
     Info<< "Creating SRF model\n" << endl;
-    autoPtr<SRF::SRFModel> SRF
+    autoPtr<SRF::SRFModel> SRF(SRF::SRFModel::New(Urel));
-    (
-        SRF::SRFModel::New(Urel)
-    );
-
-    IObasicSourceList sources(mesh);

applications/solvers/incompressible/simpleFoam/UEqn.H

@@ -13,3 +13,5 @@
     sources.constrain(UEqn());
 
     solve(UEqn() == -fvc::grad(p));
+
+    sources.correct(U);

applications/solvers/incompressible/simpleFoam/createFields.H

@@ -39,5 +39,3 @@
     (
         incompressible::RASModel::New(U, phi, laminarTransport)
     );
-
-    IObasicSourceList sources(mesh);

applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H

@@ -12,8 +12,6 @@
 
     UEqn().relax();
 
-    sources.constrain(UEqn());
-
     // Include the porous media resistance and solve the momentum equation
     // either implicit in the tensorial resistance or transport using by
     // including the spherical part of the resistance in the momentum diagonal
@@ -28,6 +26,8 @@
         trTU = inv(tTU());
         trTU().rename("rAU");
 
+        sources.constrain(UEqn());
+
         volVectorField gradp(fvc::grad(p));
 
         for (int UCorr=0; UCorr<nUCorr; UCorr++)
@@ -35,13 +35,19 @@
             U = trTU() & (UEqn().H() - gradp);
         }
         U.correctBoundaryConditions();
+
+        sources.correct(U);
     }
     else
     {
         pZones.addResistance(UEqn());
 
+        sources.constrain(UEqn());
+
         solve(UEqn() == -fvc::grad(p));
 
+        sources.correct(U);
+
         trAU = 1.0/UEqn().A();
         trAU().rename("rAU");
     }

applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C

@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
     simpleControl simple(mesh);
 
     #include "createFields.H"
+    #include "createSources.H"
     #include "createZones.H"
     #include "initContinuityErrs.H"
 

applications/solvers/incompressible/simpleFoam/simpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
 
     simpleControl simple(mesh);

applications/solvers/lagrangian/coalChemistryFoam/EEqn.H

@@ -25,9 +25,13 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
     radiation->correct();
 

applications/solvers/lagrangian/coalChemistryFoam/UEqn.H

@@ -17,5 +17,7 @@
     if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
+
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/lagrangian/coalChemistryFoam/YEqn.H

@@ -39,6 +39,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
             YiEqn.solve(mesh.solver("Yi"));
 
+            sources.correct(Yi);
+
             Yi.max(0.0);
             Yt += Yi;
         }

applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C

@@ -55,6 +55,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "createClouds.H"
     #include "createRadiationModel.H"
     #include "initContinuityErrs.H"

applications/solvers/lagrangian/coalChemistryFoam/createFields.H

@@ -126,9 +126,6 @@
     Info<< "Creating field kinetic energy K\n" << endl;
     volScalarField K("K", 0.5*magSqr(U));
 
-    Info<< "\nConstructing sources" << endl;
-    IObasicSourceList sources(mesh);
-
     volScalarField dQ
     (
         IOobject

applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,6 +42,8 @@ Description
     sources.constrain(rhoEqn);
 
     rhoEqn.solve();
+
+    sources.correct(rho);
 }
 
 // ************************************************************************* //

applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H

@@ -25,9 +25,13 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
     radiation->correct();
 

applications/solvers/lagrangian/reactingParcelFilmFoam/UEqn.H

@@ -26,5 +26,7 @@
                 )*mesh.magSf()
             )
         );
+
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H

@@ -40,6 +40,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
             YEqn.solve(mesh.solver("Yi"));
 
+            sources.correct(Yi);
+
             Yi.max(0.0);
             Yt += Yi;
         }

applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H

@@ -139,5 +139,3 @@
         mesh,
         dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
     );
-
-    IObasicSourceList sources(mesh);

applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C

@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "createClouds.H"
     #include "createRadiationModel.H"
     #include "createSurfaceFilmModel.H"

applications/solvers/lagrangian/reactingParcelFilmFoam/rhoEqn.H

@@ -30,7 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 {
-    solve
+    fvScalarMatrix rhoEqn
     (
         fvm::ddt(rho)
       + fvc::div(phi)
@@ -39,6 +39,12 @@ Description
       + surfaceFilm.Srho()
       + sources(rho)
     );
+
+    sources.constrain(rhoEqn);
+
+    rhoEqn.solve();
+
+    sources.correct(rho);
 }
 
 // ************************************************************************* //

applications/solvers/lagrangian/reactingParcelFoam/EEqn.H

@@ -24,9 +24,13 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
     radiation->correct();
 

applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C

@@ -60,11 +60,10 @@ int main(int argc, char *argv[])
 
     #include "readTimeControls.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "createRDeltaT.H"
     #include "createRadiationModel.H"
     #include "createClouds.H"
-    #include "createExplicitSources.H"
-    #include "createPorousZones.H"
     #include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/lagrangian/reactingParcelFoam/UEqn.H

@@ -1,6 +1,5 @@
     fvVectorMatrix UEqn
     (
-        //pZones.ddt(rho, U)
         fvm::ddt(rho, U)
       + fvm::div(phi, U)
       + turbulence->divDevRhoReff(U)
@@ -14,10 +13,10 @@
 
     sources.constrain(UEqn);
 
-    pZones.addResistance(UEqn);
-
     if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
+
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/lagrangian/reactingParcelFoam/YEqn.H

@@ -38,6 +38,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
             YEqn.solve(mesh.solver("Yi"));
 
+            sources.correct(Yi);
+
             Yi.max(0.0);
             Yt += Yi;
         }

applications/solvers/lagrangian/reactingParcelFoam/createExplicitSources.H

@@ -1,2 +0,0 @@
-Info<< "Creating sources\n" << endl;
-IObasicSourceList sources(mesh);

applications/solvers/lagrangian/reactingParcelFoam/createPorousZones.H

@@ -1,3 +0,0 @@
-    Info<< "Creating porous zones" << nl << endl;
-
-    IOporosityModelList pZones(mesh);

applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C

@@ -64,8 +64,7 @@ int main(int argc, char *argv[])
     #include "createFields.H"
     #include "createRadiationModel.H"
     #include "createClouds.H"
-    #include "createExplicitSources.H"
+    #include "createSources.H"
-    #include "createPorousZones.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/lagrangian/reactingParcelFoam/rhoEqn.H

@@ -43,6 +43,8 @@ Description
 
     rhoEqn.solve();
 
+    sources.correct(rho);
+
     Info<< "rho min/max = " << min(rho).value() << ", " << max(rho).value()
         << endl;
 }

applications/solvers/lagrangian/sprayFoam/UEqn.H

@@ -16,5 +16,7 @@
     if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
+
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }