diff --git a/applications/solvers/combustion/XiFoam/EaEqn.H b/applications/solvers/combustion/XiFoam/EaEqn.H
index 5493722c93..2565e3f9e3 100644
--- a/applications/solvers/combustion/XiFoam/EaEqn.H
+++ b/applications/solvers/combustion/XiFoam/EaEqn.H
@@ -25,5 +25,7 @@
 
     EaEqn.solve();
 
+    sources.correct(hea);
+
     thermo.correct();
 }
diff --git a/applications/solvers/combustion/XiFoam/EauEqn.H b/applications/solvers/combustion/XiFoam/EauEqn.H
index b13a63bb60..092cdc2a6d 100644
--- a/applications/solvers/combustion/XiFoam/EauEqn.H
+++ b/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);
 }
diff --git a/applications/solvers/combustion/XiFoam/UEqn.H b/applications/solvers/combustion/XiFoam/UEqn.H
index 643a99f134..95f10bfcc9 100644
--- a/applications/solvers/combustion/XiFoam/UEqn.H
+++ b/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);
     }
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index a3e90f7169..bebbd49266 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/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"
diff --git a/applications/solvers/combustion/XiFoam/bEqn.H b/applications/solvers/combustion/XiFoam/bEqn.H
index 49c2c63ae7..e10be7b6df 100644
--- a/applications/solvers/combustion/XiFoam/bEqn.H
+++ b/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);
diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H
index 3b7cd9b7ae..17103885e5 100644
--- a/applications/solvers/combustion/XiFoam/createFields.H
+++ b/applications/solvers/combustion/XiFoam/createFields.H
@@ -138,5 +138,3 @@
     fields.add(b);
     fields.add(thermo.he());
     fields.add(thermo.heu());
-
-    IObasicSourceList sources(mesh);
diff --git a/applications/solvers/combustion/XiFoam/ftEqn.H b/applications/solvers/combustion/XiFoam/ftEqn.H
index da1d76fe69..013e8b3180 100644
--- a/applications/solvers/combustion/XiFoam/ftEqn.H
+++ b/applications/solvers/combustion/XiFoam/ftEqn.H
@@ -25,4 +25,6 @@ if (composition.contains("ft"))
     sources.constrain(ftEqn);
 
     ftEqn.solve();
+
+    sources.correct(ft);
 }
diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
index 401690c3e4..3b229ded14 100644
--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/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"
diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H
index 72e88435ac..f78e5bde29 100644
--- a/applications/solvers/combustion/coldEngineFoam/createFields.H
+++ b/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);
diff --git a/applications/solvers/combustion/engineFoam/UEqn.H b/applications/solvers/combustion/engineFoam/UEqn.H
index de3dc757cc..a8b0207225 100644
--- a/applications/solvers/combustion/engineFoam/UEqn.H
+++ b/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);
     }
diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C
index 65cd0356ed..f11f677398 100644
--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/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"
diff --git a/applications/solvers/combustion/fireFoam/UEqn.H b/applications/solvers/combustion/fireFoam/UEqn.H
index 90e633fc36..81d90bd695 100644
--- a/applications/solvers/combustion/fireFoam/UEqn.H
+++ b/applications/solvers/combustion/fireFoam/UEqn.H
@@ -27,5 +27,6 @@
             )
         );
 
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }
diff --git a/applications/solvers/combustion/fireFoam/YEEqn.H b/applications/solvers/combustion/fireFoam/YEEqn.H
index a23f99dab7..358e4953d1 100644
--- a/applications/solvers/combustion/fireFoam/YEEqn.H
+++ b/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) = "
diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H
index 9ebd05196c..8159ee73aa 100644
--- a/applications/solvers/combustion/fireFoam/createFields.H
+++ b/applications/solvers/combustion/fireFoam/createFields.H
@@ -146,6 +146,3 @@
     (
         additionalControlsDict.lookup("solvePrimaryRegion")
     );
-
-    IObasicSourceList sources(mesh);
-
diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C
index 3f30495a99..afe1b815e5 100644
--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/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"
diff --git a/applications/solvers/combustion/fireFoam/rhoEqn.H b/applications/solvers/combustion/fireFoam/rhoEqn.H
index c465309edb..5cc780abb1 100644
--- a/applications/solvers/combustion/fireFoam/rhoEqn.H
+++ b/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);
 }
 
 // ************************************************************************* //
diff --git a/applications/solvers/combustion/reactingFoam/EEqn.H b/applications/solvers/combustion/reactingFoam/EEqn.H
index 5568c7e5be..c3f25da17d 100644
--- a/applications/solvers/combustion/reactingFoam/EEqn.H
+++ b/applications/solvers/combustion/reactingFoam/EEqn.H
@@ -28,6 +28,8 @@
 
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
 
     Info<< "min/max(T) = "
diff --git a/applications/solvers/combustion/reactingFoam/UEqn.H b/applications/solvers/combustion/reactingFoam/UEqn.H
index 643a99f134..95f10bfcc9 100644
--- a/applications/solvers/combustion/reactingFoam/UEqn.H
+++ b/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);
     }
diff --git a/applications/solvers/combustion/reactingFoam/YEqn.H b/applications/solvers/combustion/reactingFoam/YEqn.H
index 2f0d29fd84..c9b4942a5b 100644
--- a/applications/solvers/combustion/reactingFoam/YEqn.H
+++ b/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;
         }
diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H
index 21769875ea..32bdd372ee 100644
--- a/applications/solvers/combustion/reactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/createFields.H
@@ -99,5 +99,3 @@ volScalarField dQ
     mesh,
     dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
 );
-
-IObasicSourceList sources(mesh);
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index c68f94ebf7..5ebd3573a8 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/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"
diff --git a/applications/solvers/combustion/rhoReactingFoam/createFields.H b/applications/solvers/combustion/rhoReactingFoam/createFields.H
index 4c517fb646..e99639e189 100644
--- a/applications/solvers/combustion/rhoReactingFoam/createFields.H
+++ b/applications/solvers/combustion/rhoReactingFoam/createFields.H
@@ -101,5 +101,3 @@ volScalarField dQ
     mesh,
     dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
 );
-
-IObasicSourceList sources(mesh);
diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
index 0a91aa4b03..fffbf485d8 100644
--- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
+++ b/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"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/EEqn.H b/applications/solvers/compressible/rhoPimpleFoam/EEqn.H
index 1cc6ed584c..712a3a9ab4 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/EEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/EEqn.H
@@ -21,8 +21,12 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
 }
diff --git a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
index e4fa5cd6b3..daa25ac316 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
+++ b/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);
 }
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 8b3cfd10b9..67cc0c3e45 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/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);
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C
index ccbba350c2..f3d088b4d6 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C
+++ b/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"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index f9b8a901f7..a2b951de7c 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/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"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C
index 7e1664dbea..c1c323e7ab 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C
+++ b/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"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Allwclean b/applications/solvers/compressible/rhoSimpleFoam/Allwclean
index 49e4b69482..a1fd479e12 100755
--- a/applications/solvers/compressible/rhoSimpleFoam/Allwclean
+++ b/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
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Allwmake b/applications/solvers/compressible/rhoSimpleFoam/Allwmake
index e0b621c253..dc0fd648f5 100755
--- a/applications/solvers/compressible/rhoSimpleFoam/Allwmake
+++ b/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
diff --git a/applications/solvers/compressible/rhoSimpleFoam/EEqn.H b/applications/solvers/compressible/rhoSimpleFoam/EEqn.H
index e496906d08..7adacc8fd1 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/EEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/EEqn.H
@@ -15,8 +15,12 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
 }
diff --git a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
index 8bbd960281..c01b4d7984 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H
@@ -10,4 +10,8 @@
 
     UEqn().relax();
 
+    sources.constrain(UEqn());
+
     solve(UEqn() == -fvc::grad(p));
+
+    sources.correct(U);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 3f4b2fd021..dea35b7657 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -60,6 +60,3 @@
     );
 
     dimensionedScalar initialMass = fvc::domainIntegrate(rho);
-    
-    Info<< "Creating sources\n" << endl;
-    IObasicSourceList sources(mesh);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H
index e496906d08..7adacc8fd1 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H
@@ -15,8 +15,12 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
 }
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H
index 52e15e07b5..e1c964a179 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H
+++ b/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");
     }
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
index ad924283ee..4fff74d224 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
@@ -59,6 +59,3 @@
     );
 
     dimensionedScalar initialMass = fvc::domainIntegrate(rho);
-
-    Info<< "Creating sources\n" << endl;
-    IObasicSourceList sources(mesh);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index e906c56f80..55169f1441 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/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"
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index efc1067db2..e0adb91773 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/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"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
index 41e15dbfa8..be186ff319 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
+++ b/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"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H
index 1cc6ed584c..712a3a9ab4 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H
@@ -21,8 +21,12 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
 }
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
index e12724ed69..892de138bf 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
@@ -27,5 +27,7 @@
                 )*mesh.magSf()
             )
         );
+
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
index 62fcf33c04..bac6d8d03e 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
+++ b/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"
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
index b606339627..eaa078c6ad 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
+++ b/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);
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H
index 094b50cb3e..f84961f181 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H
@@ -21,6 +21,8 @@
 
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
     radiation->correct();
 }
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H
index 860cef4547..82e85ca563 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H
@@ -26,4 +26,6 @@
                 )*mesh.magSf()
             )
         );
+
+        sources.correct(U);
     }
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index bbd6f77773..0b401c974c 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/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"
 
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
index 704bf32d50..bb7a65cb1d 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
@@ -87,5 +87,3 @@
 
     dimensionedScalar initialMass = fvc::domainIntegrate(rho);
     dimensionedScalar totalVolume = sum(mesh.V());
-
-    IObasicSourceList sources(mesh);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index a0bd72c3b4..7805adf8d7 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/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"
 
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H
index 3e3157de72..01f2d32233 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H
@@ -21,6 +21,8 @@
 
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
     rad.correct();
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H
index 8df8cd4784..e5ab958f10 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H
@@ -23,3 +23,5 @@
             )*mesh.magSf()
         )
     );
+
+    sources.correct(U);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
index d30848804e..cc5eda691d 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
+++ b/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])
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
index ee005e0d22..935b27d57c 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
+++ b/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
     (
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
index a0905d3e4f..d0f5dbc656 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
+++ b/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);
     }
 }
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H
index 9f41c9eb37..143ca3a742 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H
+++ b/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();
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
index 87bd5924f4..9c32ec054e 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
@@ -9,8 +9,7 @@
 
     UEqn().relax();
 
-    // Add porous resistance
-    pZones.addResistance(UEqn());
+    sources.constrain(UEqn());
 
     if (momentumPredictor)
     {
@@ -21,11 +20,13 @@
             fvc::reconstruct
             (
                 (
-                    - ghf*fvc::snGrad(rho)
-                    - fvc::snGrad(p_rgh)
+                  - ghf*fvc::snGrad(rho)
+                  - fvc::snGrad(p_rgh)
                 )*mesh.magSf()
             ),
             mesh.solver(U.select(finalIter))
         );
+
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index a2021a5edc..fbc39c8556 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -14,8 +14,7 @@
 
     List<scalar> initialMassFluid(fluidRegions.size());
 
-    PtrList<IObasicSourceList> heatSources(fluidRegions.size());
-    PtrList<IOporosityModelList> porousZonesFluid(fluidRegions.size());
+    PtrList<IObasicSourceList> fluidSources(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])
-        );
     }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
index 28f0ea9683..84a22048e4 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
@@ -20,9 +20,7 @@
 
     radiation::radiationModel& rad = radiation[i];
 
-    IObasicSourceList& sources = heatSources[i];
-
-    const IOporosityModelList& pZones = porousZonesFluid[i];
+    IObasicSourceList& sources = fluidSources[i];
 
     const dimensionedScalar initialMass
     (
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
index c281ccc197..be24cc2ba0 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
+++ b/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);
     }
 }
 
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
index 7085c5bd35..19b42eb4d5 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
+++ b/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);
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H
index 8b496a6aed..4c5ec3c9a9 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H
@@ -12,3 +12,5 @@
     sources.constrain(UrelEqn());
 
     solve(UrelEqn() == -fvc::grad(p) + sources(Urel));
+
+    sources.correct(Urel);
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H
index 5895a55442..a6cff20e14 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H
@@ -70,6 +70,3 @@ volVectorField U
     ),
     Urel + SRF->U()
 );
-
-
-IObasicSourceList sources(mesh);
diff --git a/applications/solvers/incompressible/pimpleFoam/UEqn.H b/applications/solvers/incompressible/pimpleFoam/UEqn.H
index 84a404654a..94913478a6 100644
--- a/applications/solvers/incompressible/pimpleFoam/UEqn.H
+++ b/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);
 }
diff --git a/applications/solvers/incompressible/pimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/createFields.H
index bb4366cdd7..e4127150c0 100644
--- a/applications/solvers/incompressible/pimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/pimpleFoam/createFields.H
@@ -40,6 +40,3 @@ autoPtr<incompressible::turbulenceModel> turbulence
 (
     incompressible::turbulenceModel::New(U, phi, laminarTransport)
 );
-
-
-IObasicSourceList sources(mesh);
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/UEqn.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/UEqn.H
index 618816f5fe..c125d2ac2a 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/UEqn.H
+++ b/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);
 }
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createFields.H
index 701a3ff733..16b3bd977d 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createFields.H
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createFields.H
@@ -56,6 +56,3 @@
         runTime.deltaT(),
         zeroGradientFvPatchScalarField::typeName
     );
-
-
-    IObasicSourceList sources(mesh);
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
index 03299b71bb..27fc93f341 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/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);
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index 8b0f240e4d..ceb186cdbf 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/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);
diff --git a/applications/solvers/incompressible/potentialFreeSurfaceFoam/UEqn.H b/applications/solvers/incompressible/potentialFreeSurfaceFoam/UEqn.H
index 74e84d9bfc..123eaf7ac6 100644
--- a/applications/solvers/incompressible/potentialFreeSurfaceFoam/UEqn.H
+++ b/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);
 }
diff --git a/applications/solvers/incompressible/potentialFreeSurfaceFoam/createFields.H b/applications/solvers/incompressible/potentialFreeSurfaceFoam/createFields.H
index 27af553b77..9e1c7aa9ad 100644
--- a/applications/solvers/incompressible/potentialFreeSurfaceFoam/createFields.H
+++ b/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);
diff --git a/applications/solvers/incompressible/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/incompressible/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
index 35a787e97b..114c183c4c 100644
--- a/applications/solvers/incompressible/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
+++ b/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"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
index 3631b154a6..eab6907e8d 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
+++ b/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);
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H
index fb605fffd3..265a731269 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H
@@ -14,3 +14,5 @@
     sources.constrain(UrelEqn());
 
     solve(UrelEqn() == -fvc::grad(p));
+
+    sources.correct(Urel);
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
index 0df5760bab..78eea98cf3 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
@@ -52,9 +52,4 @@
     );
 
     Info<< "Creating SRF model\n" << endl;
-    autoPtr<SRF::SRFModel> SRF
-    (
-        SRF::SRFModel::New(Urel)
-    );
-
-    IObasicSourceList sources(mesh);
+    autoPtr<SRF::SRFModel> SRF(SRF::SRFModel::New(Urel));
diff --git a/applications/solvers/incompressible/simpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/UEqn.H
index 786c4f5919..719e294a08 100644
--- a/applications/solvers/incompressible/simpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/UEqn.H
@@ -13,3 +13,5 @@
     sources.constrain(UEqn());
 
     solve(UEqn() == -fvc::grad(p));
+
+    sources.correct(U);
diff --git a/applications/solvers/incompressible/simpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/createFields.H
index 97d40c3f07..947da10c9d 100644
--- a/applications/solvers/incompressible/simpleFoam/createFields.H
+++ b/applications/solvers/incompressible/simpleFoam/createFields.H
@@ -39,5 +39,3 @@
     (
         incompressible::RASModel::New(U, phi, laminarTransport)
     );
-
-    IObasicSourceList sources(mesh);
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H
index 101c16d827..3ce7e2f533 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H
+++ b/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");
     }
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
index e7128f8c1f..4c3563ac8f 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
+++ b/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"
 
diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index 3b3d57998d..80bca738bd 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/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);
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H
index 92219b9879..37ca5e82a4 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H
@@ -25,9 +25,13 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
     radiation->correct();
 
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
index fe7b047d9a..3dee99c1c7 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
+++ b/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);
     }
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
index f07208909c..a5c39e8473 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
+++ b/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;
         }
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 6832d01458..2197ae8d52 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/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"
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
index d76805c25a..1a45776ed4 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
+++ b/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
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H
index c8e8193eb2..5c37255fef 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H
+++ b/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);
 }
 
 // ************************************************************************* //
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H
index 2c327a1099..4abcdcf441 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H
@@ -25,9 +25,13 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
     radiation->correct();
 
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/UEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/UEqn.H
index 5884abe0c1..81d90bd695 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/UEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/UEqn.H
@@ -26,5 +26,7 @@
                 )*mesh.magSf()
             )
         );
+
+        sources.correct(U);
         K = 0.5*magSqr(U);
     }
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H
index e05dcdef6a..615342c436 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H
+++ b/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;
         }
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
index 1a15b1b2ab..057978c8f8 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
@@ -139,5 +139,3 @@
         mesh,
         dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
     );
-
-    IObasicSourceList sources(mesh);
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
index 203ee0ecd8..80add60630 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
+++ b/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"
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/rhoEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/rhoEqn.H
index 282acfe91e..5cc780abb1 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/rhoEqn.H
+++ b/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);
 }
 
 // ************************************************************************* //
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H
index c8ef9bf84e..57456fe791 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H
@@ -24,9 +24,13 @@
     );
 
     EEqn.relax();
+
     sources.constrain(EEqn);
+
     EEqn.solve();
 
+    sources.correct(he);
+
     thermo.correct();
     radiation->correct();
 
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C
index 4ea17727d9..c0b7519607 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C
+++ b/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"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H
index 612e582c54..11d4b27ef8 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H
+++ b/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);
     }
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
index a22267d9be..b7e40dcc59 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
+++ b/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;
         }
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createExplicitSources.H b/applications/solvers/lagrangian/reactingParcelFoam/createExplicitSources.H
deleted file mode 100644
index b2e5775e58..0000000000
--- a/applications/solvers/lagrangian/reactingParcelFoam/createExplicitSources.H
+++ /dev/null
@@ -1,2 +0,0 @@
-Info<< "Creating sources\n" << endl;
-IObasicSourceList sources(mesh);
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createPorousZones.H b/applications/solvers/lagrangian/reactingParcelFoam/createPorousZones.H
deleted file mode 100644
index 05f0f044ce..0000000000
--- a/applications/solvers/lagrangian/reactingParcelFoam/createPorousZones.H
+++ /dev/null
@@ -1,3 +0,0 @@
-    Info<< "Creating porous zones" << nl << endl;
-
-    IOporosityModelList pZones(mesh);
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index a8f4328543..c273f71856 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/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 "createPorousZones.H"
+    #include "createSources.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
     #include "compressibleCourantNo.H"
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/rhoEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/rhoEqn.H
index f142f620be..6ad34d56c7 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/rhoEqn.H
+++ b/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;
 }
diff --git a/applications/solvers/lagrangian/sprayFoam/UEqn.H b/applications/solvers/lagrangian/sprayFoam/UEqn.H
index 3723f7f79d..11d4b27ef8 100644
--- a/applications/solvers/lagrangian/sprayFoam/UEqn.H
+++ b/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);
     }
diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H
index 612ea4f3c9..4aa21b506f 100644
--- a/applications/solvers/lagrangian/sprayFoam/createFields.H
+++ b/applications/solvers/lagrangian/sprayFoam/createFields.H
@@ -107,6 +107,3 @@
         mesh,
         dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
     );
-
-    Info<< "Creating sources\n" << endl;
-    IObasicSourceList sources(mesh);
diff --git a/applications/solvers/lagrangian/sprayFoam/rhoEqn.H b/applications/solvers/lagrangian/sprayFoam/rhoEqn.H
index b6293f2c1f..ecda54ee83 100644
--- a/applications/solvers/lagrangian/sprayFoam/rhoEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/rhoEqn.H
@@ -42,6 +42,8 @@ Description
     sources.constrain(rhoEqn);
 
     rhoEqn.solve();
+
+    sources.correct(rho);
 }
 
 // ************************************************************************* //
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C
index 1b4f46289f..fd2df8b2ac 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
     #include "createEngineMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
+    #include "createSources.H"
     #include "createClouds.H"
     #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
index 02739bda71..243c9a6058 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
+++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
@@ -49,6 +49,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"
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index b0f22f5f7e..c8819904ea 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.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
@@ -299,8 +299,7 @@ Foam::dynamicRefineFvMesh::refine
         }
         if (debug)
         {
-            Info<< "Found " << returnReduce(masterFaces.size(), sumOp<label>())
-                << " split faces " << endl;
+            Pout<< "Found " << masterFaces.size() << " split faces " << endl;
         }
 
         HashTable<const surfaceScalarField*> fluxes
@@ -332,7 +331,7 @@ Foam::dynamicRefineFvMesh::refine
 
             if (debug)
             {
-                Info<< "Mapping flux " << iter.key()
+                Pout<< "Mapping flux " << iter.key()
                     << " using interpolated flux " << UName
                     << endl;
             }
diff --git a/src/fieldSources/Make/files b/src/fieldSources/Make/files
index a81d39f8f2..5d7aa03a43 100644
--- a/src/fieldSources/Make/files
+++ b/src/fieldSources/Make/files
@@ -3,33 +3,46 @@ basicSource/basicSourceIO.C
 basicSource/basicSourceList.C
 basicSource/IObasicSourceList.C
 
-general/codedSource/codedSource.C
-general/explicitSetValue/explicitSetValue.C
-general/semiImplicitSource/semiImplicitSource.C
 
-derived/actuationDiskSource/actuationDiskSource.C
-derived/explicitPorositySource/explicitPorositySource.C
-derived/fixedTemperatureSource/fixedTemperatureSource.C
-derived/MRFSource/MRFSource.C
-derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
-derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
-derived/radialActuationDiskSource/radialActuationDiskSource.C
-derived/rotorDiskSource/rotorDiskSource.C
-derived/rotorDiskSource/bladeModel/bladeModel.C
-derived/rotorDiskSource/profileModel/profileModel.C
-derived/rotorDiskSource/profileModel/profileModelList.C
-derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
-derived/rotorDiskSource/profileModel/series/seriesProfile.C
-derived/rotorDiskSource/trimModel/trimModel/trimModel.C
-derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
-derived/rotorDiskSource/trimModel/fixed/fixedTrim.C
-derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
+/* sources */
 
-interRegion = derived/interRegionHeatTransferModel
+generalSources=sources/general
+$(generalSources)/codedSource/codedSource.C
+$(generalSources)/semiImplicitSource/semiImplicitSource.C
+
+derivedSources=sources/derived
+$(derivedSources)/actuationDiskSource/actuationDiskSource.C
+$(derivedSources)/explicitPorositySource/explicitPorositySource.C
+$(derivedSources)/MRFSource/MRFSource.C
+$(derivedSources)/pressureGradientExplicitSource/pressureGradientExplicitSource.C
+$(derivedSources)/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
+$(derivedSources)/radialActuationDiskSource/radialActuationDiskSource.C
+$(derivedSources)/rotorDiskSource/rotorDiskSource.C
+$(derivedSources)/rotorDiskSource/bladeModel/bladeModel.C
+$(derivedSources)/rotorDiskSource/profileModel/profileModel.C
+$(derivedSources)/rotorDiskSource/profileModel/profileModelList.C
+$(derivedSources)/rotorDiskSource/profileModel/lookup/lookupProfile.C
+$(derivedSources)/rotorDiskSource/profileModel/series/seriesProfile.C
+$(derivedSources)/rotorDiskSource/trimModel/trimModel/trimModel.C
+$(derivedSources)/rotorDiskSource/trimModel/trimModel/trimModelNew.C
+$(derivedSources)/rotorDiskSource/trimModel/fixed/fixedTrim.C
+$(derivedSources)/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
+
+interRegion = $(derivedSources)/interRegionHeatTransferModel
 $(interRegion)/constantHeatTransfer/constantHeatTransfer.C
 $(interRegion)/interRegionHeatTransferModel/interRegionHeatTransferModel.C
 $(interRegion)/tabulatedHeatTransfer/tabulatedHeatTransfer.C
 $(interRegion)/variableHeatTransfer/variableHeatTransfer.C
 
 
+/* constraints */
+
+generalConstraints=constraints/general
+$(generalConstraints)/explicitSetValue/explicitSetValue.C
+
+derivedConstraints=constraints/derived
+$(derivedConstraints)/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+$(derivedConstraints)/temperatureLimitsConstraint/temperatureLimitsConstraint.C
+
+
 LIB = $(FOAM_LIBBIN)/libfieldSources
diff --git a/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.C b/src/fieldSources/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
similarity index 85%
rename from src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.C
rename to src/fieldSources/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index 26dff507d3..9f26a261ed 100644
--- a/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.C
+++ b/src/fieldSources/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -24,7 +24,7 @@ License
 
 \*----------------------------------------------------------------------------*/
 
-#include "fixedTemperatureSource.H"
+#include "fixedTemperatureConstraint.H"
 #include "fvMesh.H"
 #include "fvMatrices.H"
 #include "basicThermo.H"
@@ -34,29 +34,30 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(fixedTemperatureSource, 0);
+    defineTypeNameAndDebug(fixedTemperatureConstraint, 0);
     addToRunTimeSelectionTable
     (
         basicSource,
-        fixedTemperatureSource,
+        fixedTemperatureConstraint,
         dictionary
     );
 
     template<>
-    const char* NamedEnum<fixedTemperatureSource::temperatureMode, 2>::names[] =
+    const char* NamedEnum<fixedTemperatureConstraint::temperatureMode, 2>::
+    names[] =
     {
         "uniform",
         "lookup"
     };
 }
 
-const Foam::NamedEnum<Foam::fixedTemperatureSource::temperatureMode, 2>
-    Foam::fixedTemperatureSource::temperatureModeNames_;
+const Foam::NamedEnum<Foam::fixedTemperatureConstraint::temperatureMode, 2>
+    Foam::fixedTemperatureConstraint::temperatureModeNames_;
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::fixedTemperatureSource::fixedTemperatureSource
+Foam::fixedTemperatureConstraint::fixedTemperatureConstraint
 (
     const word& name,
     const word& modelType,
@@ -98,13 +99,13 @@ Foam::fixedTemperatureSource::fixedTemperatureSource
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::fixedTemperatureSource::alwaysApply() const
+bool Foam::fixedTemperatureConstraint::alwaysApply() const
 {
     return true;
 }
 
 
-void Foam::fixedTemperatureSource::setValue
+void Foam::fixedTemperatureConstraint::setValue
 (
     fvMatrix<scalar>& eqn,
     const label
@@ -145,14 +146,14 @@ void Foam::fixedTemperatureSource::setValue
 }
 
 
-void Foam::fixedTemperatureSource::writeData(Ostream& os) const
+void Foam::fixedTemperatureConstraint::writeData(Ostream& os) const
 {
     os  << indent << name_ << endl;
     dict_.write(os);
 }
 
 
-bool Foam::fixedTemperatureSource::read(const dictionary& dict)
+bool Foam::fixedTemperatureConstraint::read(const dictionary& dict)
 {
     if (basicSource::read(dict))
     {
diff --git a/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.H b/src/fieldSources/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
similarity index 88%
rename from src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.H
rename to src/fieldSources/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index 05789b808d..33066b61df 100644
--- a/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.H
+++ b/src/fieldSources/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -23,14 +23,14 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::fixedTemperatureSource
+    Foam::fixedTemperatureConstraint
 
 Description
     Fixed temperature equation constraint
 
     Sources described by:
 
-        fixedTemperatureSourceCoeffs
+        fixedTemperatureConstraintCoeffs
         {
             mode            uniform;    // uniform or lookup
 
@@ -50,8 +50,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedTemperatureSource_H
-#define fixedTemperatureSource_H
+#ifndef fixedTemperatureConstraint_H
+#define fixedTemperatureConstraint_H
 
 #include "basicSource.H"
 #include "NamedEnum.H"
@@ -63,10 +63,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                   Class fixedTemperatureSource Declaration
+                 Class fixedTemperatureConstraint Declaration
 \*---------------------------------------------------------------------------*/
 
-class fixedTemperatureSource
+class fixedTemperatureConstraint
 :
     public basicSource
 {
@@ -104,22 +104,22 @@ private:
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        fixedTemperatureSource(const fixedTemperatureSource&);
+        fixedTemperatureConstraint(const fixedTemperatureConstraint&);
 
         //- Disallow default bitwise assignment
-        void operator=(const fixedTemperatureSource&);
+        void operator=(const fixedTemperatureConstraint&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("fixedTemperatureSource");
+    TypeName("fixedTemperatureConstraint");
 
 
     // Constructors
 
         //- Construct from components
-        fixedTemperatureSource
+        fixedTemperatureConstraint
         (
             const word& name,
             const word& modelType,
@@ -129,7 +129,7 @@ public:
 
 
     //- Destructor
-    virtual ~fixedTemperatureSource()
+    virtual ~fixedTemperatureConstraint()
     {}
 
 
diff --git a/src/fieldSources/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C b/src/fieldSources/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C
new file mode 100644
index 0000000000..5f47237021
--- /dev/null
+++ b/src/fieldSources/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C
@@ -0,0 +1,149 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*----------------------------------------------------------------------------*/
+
+#include "temperatureLimitsConstraint.H"
+#include "fvMesh.H"
+#include "basicThermo.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(temperatureLimitsConstraint, 0);
+    addToRunTimeSelectionTable
+    (
+        basicSource,
+        temperatureLimitsConstraint,
+        dictionary
+    );
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::temperatureLimitsConstraint::temperatureLimitsConstraint
+(
+    const word& name,
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    basicSource(name, modelType, dict, mesh),
+    Tmin_(readScalar(coeffs_.lookup("Tmin"))),
+    Tmax_(readScalar(coeffs_.lookup("Tmax")))
+{
+    fieldNames_.setSize(1, "energy");
+    applied_.setSize(1, false);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::temperatureLimitsConstraint::alwaysApply() const
+{
+    return true;
+}
+
+
+void Foam::temperatureLimitsConstraint::correct(volScalarField& he)
+{
+    const basicThermo& thermo =
+        mesh_.lookupObject<basicThermo>("thermophysicalProperties");
+
+    if (he.name() == thermo.he().name())
+    {
+        scalarField Tmin(cells_.size(), Tmin_);
+        scalarField Tmax(cells_.size(), Tmax_);
+
+        scalarField heMin(thermo.he(thermo.p(), Tmin, cells_));
+        scalarField heMax(thermo.he(thermo.p(), Tmax, cells_));
+
+        scalarField& hec = he.internalField();
+
+        forAll(cells_, i)
+        {
+            label cellI = cells_[i];
+            hec[cellI]= max(min(hec[cellI], heMax[i]), heMin[i]);
+        }
+
+        // handle boundaries in the case of 'all'
+        if (selectionMode_ == smAll)
+        {
+            volScalarField::GeometricBoundaryField& bf = he.boundaryField();
+
+            forAll(bf, patchI)
+            {
+                fvPatchScalarField& hep = bf[patchI];
+                if (hep.fixesValue())
+                {
+                    // not over-riding fixed conditions
+                    continue;
+                }
+
+                const scalarField& pp = thermo.p().boundaryField()[patchI];
+
+                scalarField Tminp(pp.size(), Tmin_);
+                scalarField Tmaxp(pp.size(), Tmax_);
+
+                scalarField heMinp(thermo.he(pp, Tminp, patchI));
+                scalarField heMaxp(thermo.he(pp, Tmaxp, patchI));
+
+                forAll(hep, faceI)
+                {
+                    hep[faceI] =
+                        max(min(hep[faceI], heMaxp[faceI]), heMinp[faceI]);
+                }
+            }
+        }
+    }
+}
+
+
+void Foam::temperatureLimitsConstraint::writeData(Ostream& os) const
+{
+    os  << indent << name_ << endl;
+    dict_.write(os);
+}
+
+
+bool Foam::temperatureLimitsConstraint::read(const dictionary& dict)
+{
+    if (basicSource::read(dict))
+    {
+        coeffs_.readIfPresent("Tmin", Tmin_);
+        coeffs_.readIfPresent("Tmax", Tmax_);
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/fieldSources/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H b/src/fieldSources/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H
new file mode 100644
index 0000000000..52a25564f4
--- /dev/null
+++ b/src/fieldSources/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::temperatureLimitsConstraint
+
+Description
+    Constraint for temperature to apply limits between minimum and maximum
+    values
+
+    Constraint described by:
+
+        temperatureLimitsConstraintCoeffs
+        {
+            minimum     200;
+            maximum     500;
+        }
+
+
+SourceFiles
+    basicSource.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef temperatureLimitsConstraint_H
+#define temperatureLimitsConstraint_H
+
+#include "basicSource.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                 Class temperatureLimitsConstraint Declaration
+\*---------------------------------------------------------------------------*/
+
+class temperatureLimitsConstraint
+:
+    public basicSource
+{
+
+protected:
+
+    // Protected data
+
+        //- Minimum temperature limit [K]
+        scalar Tmin_;
+
+        //- Maximum temperature limit [K]
+        scalar Tmax_;
+
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        temperatureLimitsConstraint(const temperatureLimitsConstraint&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const temperatureLimitsConstraint&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("temperatureLimitsConstraint");
+
+
+    // Constructors
+
+        //- Construct from components
+        temperatureLimitsConstraint
+        (
+            const word& name,
+            const word& modelType,
+            const dictionary& dict,
+            const fvMesh& mesh
+        );
+
+
+    //- Destructor
+    virtual ~temperatureLimitsConstraint()
+    {}
+
+
+    // Member Functions
+
+        virtual bool alwaysApply() const;
+
+
+        // Evaluate
+
+            //- Correct the energy field
+            virtual void correct(volScalarField& he);
+
+
+        // I-O
+
+            //- Write data
+            virtual void writeData(Ostream&) const;
+
+            //- Read dictionary
+            virtual bool read(const dictionary& dict);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fieldSources/general/explicitSetValue/ExplicitSetValue.C b/src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValue.C
similarity index 97%
rename from src/fieldSources/general/explicitSetValue/ExplicitSetValue.C
rename to src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValue.C
index 7285e80305..eb67c707e3 100644
--- a/src/fieldSources/general/explicitSetValue/ExplicitSetValue.C
+++ b/src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValue.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
diff --git a/src/fieldSources/general/explicitSetValue/ExplicitSetValue.H b/src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValue.H
similarity index 100%
rename from src/fieldSources/general/explicitSetValue/ExplicitSetValue.H
rename to src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValue.H
diff --git a/src/fieldSources/general/explicitSetValue/ExplicitSetValueIO.C b/src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValueIO.C
similarity index 95%
rename from src/fieldSources/general/explicitSetValue/ExplicitSetValueIO.C
rename to src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValueIO.C
index a27190ea49..f5c14c2fcc 100644
--- a/src/fieldSources/general/explicitSetValue/ExplicitSetValueIO.C
+++ b/src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValueIO.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
diff --git a/src/fieldSources/general/explicitSetValue/explicitSetValue.C b/src/fieldSources/constraints/general/explicitSetValue/explicitSetValue.C
similarity index 95%
rename from src/fieldSources/general/explicitSetValue/explicitSetValue.C
rename to src/fieldSources/constraints/general/explicitSetValue/explicitSetValue.C
index 78bb54bcb3..e968c127ef 100644
--- a/src/fieldSources/general/explicitSetValue/explicitSetValue.C
+++ b/src/fieldSources/constraints/general/explicitSetValue/explicitSetValue.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
diff --git a/src/fieldSources/include/createSources.H b/src/fieldSources/include/createSources.H
new file mode 100644
index 0000000000..53bac81797
--- /dev/null
+++ b/src/fieldSources/include/createSources.H
@@ -0,0 +1,2 @@
+Info<< "Creating sources" << endl;
+IObasicSourceList sources(mesh);
diff --git a/src/fieldSources/derived/MRFSource/MRFSource.C b/src/fieldSources/sources/derived/MRFSource/MRFSource.C
similarity index 100%
rename from src/fieldSources/derived/MRFSource/MRFSource.C
rename to src/fieldSources/sources/derived/MRFSource/MRFSource.C
diff --git a/src/fieldSources/derived/MRFSource/MRFSource.H b/src/fieldSources/sources/derived/MRFSource/MRFSource.H
similarity index 100%
rename from src/fieldSources/derived/MRFSource/MRFSource.H
rename to src/fieldSources/sources/derived/MRFSource/MRFSource.H
diff --git a/src/fieldSources/derived/actuationDiskSource/actuationDiskSource.C b/src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSource.C
similarity index 98%
rename from src/fieldSources/derived/actuationDiskSource/actuationDiskSource.C
rename to src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSource.C
index 878398220e..d20266d7cc 100644
--- a/src/fieldSources/derived/actuationDiskSource/actuationDiskSource.C
+++ b/src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSource.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
diff --git a/src/fieldSources/derived/actuationDiskSource/actuationDiskSource.H b/src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSource.H
similarity index 98%
rename from src/fieldSources/derived/actuationDiskSource/actuationDiskSource.H
rename to src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSource.H
index 80cd7bd54a..d7609fa093 100644
--- a/src/fieldSources/derived/actuationDiskSource/actuationDiskSource.H
+++ b/src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSource.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
diff --git a/src/fieldSources/derived/actuationDiskSource/actuationDiskSourceTemplates.C b/src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
similarity index 96%
rename from src/fieldSources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
rename to src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
index 959e86f5b3..1efb261c68 100644
--- a/src/fieldSources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
+++ b/src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.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
diff --git a/src/fieldSources/derived/explicitPorositySource/explicitPorositySource.C b/src/fieldSources/sources/derived/explicitPorositySource/explicitPorositySource.C
similarity index 100%
rename from src/fieldSources/derived/explicitPorositySource/explicitPorositySource.C
rename to src/fieldSources/sources/derived/explicitPorositySource/explicitPorositySource.C
diff --git a/src/fieldSources/derived/explicitPorositySource/explicitPorositySource.H b/src/fieldSources/sources/derived/explicitPorositySource/explicitPorositySource.H
similarity index 100%
rename from src/fieldSources/derived/explicitPorositySource/explicitPorositySource.H
rename to src/fieldSources/sources/derived/explicitPorositySource/explicitPorositySource.H
diff --git a/src/fieldSources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C b/src/fieldSources/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C
similarity index 97%
rename from src/fieldSources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C
rename to src/fieldSources/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C
index eb49266305..d81e32adbe 100644
--- a/src/fieldSources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C
+++ b/src/fieldSources/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.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
diff --git a/src/fieldSources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H b/src/fieldSources/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H
similarity index 97%
rename from src/fieldSources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H
rename to src/fieldSources/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H
index 375d00ae8b..d2383496b2 100644
--- a/src/fieldSources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H
+++ b/src/fieldSources/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.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
diff --git a/src/fieldSources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
similarity index 100%
rename from src/fieldSources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
rename to src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
diff --git a/src/fieldSources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H b/src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H
similarity index 100%
rename from src/fieldSources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H
rename to src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H
diff --git a/src/fieldSources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C b/src/fieldSources/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C
similarity index 98%
rename from src/fieldSources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C
rename to src/fieldSources/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C
index 5a6a22d295..b06ff1aaab 100644
--- a/src/fieldSources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C
+++ b/src/fieldSources/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.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
diff --git a/src/fieldSources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H b/src/fieldSources/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H
similarity index 97%
rename from src/fieldSources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H
rename to src/fieldSources/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H
index e5c37fdf3b..b792a2f4bf 100644
--- a/src/fieldSources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H
+++ b/src/fieldSources/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.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
diff --git a/src/fieldSources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C b/src/fieldSources/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
similarity index 100%
rename from src/fieldSources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
rename to src/fieldSources/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
diff --git a/src/fieldSources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H b/src/fieldSources/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H
similarity index 97%
rename from src/fieldSources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H
rename to src/fieldSources/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H
index 1d8f25caad..4912641556 100644
--- a/src/fieldSources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H
+++ b/src/fieldSources/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.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
diff --git a/src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C b/src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
similarity index 88%
rename from src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
rename to src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
index 790fac2c8b..d506bdb19e 100644
--- a/src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
+++ b/src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
@@ -46,7 +46,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::pressureGradientExplicitSource::writeGradP() const
+void Foam::pressureGradientExplicitSource::writeProps(const scalar gradP) const
 {
     // Only write on output time
     if (mesh_.time().outputTime())
@@ -63,7 +63,7 @@ void Foam::pressureGradientExplicitSource::writeGradP() const
                 IOobject::NO_WRITE
             )
         );
-        propsDict.add("gradient", gradP_);
+        propsDict.add("gradient", gradP);
         propsDict.regIOobject::write();
     }
 }
@@ -81,8 +81,8 @@ Foam::pressureGradientExplicitSource::pressureGradientExplicitSource
 :
     basicSource(sourceName, modelType, dict, mesh),
     Ubar_(coeffs_.lookup("Ubar")),
-    gradPini_(coeffs_.lookup("gradPini")),
-    gradP_(gradPini_),
+    gradP0_(0.0),
+    dGradP_(0.0),
     flowDir_(Ubar_/mag(Ubar_)),
     invAPtr_(NULL)
 {
@@ -95,7 +95,7 @@ Foam::pressureGradientExplicitSource::pressureGradientExplicitSource
             "Foam::pressureGradientExplicitSource::"
             "pressureGradientExplicitSource"
             "("
-                "onst word&, "
+                "const word&, "
                 "const word&, "
                 "const dictionary&, "
                 "const fvMesh&"
@@ -116,10 +116,10 @@ Foam::pressureGradientExplicitSource::pressureGradientExplicitSource
     {
         Info<< "    Reading pressure gradient from file" << endl;
         dictionary propsDict(dictionary::null, propsFile);
-        propsDict.lookup("gradient") >> gradP_;
+        propsDict.lookup("gradient") >> gradP0_;
     }
 
-    Info<< "    Initial pressure gradient = " << gradP_ << nl << endl;
+    Info<< "    Initial pressure gradient = " << gradP0_ << nl << endl;
 }
 
 
@@ -151,22 +151,21 @@ void Foam::pressureGradientExplicitSource::correct(volVectorField& U)
 
     // Calculate the pressure gradient increment needed to adjust the average
     // flow-rate to the desired value
-    scalar gradPplus = (mag(Ubar_) - magUbarAve)/rAUave;
+    dGradP_ = (mag(Ubar_) - magUbarAve)/rAUave;
 
     // Apply correction to velocity field
     forAll(cells_, i)
     {
         label cellI = cells_[i];
-        U[cellI] += flowDir_*rAU[cellI]*gradPplus;
+        U[cellI] += flowDir_*rAU[cellI]*dGradP_;
     }
 
-    // Update pressure gradient
-    gradP_.value() += gradPplus;
+    scalar gradP = gradP0_ + dGradP_;
 
     Info<< "Pressure gradient source: uncorrected Ubar = " << magUbarAve
-        << ", pressure gradient = " << gradP_.value() << endl;
+        << ", pressure gradient = " << gradP << endl;
 
-    writeGradP();
+    writeProps(gradP);
 }
 
 
@@ -187,10 +186,12 @@ void Foam::pressureGradientExplicitSource::addSup
             IOobject::NO_WRITE
         ),
         mesh_,
-        dimensionedVector("zero", gradP_.dimensions(), vector::zero)
+        dimensionedVector("zero", eqn.dimensions()/dimVolume, vector::zero)
     );
 
-    UIndirectList<vector>(Su, cells_) = flowDir_*gradP_.value();
+    scalar gradP = gradP0_ + dGradP_;
+
+    UIndirectList<vector>(Su, cells_) = flowDir_*gradP;
 
     eqn += Su;
 }
@@ -224,6 +225,9 @@ void Foam::pressureGradientExplicitSource::setValue
     {
         invAPtr_() = 1.0/eqn.A();
     }
+
+    gradP0_ += dGradP_;
+    dGradP_ = 0.0;
 }
 
 
diff --git a/src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H b/src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
similarity index 95%
rename from src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
rename to src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
index a45a7927de..72ed2d7cf5 100644
--- a/src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
+++ b/src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
@@ -73,11 +73,11 @@ class pressureGradientExplicitSource
         //- Average velocity
         vector Ubar_;
 
-        //- Initial pressure gradient
-        dimensionedScalar gradPini_;
+        //- Pressure gradient before correction
+        scalar gradP0_;
 
-        //- Pressure gradient
-        dimensionedScalar gradP_;
+        //- Change in pressure gradient
+        scalar dGradP_;
 
         //- Flow direction
         vector flowDir_;
@@ -89,7 +89,7 @@ class pressureGradientExplicitSource
     // Private Member Functions
 
         //- Write the pressure gradient to file (for restarts etc)
-        void writeGradP() const;
+        void writeProps(const scalar gradP) const;
 
         //- Correct driving force for a constant mass flow rate
         void update(fvMatrix<vector>& eqn);
diff --git a/src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C b/src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
similarity index 95%
rename from src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
rename to src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
index b6d1b2d1cf..96a6257042 100644
--- a/src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
+++ b/src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.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
diff --git a/src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSource.C b/src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C
similarity index 97%
rename from src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSource.C
rename to src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C
index 4a5631270a..3564cbfe10 100644
--- a/src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSource.C
+++ b/src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSource.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
diff --git a/src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSource.H b/src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
similarity index 98%
rename from src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSource.H
rename to src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
index 134e93b5ea..9b05c7141a 100644
--- a/src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSource.H
+++ b/src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSource.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
diff --git a/src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C b/src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
similarity index 97%
rename from src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
rename to src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
index adea615455..086d8472fe 100644
--- a/src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
+++ b/src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.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
diff --git a/src/fieldSources/derived/rotorDiskSource/bladeModel/bladeModel.C b/src/fieldSources/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
similarity index 100%
rename from src/fieldSources/derived/rotorDiskSource/bladeModel/bladeModel.C
rename to src/fieldSources/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
diff --git a/src/fieldSources/derived/rotorDiskSource/bladeModel/bladeModel.H b/src/fieldSources/sources/derived/rotorDiskSource/bladeModel/bladeModel.H
similarity index 98%
rename from src/fieldSources/derived/rotorDiskSource/bladeModel/bladeModel.H
rename to src/fieldSources/sources/derived/rotorDiskSource/bladeModel/bladeModel.H
index df26e7bd40..dcb3d5dd21 100644
--- a/src/fieldSources/derived/rotorDiskSource/bladeModel/bladeModel.H
+++ b/src/fieldSources/sources/derived/rotorDiskSource/bladeModel/bladeModel.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
diff --git a/src/fieldSources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
similarity index 100%
rename from src/fieldSources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
rename to src/fieldSources/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
diff --git a/src/fieldSources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H
similarity index 97%
rename from src/fieldSources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H
rename to src/fieldSources/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H
index deb5c1f725..bee45e4f22 100644
--- a/src/fieldSources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H
+++ b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.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
diff --git a/src/fieldSources/derived/rotorDiskSource/profileModel/profileModel.C b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModel.C
similarity index 97%
rename from src/fieldSources/derived/rotorDiskSource/profileModel/profileModel.C
rename to src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModel.C
index c9008d276c..edb509b9cd 100644
--- a/src/fieldSources/derived/rotorDiskSource/profileModel/profileModel.C
+++ b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModel.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
diff --git a/src/fieldSources/derived/rotorDiskSource/profileModel/profileModel.H b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModel.H
similarity index 97%
rename from src/fieldSources/derived/rotorDiskSource/profileModel/profileModel.H
rename to src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModel.H
index 5c850ec1bb..d419fe8f8b 100644
--- a/src/fieldSources/derived/rotorDiskSource/profileModel/profileModel.H
+++ b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModel.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
diff --git a/src/fieldSources/derived/rotorDiskSource/profileModel/profileModelList.C b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModelList.C
similarity index 97%
rename from src/fieldSources/derived/rotorDiskSource/profileModel/profileModelList.C
rename to src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModelList.C
index 904b01372b..e1c3dffb2d 100644
--- a/src/fieldSources/derived/rotorDiskSource/profileModel/profileModelList.C
+++ b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModelList.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
diff --git a/src/fieldSources/derived/rotorDiskSource/profileModel/profileModelList.H b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModelList.H
similarity index 96%
rename from src/fieldSources/derived/rotorDiskSource/profileModel/profileModelList.H
rename to src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModelList.H
index 0a6c125288..ff794b2be2 100644
--- a/src/fieldSources/derived/rotorDiskSource/profileModel/profileModelList.H
+++ b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModelList.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
diff --git a/src/fieldSources/derived/rotorDiskSource/profileModel/series/seriesProfile.C b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
similarity index 100%
rename from src/fieldSources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
rename to src/fieldSources/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
diff --git a/src/fieldSources/derived/rotorDiskSource/profileModel/series/seriesProfile.H b/src/fieldSources/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.H
similarity index 100%
rename from src/fieldSources/derived/rotorDiskSource/profileModel/series/seriesProfile.H
rename to src/fieldSources/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.H
diff --git a/src/fieldSources/derived/rotorDiskSource/rotorDiskSource.C b/src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSource.C
similarity index 100%
rename from src/fieldSources/derived/rotorDiskSource/rotorDiskSource.C
rename to src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSource.C
diff --git a/src/fieldSources/derived/rotorDiskSource/rotorDiskSource.H b/src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSource.H
similarity index 99%
rename from src/fieldSources/derived/rotorDiskSource/rotorDiskSource.H
rename to src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSource.H
index 17deb44816..d28bc61713 100644
--- a/src/fieldSources/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSource.H
@@ -322,4 +322,3 @@ public:
 #endif
 
 // ************************************************************************* //
-
diff --git a/src/fieldSources/derived/rotorDiskSource/rotorDiskSourceI.H b/src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSourceI.H
similarity index 99%
rename from src/fieldSources/derived/rotorDiskSource/rotorDiskSourceI.H
rename to src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSourceI.H
index 9d095e846b..3db904fb9d 100644
--- a/src/fieldSources/derived/rotorDiskSource/rotorDiskSourceI.H
+++ b/src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSourceI.H
@@ -70,4 +70,3 @@ Foam::tmp<Foam::volScalarField> Foam::rotorDiskSource::rho() const
 }
 
 // ************************************************************************* //
-
diff --git a/src/fieldSources/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
similarity index 96%
rename from src/fieldSources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
rename to src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
index ae574946a6..f8e0113308 100644
--- a/src/fieldSources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
+++ b/src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.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
diff --git a/src/fieldSources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C b/src/fieldSources/sources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C
similarity index 100%
rename from src/fieldSources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C
rename to src/fieldSources/sources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C
diff --git a/src/fieldSources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H b/src/fieldSources/sources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H
similarity index 100%
rename from src/fieldSources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H
rename to src/fieldSources/sources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H
diff --git a/src/fieldSources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fieldSources/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
similarity index 99%
rename from src/fieldSources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
rename to src/fieldSources/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
index 4ed3f77120..d2f91614d4 100644
--- a/src/fieldSources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
+++ b/src/fieldSources/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
@@ -46,7 +46,7 @@ Foam::vector Foam::targetCoeffTrim::calcCoeffs
 (
     const vectorField& U,
     const scalarField& thetag,
-    vectorField& force    
+    vectorField& force
 ) const
 {
     rotor_.calculate(U, thetag, force, false, false);
diff --git a/src/fieldSources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H b/src/fieldSources/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H
similarity index 98%
rename from src/fieldSources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H
rename to src/fieldSources/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H
index 24d5732e99..4425d55772 100644
--- a/src/fieldSources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H
+++ b/src/fieldSources/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H
@@ -62,7 +62,7 @@ Description
         rho   = desity
         omega = rotor angulr velocity
         pi    = mathematical pi
-            
+
 
 SourceFiles
     targetCoeffTrim.C
@@ -129,7 +129,7 @@ protected:
         (
             const vectorField& U,
             const scalarField& alphag,
-            vectorField& force    
+            vectorField& force
         ) const;
 
 
diff --git a/src/fieldSources/derived/rotorDiskSource/trimModel/trimModel/trimModel.C b/src/fieldSources/sources/derived/rotorDiskSource/trimModel/trimModel/trimModel.C
similarity index 100%
rename from src/fieldSources/derived/rotorDiskSource/trimModel/trimModel/trimModel.C
rename to src/fieldSources/sources/derived/rotorDiskSource/trimModel/trimModel/trimModel.C
diff --git a/src/fieldSources/derived/rotorDiskSource/trimModel/trimModel/trimModel.H b/src/fieldSources/sources/derived/rotorDiskSource/trimModel/trimModel/trimModel.H
similarity index 100%
rename from src/fieldSources/derived/rotorDiskSource/trimModel/trimModel/trimModel.H
rename to src/fieldSources/sources/derived/rotorDiskSource/trimModel/trimModel/trimModel.H
diff --git a/src/fieldSources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C b/src/fieldSources/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
similarity index 100%
rename from src/fieldSources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
rename to src/fieldSources/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
diff --git a/src/fieldSources/general/codedSource/CodedSource.C b/src/fieldSources/sources/general/codedSource/CodedSource.C
similarity index 100%
rename from src/fieldSources/general/codedSource/CodedSource.C
rename to src/fieldSources/sources/general/codedSource/CodedSource.C
diff --git a/src/fieldSources/general/codedSource/CodedSource.H b/src/fieldSources/sources/general/codedSource/CodedSource.H
similarity index 100%
rename from src/fieldSources/general/codedSource/CodedSource.H
rename to src/fieldSources/sources/general/codedSource/CodedSource.H
diff --git a/src/fieldSources/general/codedSource/CodedSourceIO.C b/src/fieldSources/sources/general/codedSource/CodedSourceIO.C
similarity index 100%
rename from src/fieldSources/general/codedSource/CodedSourceIO.C
rename to src/fieldSources/sources/general/codedSource/CodedSourceIO.C
diff --git a/src/fieldSources/general/codedSource/codedSource.C b/src/fieldSources/sources/general/codedSource/codedSource.C
similarity index 100%
rename from src/fieldSources/general/codedSource/codedSource.C
rename to src/fieldSources/sources/general/codedSource/codedSource.C
diff --git a/src/fieldSources/general/semiImplicitSource/SemiImplicitSource.C b/src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSource.C
similarity index 100%
rename from src/fieldSources/general/semiImplicitSource/SemiImplicitSource.C
rename to src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSource.C
diff --git a/src/fieldSources/general/semiImplicitSource/SemiImplicitSource.H b/src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSource.H
similarity index 100%
rename from src/fieldSources/general/semiImplicitSource/SemiImplicitSource.H
rename to src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSource.H
diff --git a/src/fieldSources/general/semiImplicitSource/SemiImplicitSourceI.H b/src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSourceI.H
similarity index 100%
rename from src/fieldSources/general/semiImplicitSource/SemiImplicitSourceI.H
rename to src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSourceI.H
diff --git a/src/fieldSources/general/semiImplicitSource/SemiImplicitSourceIO.C b/src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSourceIO.C
similarity index 100%
rename from src/fieldSources/general/semiImplicitSource/SemiImplicitSourceIO.C
rename to src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSourceIO.C
diff --git a/src/fieldSources/general/semiImplicitSource/semiImplicitSource.C b/src/fieldSources/sources/general/semiImplicitSource/semiImplicitSource.C
similarity index 100%
rename from src/fieldSources/general/semiImplicitSource/semiImplicitSource.C
rename to src/fieldSources/sources/general/semiImplicitSource/semiImplicitSource.C
diff --git a/src/randomProcesses/noise/noiseFFT.C b/src/randomProcesses/noise/noiseFFT.C
index 0efa5c43f2..9a7ca7cd95 100644
--- a/src/randomProcesses/noise/noiseFFT.C
+++ b/src/randomProcesses/noise/noiseFFT.C
@@ -27,8 +27,8 @@ License
 #include "IFstream.H"
 #include "DynamicList.H"
 #include "fft.H"
-#include "mathematicalConstants.H"
 #include "SubField.H"
+#include "mathematicalConstants.H"
 
 // * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * //
 
@@ -61,7 +61,7 @@ Foam::noiseFFT::noiseFFT(const fileName& pFileName, const label skip)
     {
         FatalErrorIn
         (
-            "noiseFFT::noiseFFT(const fileName& pFileName, const label skip)"
+            "noiseFFT::noiseFFT(const fileName&, const label)"
         )   << "Cannot read file " << pFileName
             << exit(FatalError);
     }
@@ -76,11 +76,8 @@ Foam::noiseFFT::noiseFFT(const fileName& pFileName, const label skip)
 
             if (!pFile.good() || pFile.eof())
             {
-                FatalErrorIn
-                (
-                    "noiseFFT::noiseFFT(const fileName& pFileName, "
-                    "const label skip)"
-                )   << "Number of points in file " << pFileName
+                FatalErrorIn("noiseFFT::noiseFFT(const fileName&, const label)")
+                    << "Number of points in file " << pFileName
                     << " is less than the number to be skipped = " << skip
                     << exit(FatalError);
             }
@@ -136,7 +133,7 @@ Foam::tmp<Foam::scalarField> Foam::noiseFFT::window
 
     if ((N + ni*windowOffset) > size())
     {
-        FatalErrorIn("noiseFFT::window(const label N, const label n) const")
+        FatalErrorIn("noiseFFT::window(const label, const label) const")
             << "Requested window is outside set of data" << endl
             << "number of data = " << size() << endl
             << "size of window = " << N << endl
@@ -215,10 +212,10 @@ Foam::graph Foam::noiseFFT::meanPf
 {
     if (N > size())
     {
-        FatalErrorIn("noiseFFT::meanPf(const label N, const label nw) const")
-            << "Requested window is outside set of data" << endl
-            << "number of data = " << size() << endl
-            << "size of window = " << N << endl
+        FatalErrorIn("noiseFFT::meanPf(const label, const label) const")
+            << "Requested window is outside set of data" << nl
+            << "number of data = " << size() << nl
+            << "size of window = " << N << nl
             << "window  = " << nw
             << exit(FatalError);
     }
@@ -261,7 +258,7 @@ Foam::graph Foam::noiseFFT::RMSmeanPf
 {
     if (N > size())
     {
-        FatalErrorIn("noiseFFT::RMSmeanPf(const label N, const label nw) const")
+        FatalErrorIn("noiseFFT::RMSmeanPf(const label, const label) const")
             << "Requested window is outside set of data" << endl
             << "number of data = " << size() << endl
             << "size of window = " << N << endl
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 07a70d651b..e6cee26e03 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -236,11 +236,11 @@ void thermoSingleLayer::correctAlpha()
 
         forAll(alpha_, i)
         {
-            if ((alpha_[i] < 0.5) && (delta_[i] > hydrophilicDry))
+            if ((alpha_[i] < 0.5) && (delta_[i] > hydrophilicWet))
             {
                 alpha_[i] = 1.0;
             }
-            else if ((alpha_[i] > 0.5) && (delta_[i] < hydrophilicWet))
+            else if ((alpha_[i] > 0.5) && (delta_[i] < hydrophilicDry))
             {
                 alpha_[i] = 0.0;
             }
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
index 696728e7f9..b13c8ac3b0 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
@@ -132,10 +132,12 @@ protected:
             //- Activation flag
             bool hydrophilic_;
 
-            //- Length scale applied to deltaWet_ for dry faces, typically 0.5
+            //- Length scale applied to deltaWet_ to determine when a wet
+            //  surface becomes dry, typically 0.5
             scalar hydrophilicDryScale_;
 
-            //- Length scale applied to deltaWet_ for wet faces, typically 0.001
+            //- Length scale applied to deltaWet_ to determine when a dry
+            //  surface becomes wet, typically 0.001
             scalar hydrophilicWetScale_;
 
 
diff --git a/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C b/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
index 8a7bdb0291..df84d4fe89 100644
--- a/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
@@ -145,7 +145,7 @@ void homogeneousDynOneEqEddy::correct(const tmp<volTensorField>& tgradU)
 
     volSymmTensorField D(dev(symm(gradU)));
     volScalarField divU(fvc::div(phi()/fvc::interpolate(rho())));
-    volScalarField G(2*muSgs_*(gradU && D));
+    volScalarField G(type() + ".G", 2*muSgs_*(gradU && D));
 
     tmp<fvScalarMatrix> kEqn
     (
diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
index aeaa8351d0..c811874e73 100644
--- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
@@ -118,7 +118,7 @@ void lowReOneEqEddy::correct(const tmp<volTensorField>& tgradU)
     GenEddyVisc::correct(gradU);
 
     volScalarField divU(fvc::div(phi()/fvc::interpolate(rho())));
-    volScalarField G(2*muSgs_*(gradU && dev(symm(gradU))));
+    volScalarField G(type() + ".G", 2*muSgs_*(gradU && dev(symm(gradU))));
 
     tmp<fvScalarMatrix> kEqn
     (
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
index d02b487de5..9b2f0319f6 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
@@ -105,7 +105,7 @@ void oneEqEddy::correct(const tmp<volTensorField>& tgradU)
     GenEddyVisc::correct(gradU);
 
     volScalarField divU(fvc::div(phi()/fvc::interpolate(rho())));
-    volScalarField G(2*muSgs_*(gradU && dev(symm(gradU))));
+    volScalarField G(type() + ".G", 2*muSgs_*(gradU && dev(symm(gradU))));
 
     tmp<fvScalarMatrix> kEqn
     (
diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
index 40e4f293e6..e0c8915846 100644
--- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.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
@@ -101,7 +101,7 @@ void oneEqEddy::correct(const tmp<volTensorField>& gradU)
 {
     GenEddyVisc::correct(gradU);
 
-    tmp<volScalarField> G = 2.0*nuSgs_*magSqr(symm(gradU));
+    volScalarField G(type() + ".G", 2.0*nuSgs_*magSqr(symm(gradU)));
 
     tmp<fvScalarMatrix> kEqn
     (
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/sourcesProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/sourcesProperties
index ddd2bf9c9f..1a3adf4c90 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/sourcesProperties
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/sourcesProperties
@@ -17,14 +17,14 @@ FoamFile
 
 source1
 {
-    type            fixedTemperatureSource;
+    type            fixedTemperatureConstraint;
     active          true;
     timeStart       0;
     duration        1000000;
     selectionMode   cellZone;
     cellZone        porosity;
 
-    fixedTemperatureSourceCoeffs
+    fixedTemperatureConstraintCoeffs
     {
         mode            uniform;
         temperature     350;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/sourcesProperties b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/sourcesProperties
index d4d41da47f..a73a9bd2b7 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/sourcesProperties
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/sourcesProperties
@@ -17,14 +17,14 @@ FoamFile
 
 fixedTemperaure1
 {
-    type            fixedTemperatureSource;
+    type            fixedTemperatureConstraint;
     active          true;
     timeStart       0;
     duration        1000000;
     selectionMode   cellZone;
     cellZone        porosity;
 
-    fixedTemperatureSourceCoeffs
+    fixedTemperatureConstraintCoeffs
     {
         mode            uniform;
         temperature     350;
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/sourcesProperties b/tutorials/incompressible/pimpleFoam/channel395/constant/sourcesProperties
index 106403ce53..501ab02cb1 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/constant/sourcesProperties
+++ b/tutorials/incompressible/pimpleFoam/channel395/constant/sourcesProperties
@@ -27,7 +27,6 @@ momentumSource
     {
         fieldNames  (U);
         Ubar        ( 0.1335 0 0 );
-        gradPini    gradPIni [0 1 -2 0 0 ] 0;
     }
 }
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties
index d351c7f360..f577883909 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties
@@ -17,14 +17,14 @@ FoamFile
 
 source1
 {
-    type            fixedTemperatureSource;
+    type            fixedTemperatureConstraint;
     active          true;
     timeStart       0.1;
     duration        0.4;
     selectionMode   cellSet;
     cellSet         ignitionCells;
 
-    fixedTemperatureSourceCoeffs
+    fixedTemperatureConstraintCoeffs
     {
         mode            uniform;
         temperature     2000;