diff --git a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H
index 45fc95065b..f431c1042f 100644
--- a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H
@@ -7,7 +7,7 @@
     );
 
     // Add resistance on the actuation disks
-    actuationDisks.addSu(UEqn());
+    sources.apply(UEqn());
 
     UEqn().relax();
 
diff --git a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C
index d3a8bcda19..771c3ee733 100644
--- a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
-    IObasicSourceList actuationDisks(mesh);
+    IObasicSourceList sources(mesh);
 
     simpleControl simple(mesh);
 
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C b/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C
index 23c9e03229..4c368e7cdd 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C
@@ -41,7 +41,7 @@ Description
 #include "rhoChemistryCombustionModel.H"
 #include "radiationModel.H"
 #include "porousZones.H"
-#include "timeActivatedExplicitSource.H"
+#include "IObasicSourceList.H"
 #include "SLGThermo.H"
 #include "fvcSmooth.H"
 #include "pimpleControl.H"
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/UEqn.H
index 9664c2a50d..bf6f141875 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/UEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/UEqn.H
@@ -7,9 +7,10 @@
      ==
         rho.dimensionedInternalField()*g
       + parcels.SU(U)
-      + momentumSource.Su()
     );
 
+    sources.apply(UEqn);
+
     pZones.addResistance(UEqn);
 
     if (pimple.momentumPredictor())
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/YEqn.H
index 625c940a66..a5ee090d84 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/YEqn.H
@@ -23,7 +23,7 @@ if (solveSpecies)
         {
             volScalarField& Yi = Y[i];
 
-            solve
+            fvScalarMatrix YEqn
             (
                 fvm::ddt(rho, Yi)
               + mvConvection->fvmDiv(phi, Yi)
@@ -31,10 +31,12 @@ if (solveSpecies)
              ==
                 parcels.SYi(i, Yi)
               + combustion->R(Yi)
-              + massSource.Su(i),
-                mesh.solver("Yi")
             );
 
+            sources.apply(YEqn);
+
+            YEqn.solve(mesh.solver("Yi"));
+
             Yi.max(0.0);
             Yt += Yi;
         }
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/createExplicitSources.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/createExplicitSources.H
index 0f2b52e536..b2e5775e58 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/createExplicitSources.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/createExplicitSources.H
@@ -1,27 +1,2 @@
-Info<< "Creating mass source\n" << endl;
-scalarTimeActivatedExplicitSourceList massSource
-(
-    "mass",
-    mesh,
-    dimMass/dimTime/dimVolume,
-    composition.species()
-);
-
-
-Info<< "Creating momentum source\n" << endl;
-vectorTimeActivatedExplicitSourceList momentumSource
-(
-    "momentum",
-    mesh,
-    dimMass*dimVelocity/dimTime/dimVolume,
-    "U"
-);
-
-Info<< "Creating energy source\n" << endl;
-scalarTimeActivatedExplicitSourceList energySource
-(
-    "energy",
-    mesh,
-    dimEnergy/dimTime/dimVolume,
-    "h"
-);
+Info<< "Creating sources\n" << endl;
+IObasicSourceList sources(mesh);
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H
index 55bf1d6dd0..c8c634bbd9 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H
@@ -8,10 +8,11 @@
         DpDt
       + parcels.Sh(hs)
       + radiation->Shs(thermo)
-      + energySource.Su()
       + combustion->Sh()
     );
 
+    sources.apply(hsEqn);
+
     hsEqn.solve();
 
     thermo.correct();
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H
index d3aaed21ef..5dc9058d9e 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H
@@ -29,9 +29,10 @@
       + fvc::div(phi)
      ==
         parcels.Srho()
-      + massSource.SuTot()
     );
 
+    sources.apply(pDDtEqn);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/rhoEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/rhoEqn.H
index 97aa5b1929..829ad231e7 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/rhoEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/rhoEqn.H
@@ -36,9 +36,10 @@ Description
       + fvc::div(phi)
       ==
         parcels.Srho(rho)
-      + massSource.SuTot()
     );
 
+    sources.apply(rhoEqn);
+
     rhoEqn.solve();
 
     Info<< "rho min/max = " << min(rho).value() << ", " << max(rho).value()
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
index 8c4b8a38e4..e61e6cdac7 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
@@ -76,7 +76,7 @@ Info<< "Time scales min/max:" << endl;
             (
                 DpDt
               + parcels.hsTrans()/(mesh.V()*runTime.deltaT())
-              + energySource.Su()
+//              + energySource.Su()
               + combustion->Sh()()
             )
            /rho
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
index e7f242fa5f..2956bf99d8 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
@@ -9,6 +9,8 @@
       + limestoneParcels.SU(U)
     );
 
+    sources.apply(UEqn);
+
     UEqn.relax();
 
     if (pimple.momentumPredictor())
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
index e9bd1c6581..c6abcb4db5 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
@@ -32,6 +32,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
               + combustion->R(Yi)
             );
 
+            sources.apply(YiEqn);
+
             YiEqn.relax();
             YiEqn.solve(mesh.solver("Yi"));
 
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 897f43e3c3..d6c61074e1 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -40,7 +40,7 @@ Description
 #include "basicThermoCloud.H"
 #include "coalCloud.H"
 #include "psiChemistryCombustionModel.H"
-#include "timeActivatedExplicitSource.H"
+#include "IObasicSourceList.H"
 #include "radiationModel.H"
 #include "SLGThermo.H"
 #include "pimpleControl.H"
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
index 4d0a2b7408..13e8d94e72 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
@@ -122,14 +122,8 @@
         fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
     );
 
-    Info<< "\nConstructing explicit enthalpy source" << endl;
-    scalarTimeActivatedExplicitSourceList enthalpySource
-    (
-        "energy",
-        mesh,
-        dimEnergy/dimTime/dimVolume,
-        "hs"
-    );
+    Info<< "\nConstructing sources" << endl;
+    IObasicSourceList sources(mesh);
 
     volScalarField dQ
     (
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H
index 9a4665accd..fa9f3a0a44 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H
@@ -9,10 +9,11 @@
      +  combustion->Sh()
      +  coalParcels.Sh(hs)
      +  limestoneParcels.Sh(hs)
-     +  enthalpySource.Su()
      +  radiation->Shs(thermo)
     );
 
+    sources.apply(hsEqn);
+
     hsEqn.relax();
     hsEqn.solve();
 
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
index 73e56f07c5..5ef8472210 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
@@ -26,6 +26,8 @@ if (pimple.transonic())
             coalParcels.Srho()
         );
 
+        sources.apply(pEqn);
+
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
@@ -54,6 +56,8 @@ else
             coalParcels.Srho()
         );
 
+        sources.apply(pEqn);
+
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H
index aa20ed2bf5..8902cc95a8 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H
@@ -30,13 +30,17 @@ Description
 \*---------------------------------------------------------------------------*/
 
 {
-    solve
+    fvScalarMatrix rhoEqn
     (
         fvm::ddt(rho)
       + fvc::div(phi)
       ==
         coalParcels.Srho(rho)
     );
+
+    sources.apply(rhoEqn);
+
+    rhoEqn.solve();
 }
 
 // ************************************************************************* //
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
index e52431f1e8..a89058d2b5 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
@@ -7,9 +7,10 @@
      ==
         rho.dimensionedInternalField()*g
       + parcels.SU(U)
-      + momentumSource.Su()
     );
 
+    sources.apply(UEqn);
+
     pZones.addResistance(UEqn);
 
     if (pimple.momentumPredictor())
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H
index 5ef4aaa3a3..8811a5ffe3 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H
@@ -24,7 +24,7 @@ if (solveSpecies)
         {
             volScalarField& Yi = Y[i];
 
-            solve
+            fvScalarMatrix YiEqn
             (
                 fvm::ddt(rho, Yi)
               + mvConvection->fvmDiv(phi, Yi)
@@ -32,10 +32,12 @@ if (solveSpecies)
               ==
                 parcels.SYi(i, Yi)
               + combustion->R(Yi)
-              + massSource.Su(i),
-                mesh.solver("Yi")
             );
 
+            sources.apply(YiEqn);
+
+            YiEqn.solve(mesh.solver("Yi"));
+
             Yi.max(0.0);
             Yt += Yi;
         }
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createExplicitSources.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createExplicitSources.H
index 0f2b52e536..b2e5775e58 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createExplicitSources.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createExplicitSources.H
@@ -1,27 +1,2 @@
-Info<< "Creating mass source\n" << endl;
-scalarTimeActivatedExplicitSourceList massSource
-(
-    "mass",
-    mesh,
-    dimMass/dimTime/dimVolume,
-    composition.species()
-);
-
-
-Info<< "Creating momentum source\n" << endl;
-vectorTimeActivatedExplicitSourceList momentumSource
-(
-    "momentum",
-    mesh,
-    dimMass*dimVelocity/dimTime/dimVolume,
-    "U"
-);
-
-Info<< "Creating energy source\n" << endl;
-scalarTimeActivatedExplicitSourceList energySource
-(
-    "energy",
-    mesh,
-    dimEnergy/dimTime/dimVolume,
-    "h"
-);
+Info<< "Creating sources\n" << endl;
+IObasicSourceList sources(mesh);
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hsEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hsEqn.H
index 0e2c61a9ff..d15dd3367e 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hsEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hsEqn.H
@@ -29,7 +29,7 @@
     }
 
     {
-        solve
+        fvScalarMatrix hsEqn
         (
             fvm::ddt(rho, hs)
           + mvConvection->fvmDiv(phi, hs)
@@ -38,10 +38,13 @@
             pWork()
           + parcels.Sh(hs)
           + radiation->Shs(thermo)
-          + energySource.Su()
           + combustion->Sh()
         );
 
+        sources.apply(hsEqn);
+
+        hsEqn.solve();
+
         thermo.correct();
 
         radiation->correct();
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
index b6e69acead..581c03e104 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
@@ -29,9 +29,10 @@
       + fvc::div(phi)
      ==
         parcels.Srho()
-      + massSource.SuTot()
     );
 
+    sources.apply(pDDtEqn);
+
     while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
index 19d7e96d13..8d97ec99ff 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
@@ -45,7 +45,7 @@ Description
 #include "rhoChemistryCombustionModel.H"
 #include "radiationModel.H"
 #include "porousZones.H"
-#include "timeActivatedExplicitSource.H"
+#include "IObasicSourceList.H"
 #include "SLGThermo.H"
 #include "pimpleControl.H"
 
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H
index 100aa179c3..d5d36f7c5f 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H
@@ -36,9 +36,10 @@ Description
       + fvc::div(phi)
       ==
         parcels.Srho(rho)
-      + massSource.SuTot()
     );
 
+    sources.apply(rhoEqn);
+
     rhoEqn.solve();
 }
 
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index d30f23b9bd..0eed2c9f4b 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -378,19 +378,18 @@ $(SRF)/SRFModel/rpm/rpm.C
 $(SRF)/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
 $(SRF)/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
 
-fieldSources = $(general)/fieldSources
-$(fieldSources)/pressureGradientExplicitSource/pressureGradientExplicitSource.C
-$(fieldSources)/timeActivatedExplicitSource/timeActivatedExplicitSource.C
-
 basicSource = $(general)/fieldSources/basicSource
 $(basicSource)/basicSource/basicSource.C
 $(basicSource)/basicSource/basicSourceIO.C
 $(basicSource)/basicSource/basicSourceList.C
 $(basicSource)/basicSource/IObasicSourceList.C
-$(basicSource)/actuationDiskSource/actuationDiskSource.C
-$(basicSource)/radialActuationDiskSource/radialActuationDiskSource.C
+
+$(basicSource)/pressureGradientExplicitSource/pressureGradientExplicitSource.C
+$(basicSource)/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
+
 $(basicSource)/explicitSource/explicitSource.C
 $(basicSource)/explicitSetValue/explicitSetValue.C
+
 $(basicSource)/rotorDiskSource/rotorDiskSource.C
 $(basicSource)/rotorDiskSource/bladeModel/bladeModel.C
 $(basicSource)/rotorDiskSource/profileModel/profileModel.C
@@ -398,5 +397,7 @@ $(basicSource)/rotorDiskSource/profileModel/profileModelList.C
 $(basicSource)/rotorDiskSource/profileModel/lookup/lookupProfile.C
 $(basicSource)/rotorDiskSource/profileModel/series/seriesProfile.C
 
+$(basicSource)/actuationDiskSource/actuationDiskSource.C
+$(basicSource)/radialActuationDiskSource/radialActuationDiskSource.C
 
 LIB = $(FOAM_LIBBIN)/libfiniteVolume
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C
index e7e996d1db..2f0da244cf 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C
@@ -35,7 +35,12 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(actuationDiskSource, 0);
-    addToRunTimeSelectionTable(basicSource, actuationDiskSource, dictionary);
+    addToRunTimeSelectionTable
+    (
+        basicSource,
+        actuationDiskSource,
+        dictionary
+    );
 }
 
 
@@ -75,7 +80,7 @@ Foam::actuationDiskSource::actuationDiskSource
 )
 :
     basicSource(name, modelType, dict, mesh),
-    coeffs_(dict.subDict(modelType + "Coeffs")),
+    fieldName_(coeffs_.lookup("fieldName")),
     diskDir_(coeffs_.lookup("diskDir")),
     Cp_(readScalar(coeffs_.lookup("Cp"))),
     Ct_(readScalar(coeffs_.lookup("Ct"))),
@@ -90,17 +95,35 @@ Foam::actuationDiskSource::actuationDiskSource
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::actuationDiskSource::addSu(fvMatrix<vector>& UEqn)
+Foam::label Foam::actuationDiskSource::applyToField
+(
+    const word& fieldName
+) const
+{
+    if (fieldName == fieldName_)
+    {
+        return 0;
+    }
+
+    return -1;
+}
+
+
+void Foam::actuationDiskSource::addSup
+(
+    fvMatrix<vector>& eqn,
+    const label
+)
 {
     bool compressible = false;
-    if (UEqn.dimensions() == dimensionSet(1, 1, -2, 0, 0))
+    if (eqn.dimensions() == dimForce)
     {
         compressible = true;
     }
 
-    const scalarField& cellsV = this->mesh().V();
-    vectorField& Usource = UEqn.source();
-    const vectorField& U = UEqn.psi();
+    const scalarField& cellsV = mesh_.V();
+    vectorField& Usource = eqn.source();
+    const vectorField& U = eqn.psi();
 
     if (V() > VSMALL)
     {
@@ -111,7 +134,7 @@ void Foam::actuationDiskSource::addSu(fvMatrix<vector>& UEqn)
                 Usource,
                 cells_,
                 cellsV,
-                this->mesh().lookupObject<volScalarField>("rho"),
+                mesh_.lookupObject<volScalarField>("rho"),
                 U
             );
         }
@@ -141,7 +164,6 @@ bool Foam::actuationDiskSource::read(const dictionary& dict)
 {
     if (basicSource::read(dict))
     {
-        coeffs_ = dict.subDict(typeName + "Coeffs");
         coeffs_.readIfPresent("diskDir", diskDir_);
         coeffs_.readIfPresent("Cp", Cp_);
         coeffs_.readIfPresent("Ct", Ct_);
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H
index cbe98ea4c8..b0e983e11e 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H
@@ -26,16 +26,30 @@ Class
     Foam::actuationDiskSource
 
 Description
-    Actuation disk zone definition.
+    Actuation disk source
+
     Constant values for momentum source for actuation disk
 
-    T = 2*rho*A*sqr(Uo)*a*(1-a)
-    U1 = (1 -a)Uo
+        T = 2*rho*A*sqr(Uo)*a*(1-a)
+        U1 = (1 -a)Uo
+
     where:
-          A: disk area
-          Uo: upstream velocity
-          a: 1 - Cp/Ct
-          U1: velocity at the disk
+        A: disk area
+        Uo: upstream velocity
+        a: 1 - Cp/Ct
+        U1: velocity at the disk
+
+    Sources described by:
+
+        actuationDiskSourceCoeffs
+        {
+            fieldName       U;          // name of field to apply source
+            diskDir         (-1 0 0);   // disk direction
+            Cp              0.1;        // power coefficient
+            Ct              0.5;        // thrust coefficient
+            diskArea        5.0;        // disk area
+        }
+
 
 SourceFiles
     actuationDiskSource.C
@@ -46,14 +60,6 @@ SourceFiles
 #ifndef actuationDiskSource_H
 #define actuationDiskSource_H
 
-#include "IOdictionary.H"
-#include "coordinateSystem.H"
-#include "coordinateSystems.H"
-#include "wordList.H"
-#include "labelList.H"
-#include "DimensionedField.H"
-#include "volFieldsFwd.H"
-#include "fvMatricesFwd.H"
 #include "basicSource.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -74,8 +80,8 @@ protected:
 
     // Protected data
 
-        //- Coefficients dictionary
-        dictionary coeffs_;
+        //- Name of field to apply source upon
+        word fieldName_;
 
         //- Disk area normal
         vector diskDir_;
@@ -140,6 +146,12 @@ public:
 
     // Member Functions
 
+        // Check
+
+            //- Return index of field name if found in fieldNames list
+            virtual label applyToField(const word& fieldName) const;
+
+
         // Access
 
             //- Return Cp
@@ -169,11 +181,8 @@ public:
 
         // Public Functions
 
-            //-Source term to fvMatrix<vector>
-            virtual void addSu(fvMatrix<vector>& UEqn);
-
-            //-Source term to fvMatrix<scalar>
-            virtual void addSu(fvMatrix<scalar>& UEqn){}
+            //- Source term to fvMatrix<vector>
+            virtual void addSup(fvMatrix<vector>& eqn, const label fieldI);
 
 
         // I-O
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C
index 0c8695edca..cac80c3d3e 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/IObasicSourceList.C
@@ -24,6 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "IObasicSourceList.H"
+#include "fvMesh.H"
+#include "Time.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C
index c59b203618..9a8ea3015e 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C
@@ -25,19 +25,16 @@ License
 
 #include "basicSource.H"
 #include "fvMesh.H"
-#include "volFields.H"
+#include "fvMatrices.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
     defineTypeNameAndDebug(basicSource, 0);
     defineRunTimeSelectionTable(basicSource, dictionary);
 
-
-    // * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
-
     template<> const char* NamedEnum
     <
         basicSource::selectionModeType,
@@ -120,12 +117,9 @@ void Foam::basicSource::setCellSet()
                 label globalCellI = returnReduce(cellI, maxOp<label>());
                 if (globalCellI < 0)
                 {
-                    WarningIn
-                    (
-                        "TimeActivatedExplicitSource<Type>::setCellIds()"
-                    )
-                    << "Unable to find owner cell for point " << points_[i]
-                    << endl;
+                    WarningIn("basicSource::setCellIds()")
+                        << "Unable to find owner cell for point " << points_[i]
+                        << endl;
 
                 }
 
@@ -152,7 +146,7 @@ void Foam::basicSource::setCellSet()
             label zoneID = mesh_.cellZones().findZoneID(cellSetName_);
             if (zoneID == -1)
             {
-                FatalErrorIn("basicSource<Type>::setCellIds()")
+                FatalErrorIn("basicSource::setCellIds()")
                     << "Cannot find cellZone " << cellSetName_ << endl
                     << "Valid cellZones are " << mesh_.cellZones().names()
                     << exit(FatalError);
@@ -170,7 +164,7 @@ void Foam::basicSource::setCellSet()
         }
         default:
         {
-            FatalErrorIn("basicSource<Type>::setCellIds()")
+            FatalErrorIn("basicSource::setCellIds()")
                 << "Unknown selectionMode "
                 << selectionModeTypeNames_[selectionMode_]
                 << ". Valid selectionMode types are" << selectionModeTypeNames_
@@ -205,6 +199,7 @@ Foam::basicSource::basicSource
     name_(name),
     mesh_(mesh),
     dict_(dict),
+    coeffs_(dict.subDict(modelType + "Coeffs")),
     active_(readBool(dict_.lookup("active"))),
     timeStart_(readScalar(dict_.lookup("timeStart"))),
     duration_(readScalar(dict_.lookup("duration"))),
@@ -226,11 +221,11 @@ Foam::basicSource::basicSource
 Foam::autoPtr<Foam::basicSource> Foam::basicSource::New
 (
     const word& name,
-    const dictionary& dict,
+    const dictionary& coeffs,
     const fvMesh& mesh
 )
 {
-    word modelType(dict.lookup("type"));
+    word modelType(coeffs.lookup("type"));
 
     Info<< "Selecting model type " << modelType << endl;
 
@@ -241,16 +236,16 @@ Foam::autoPtr<Foam::basicSource> Foam::basicSource::New
     {
         FatalErrorIn
         (
-            "basicSource::New(const volVectorField&, "
-            "const surfaceScalarField&, transportModel&)"
+            "basicSource::New"
+            "(const name&, const dictionary&, const fvMesh&)"
         )   << "Unknown Model type " << modelType
             << nl << nl
-            << "Valid model types are :" << nl
+            << "Valid model types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
-    return autoPtr<basicSource>(cstrIter()(name, modelType, dict, mesh));
+    return autoPtr<basicSource>(cstrIter()(name, modelType, coeffs, mesh));
 }
 
 
@@ -279,21 +274,75 @@ bool Foam::basicSource::isActive()
 }
 
 
-void Foam::basicSource::addSu(Foam::fvMatrix<vector>& Eqn)
+void Foam::basicSource::addSup(fvMatrix<scalar>& eqn, const label fieldI)
 {
-    notImplemented("Foam::basicSource addSu(Foam::fvMatrix<vector>& Eqn)");
+    // do nothing
 }
 
 
-void Foam::basicSource::addSu(Foam::fvMatrix<scalar>& Eqn)
+void Foam::basicSource::addSup(fvMatrix<vector>& eqn, const label fieldI)
 {
-    notImplemented("Foam::basicSource addSu(Foam::fvMatrix<scalar>& Eqn)");
+    // do nothing
 }
 
 
-void Foam::basicSource::setValue(Foam::fvMatrix<scalar>& Eqn)
+void Foam::basicSource::addSup
+(
+    fvMatrix<sphericalTensor>& eqn,
+    const label fieldI
+)
 {
-    notImplemented("Foam::basicSource setValue(Foam::fvMatrix<scalar>& Eqn)");
+    // do nothing
+}
+
+
+void Foam::basicSource::addSup(fvMatrix<symmTensor>& eqn, const label fieldI)
+{
+    // do nothing
+}
+
+
+void Foam::basicSource::addSup(fvMatrix<tensor>& eqn, const label fieldI)
+{
+    // do nothing
+}
+
+
+void Foam::basicSource::setValue(fvMatrix<scalar>& eqn, const label fieldI)
+{
+    // do nothing
+}
+
+
+void Foam::basicSource::setValue(fvMatrix<vector>& eqn, const label fieldI)
+{
+    // do nothing
+}
+
+
+void Foam::basicSource::setValue
+(
+    fvMatrix<sphericalTensor>& eqn,
+    const label fieldI
+)
+{
+    // do nothing
+}
+
+
+void Foam::basicSource::setValue
+(
+    fvMatrix<symmTensor>& eqn,
+    const label fieldI
+)
+{
+    // do nothing
+}
+
+
+void Foam::basicSource::setValue(fvMatrix<tensor>& eqn, const label fieldI)
+{
+    // do nothing
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H
index 9862282479..563f997629 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H
@@ -25,52 +25,14 @@ Class
     Foam::basicSource
 
 Description
-    Basic source abtract class
+    Field source abtract base class.  Provides a base set of controls, e.g.
 
-    Sources described by:
+        type            scalarExplicitSource    // source type
+        active          on;                     // on/off switch
+        timeStart       0.0;                    // start time
+        duration        1000.0;                 // duration
+        selectionMode   cellSet;                // cellSet // points //cellZone
 
-    source1
-    {
-        type            actuationDiskSource; // explicitSource
-        active          on;            // on/off switch
-        timeStart       0.0;           // start time
-        duration        1000.0;        // duration
-        selectionMode   cellSet;       // cellSet // points //cellZone
-        cellSet         c0;            // cellSet name
-
-        actuationDiskSourceCoeffs
-        {
-            diskDir     (-1 0 0); // orientation of the disk
-            Cp          0.53;     // Cp
-            Ct          0.58;     // Ct
-            diskArea    40;       // disk area
-        }
-    }
-
-    source2
-    {
-        type            explicitSource;
-        active          on;
-        timeStart       0.0;
-        duration        1000.0;
-        selectionMode   points;
-        cellSet         c0;
-
-        points            // list of points when selectionMode = points
-        (
-            (-0.088 0.007 -0.02)
-            (-0.028 0.007 -0.02)
-        );
-        explicitSourceCoeffs
-        {
-            volumeMode      specific;  //absolute
-            fieldData                  //field data
-            {
-                k   30.7;
-                epsilon  1.5;
-            }
-        }
-    }
 
 SourceFiles
     basicSource.C
@@ -81,10 +43,8 @@ SourceFiles
 #ifndef basicSource_H
 #define basicSource_H
 
-#include "fvMatrices.H"
+#include "fvMatricesFwd.H"
 #include "cellSet.H"
-#include "volFieldsFwd.H"
-#include "DimensionedField.H"
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
 
@@ -96,7 +56,7 @@ namespace Foam
 class fvMesh;
 
 /*---------------------------------------------------------------------------*\
-                          Class basicSource Declaration
+                         Class basicSource Declaration
 \*---------------------------------------------------------------------------*/
 
 class basicSource
@@ -128,12 +88,18 @@ protected:
         //- Reference to the mesh database
         const fvMesh& mesh_;
 
-        //- Dictionary containing the data of the source
-        const dictionary& dict_;
+        //- Top level source dictionary
+        dictionary dict_;
+
+        //- Dictionary containing source coefficients
+        dictionary coeffs_;
 
         //- Source active flag
         bool active_;
 
+        //- Flag to indicate whether or not the source has been applied
+//        bool applied_;   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
         //- Time start
         scalar timeStart_;
 
@@ -271,7 +237,7 @@ public:
             inline const fvMesh& mesh() const;
 
             //- Return dictionary
-            inline const dictionary& dictCoeffs() const;
+            inline const dictionary& coeffs() const;
 
             //- Return const access to the source active flag
             inline bool active() const;
@@ -316,18 +282,86 @@ public:
             //- Is the source active?
             bool isActive();
 
+            //- Return index of field name if found in fieldNames list
+            virtual label applyToField(const word& fieldName) const = 0;
+
 
         // Evaluation
 
-            //- Add source term to vector fvMatrix
-            virtual void addSu(fvMatrix<vector>& Eqn);
+            // Add explicit and implicit contributions
 
-            //- Add source term to scalar fvMatrix
-            virtual void addSu(fvMatrix<scalar>& Eqn);
+                //- Scalar
+                virtual void addSup
+                (
+                    fvMatrix<scalar>& eqn,
+                    const label fieldI
+                );
 
-            //- Set constant value on field
-            virtual void setValue(fvMatrix<scalar>& Eq);
+                //- Vector
+                virtual void addSup
+                (
+                    fvMatrix<vector>& eqn,
+                    const label fieldI
+                );
 
+                //- Spherical tensor
+                virtual void addSup
+                (
+                    fvMatrix<symmTensor>& eqn,
+                    const label fieldI
+                );
+
+                //- Symmetric tensor
+                virtual void addSup
+                (
+                    fvMatrix<sphericalTensor>& eqn,
+                    const label fieldI
+                );
+
+                //- Tensor
+                virtual void addSup
+                (
+                    fvMatrix<tensor>& eqn,
+                    const label fieldI
+                );
+
+
+            // Set values directly
+
+                //- Scalar
+                virtual void setValue
+                (
+                    fvMatrix<scalar>& eqn,
+                    const label fieldI
+                );
+
+                //- Vector
+                virtual void setValue
+                (
+                    fvMatrix<vector>& eqn,
+                    const label fieldI
+                );
+
+                //- Spherical tensor
+                virtual void setValue
+                (
+                    fvMatrix<sphericalTensor>& eqn,
+                    const label fieldI
+                );
+
+                //- Symmetric tensor
+                virtual void setValue
+                (
+                    fvMatrix<symmTensor>& eqn,
+                    const label fieldI
+                );
+
+                //- Tensor
+                virtual void setValue
+                (
+                    fvMatrix<tensor>& eqn,
+                    const label fieldI
+                );
 
 
         // I-O
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.H
index e7a126d5c9..127db8a60f 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.H
@@ -38,11 +38,13 @@ inline const Foam::fvMesh& Foam::basicSource::mesh() const
     return mesh_;
 }
 
-inline const Foam::dictionary& Foam::basicSource::dictCoeffs() const
+
+inline const Foam::dictionary& Foam::basicSource::coeffs() const
 {
-    return dict_;
+    return coeffs_;
 }
 
+
 inline bool Foam::basicSource::active() const
 {
     return active_;
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C
index caec8b58cf..054de61219 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C
@@ -80,6 +80,9 @@ bool Foam::basicSource::read(const dictionary& dict)
     active_ = readBool(dict.lookup("active"));
     timeStart_ = readScalar(dict.lookup("timeStart"));
     duration_  = readScalar(dict.lookup("duration"));
+
+    coeffs_ = dict.subDict(type() + "Coeffs");
+
     return true;
 }
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.C
index 79af025143..4fb8a8a0d8 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.C
@@ -24,6 +24,14 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basicSourceList.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(basicSourceList, 0);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -50,59 +58,23 @@ Foam::basicSourceList::basicSourceList
     label i = 0;
     forAllConstIter(dictionary, dict, iter)
     {
-        const word& name = iter().keyword();
-        const dictionary& sourceDict = iter().dict();
+        if (iter().isDict())
+        {
+            const word& name = iter().keyword();
+            const dictionary& sourceDict = iter().dict();
 
-        this->set
-        (
-            i++,
-            basicSource::New(name, sourceDict, mesh)
-        );
+            this->set
+            (
+                i++,
+                basicSource::New(name, sourceDict, mesh)
+            );
+        }
     }
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
-void Foam::basicSourceList::addSu(fvMatrix<scalar>& Eqn)
-{
-    forAll(*this, i)
-    {
-        if (this->operator[](i).isActive())
-        {
-            this->operator[](i).addSu(Eqn);
-        }
-    }
-}
-
-
-void Foam::basicSourceList::addSu(fvMatrix<vector>& Eqn)
-{
-
-    forAll(*this, i)
-    {
-        if (this->operator[](i).isActive())
-        {
-            this->operator[](i).addSu(Eqn);
-        }
-    }
-}
-
-
-void Foam::basicSourceList::setValue(fvMatrix<scalar>& Eqn)
-{
-
-    forAll(*this, i)
-    {
-        if (this->operator[](i).isActive())
-        {
-            this->operator[](i).setValue(Eqn);
-        }
-    }
-}
-
-
 bool Foam::basicSourceList::read(const dictionary& dict)
 {
     bool allOk = true;
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.H
index 30e6501de1..956c5fe4c8 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.H
@@ -71,6 +71,10 @@ private:
 
 public:
 
+    //- Runtime type information
+    TypeName("basicSourceList");
+
+
     // Constructors
 
         //- Construct from components with list of field names
@@ -86,14 +90,8 @@ public:
 
         // Evaluation
 
-            //- Add source terms to scalar fvMatrix
-            void addSu(fvMatrix<scalar>& Eq);
-
-            //- Add source terms to vector fvMatrix
-            void addSu(fvMatrix<vector>& Eq);
-
-            //- Set constant value on field
-            void setValue(fvMatrix<scalar>& Eq);
+            template<class Type>
+            void apply(fvMatrix<Type>& eqn);
 
 
         // I-O
@@ -119,6 +117,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+    #include "basicSourceListTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValueIO.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceListTemplates.C
similarity index 68%
rename from src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValueIO.C
rename to src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceListTemplates.C
index 24e9205606..51ac28bd97 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValueIO.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceListTemplates.C
@@ -23,38 +23,31 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "explicitSetValue.H"
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::explicitSetValue::writeData(Ostream& os) const
+template<class Type>
+void Foam::basicSourceList::apply(fvMatrix<Type>& eqn)
 {
-    os  << indent << name_ << endl;
-    dict_.write(os);
-}
+    const word& fieldName = eqn.psi().name();
 
-
-bool Foam::explicitSetValue::read(const dictionary& dict)
-{
-    if (basicSource::read(dict))
+    forAll(*this, i)
     {
-        coeffs_ = dict.subDict(typeName + "Coeffs");
-        setFieldData(coeffs_.subDict("fieldData"));
-        return true;
+        basicSource& source = this->operator[](i);
+
+        label fieldI = source.applyToField(fieldName);
+
+        if (source.isActive() && (fieldI != -1))
+        {
+            if (debug)
+            {
+                Info<< "Applying source " << source.name() << " to field "
+                    << fieldName << endl;
+            }
+
+            source.addSup(eqn, fieldI);
+            source.setValue(eqn, fieldI);
+        }
     }
-    else
-    {
-        return false;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-Foam::Ostream& Foam::operator<<(Ostream& os, const explicitSetValue& source)
-{
-    source.writeData(os);
-    return os;
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/timeActivatedExplicitSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/makeBasicSource.H
similarity index 53%
rename from src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/timeActivatedExplicitSource.H
rename to src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/makeBasicSource.H
index 00b26abdb3..4d8c787487 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/timeActivatedExplicitSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/makeBasicSource.H
@@ -21,43 +21,28 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Typedef
-    Foam::timeActivatedExplicitSource
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef timeActivatedExplicitSource_H
-#define timeActivatedExplicitSource_H
+#ifndef makeBasicSource_H
+#define makeBasicSource_H
 
-#include "TimeActivatedExplicitSource.H"
-#include "TimeActivatedExplicitSourceList.H"
+#include "basicSource.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    typedef TimeActivatedExplicitSource<scalar>
-        scalarTimeActivatedExplicitSource;
-    typedef TimeActivatedExplicitSource<vector>
-        vectorTimeActivatedExplicitSource;
-    typedef TimeActivatedExplicitSource<sphericalTensor>
-        sphericalTensorTimeActivatedExplicitSource;
-    typedef TimeActivatedExplicitSource<symmTensor>
-        symmTensorTimeActivatedExplicitSource;
-    typedef TimeActivatedExplicitSource<tensor>
-        tensorTimeActivatedExplicitSource;
+#define makeBasicSource(Source, Type)                                               \
+                                                                              \
+    defineTemplateTypeNameAndDebugWithName                                    \
+    (                                                                         \
+        Source<Type>,                                                         \
+        #Type#Source,                                                         \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    basicSource::adddictionaryConstructorToTable<Source<Type> >            \
+        add##Source##Type##dictionary##ConstructorTobasicSourceTable_
 
-    typedef TimeActivatedExplicitSourceList<scalar>
-        scalarTimeActivatedExplicitSourceList;
-    typedef TimeActivatedExplicitSourceList<vector>
-        vectorTimeActivatedExplicitSourceList;
-    typedef TimeActivatedExplicitSourceList<sphericalTensor>
-        sphericalTensorTimeActivatedExplicitSourceList;
-    typedef TimeActivatedExplicitSourceList<symmTensor>
-        symmTensorTimeActivatedExplicitSourceList;
-    typedef TimeActivatedExplicitSourceList<tensor>
-        tensorTimeActivatedExplicitSourceList;
-}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C
new file mode 100644
index 0000000000..3a3c372d17
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "ExplicitSetValue.H"
+#include "fvMesh.H"
+#include "fvMatrices.H"
+#include "DimensionedField.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+void Foam::ExplicitSetValue<Type>::setFieldData(const dictionary& dict)
+{
+    fieldData_.setSize(dict.toc().size());
+
+    label i = 0;
+    forAllConstIter(dictionary, dict, iter)
+    {
+        fieldData_[i].first() = iter().keyword();
+        dict.lookup(iter().keyword()) >> fieldData_[i].second();
+        i++;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::ExplicitSetValue<Type>::ExplicitSetValue
+(
+    const word& name,
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh
+)
+:
+    basicSource(name, modelType, dict, mesh),
+    fieldData_()
+{
+    setFieldData(coeffs_.subDict("fieldData"));
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::label Foam::ExplicitSetValue<Type>::applyToField
+(
+    const word& fieldName
+) const
+{
+    forAll(fieldData_, i)
+    {
+        if (fieldData_[i].first() == fieldName)
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+
+template<class Type>
+void Foam::ExplicitSetValue<Type>::setValue
+(
+    fvMatrix<Type>& eqn,
+    const label fieldI
+)
+{
+    if (debug)
+    {
+        Info<< "ExplicitSetValue<"<< pTraits<Type>::typeName
+            << ">::setValue for source " << name_ << endl;
+    }
+
+    DimensionedField<Type, volMesh> rhs
+    (
+        IOobject
+        (
+            name_ + fieldData_[fieldI].first() + "rhs",
+            eqn.psi().mesh().time().timeName(),
+            eqn.psi().mesh(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        eqn.psi().mesh(),
+        dimensioned<Type>
+        (
+            "zero",
+            dimless,
+            pTraits<Type>::zero
+        )
+    );
+
+    List<Type> values(cells_.size());
+
+    forAll(values, i)
+    {
+        values[i] = fieldData_[fieldI].second();
+    }
+
+    eqn.setValues(cells_, values);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValue.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.H
similarity index 60%
rename from src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValue.H
rename to src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.H
index df3d404f1a..7c78084fc8 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValue.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.H
@@ -29,27 +29,26 @@ Description
 
     Sources described by:
 
-    explicitSetValueCoeffs
-    {
-        fieldData            // field data - usage for multiple fields
+        <Type>ExplicitSetValueCoeffs
         {
-            k   30.7;
-            epsilon  1.5;
+            fieldData
+            {
+                k           30.7;
+                epsilon     1.5;
+            }
         }
-    }
+
 
 SourceFiles
     explicitSetValue.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef explicitSetValue_H
-#define explicitSetValue_H
+#ifndef ExplicitSetValue_H
+#define ExplicitSetValue_H
 
-#include "cellSet.H"
-#include "volFieldsFwd.H"
-#include "DimensionedField.H"
 #include "basicSource.H"
+#include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -60,37 +59,20 @@ namespace Foam
                        Class explicitSetValue Declaration
 \*---------------------------------------------------------------------------*/
 
-class explicitSetValue
+template<class Type>
+class ExplicitSetValue
 :
     public basicSource
 {
-    // Private data
-
-        //- List of field types
-        HashTable<scalar> scalarFields_;
-        HashTable<vector> vectorFields_;
-
-        //- Set value to field
-        template<class Type>
-        void setFieldValue(fvMatrix<Type>&, const Type&) const;
-
-        //- Add field names and values to field table for types.
-        template<class Type>
-        void addField
-        (
-            HashTable<Type>& fields,
-            const wordList& fieldTypes,
-            const wordList& fieldNames,
-            const dictionary& dict
-        );
-
 
 protected:
 
     // Protected data
 
-        //- Coefficients dictionary
-        dictionary coeffs_;
+        typedef Tuple2<word, Type> fieldNameValuePair;
+
+        //- Source value per field
+        List<fieldNameValuePair> fieldData_;
 
 
     // Protected functions
@@ -108,7 +90,7 @@ public:
     // Constructors
 
         //- Construct from components
-        explicitSetValue
+        ExplicitSetValue
         (
             const word& name,
             const word& modelType,
@@ -116,30 +98,19 @@ public:
             const fvMesh& mesh
         );
 
-        //- Return clone
-        autoPtr<explicitSetValue> clone() const
-        {
-            notImplemented("autoPtr<explicitSetValue> clone() const");
-            return autoPtr<explicitSetValue>(NULL);
-        }
-
 
     // Member Functions
 
+        // Check
 
-        // Edit
-
-            //- Return points
-            inline  const List<point>& points() const;
+            //- Return index of field name if found in fieldNames list
+            virtual label applyToField(const word& fieldName) const;
 
 
         // Evaluation
 
             //- Set value on vector field
-            virtual void setValue(fvMatrix<vector>& UEqn);
-
-            //- Set value on scalar field
-            virtual void setValue(fvMatrix<scalar>& UEqn);
+            virtual void setValue(fvMatrix<Type>& eqn, const label fieldI);
 
 
         // I-O
@@ -147,15 +118,8 @@ public:
             //- Write the source properties
             virtual void writeData(Ostream&) const;
 
-            //- Read fieldData in sub-dictionary
+            //- Read source dictionary
             virtual bool read(const dictionary& dict);
-
-            //- Ostream operator
-            friend Ostream& operator<<
-            (
-                Ostream& os,
-                const explicitSetValue& source
-            );
 };
 
 
@@ -165,13 +129,9 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "explicitSetValueIO.C"
-#include "explicitSetValueI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #ifdef NoRepository
-#   include "explicitSetValueTemplates.C"
+#   include "ExplicitSetValue.C"
+#   include "ExplicitSetValueIO.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValueIO.C
similarity index 79%
rename from src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C
rename to src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValueIO.C
index f97ad32906..7fd1d45592 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/ExplicitSetValueIO.C
@@ -23,22 +23,23 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "explicitSource.H"
+#include "ExplicitSetValue.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::explicitSource::writeData(Ostream& os) const
+template<class Type>
+void Foam::ExplicitSetValue<Type>::writeData(Ostream& os) const
 {
     os  << indent << name_ << endl;
     dict_.write(os);
 }
 
 
-bool Foam::explicitSource::read(const dictionary& dict)
+template<class Type>
+bool Foam::ExplicitSetValue<Type>::read(const dictionary& dict)
 {
     if (basicSource::read(dict))
     {
-        coeffs_ = dict.subDict(typeName + "Coeffs");
         setFieldData(coeffs_.subDict("fieldData"));
         return true;
     }
@@ -49,13 +50,4 @@ bool Foam::explicitSource::read(const dictionary& dict)
 }
 
 
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-Foam::Ostream& Foam::operator<<(Ostream& os, const explicitSource& source)
-{
-    source.writeData(os);
-    return os;
-}
-
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValue.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValue.C
index 898f2c41c3..78bb54bcb3 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValue.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValue.C
@@ -23,92 +23,18 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "explicitSetValue.H"
-#include "fvMesh.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "HashSet.H"
+#include "makeBasicSource.H"
+#include "ExplicitSetValue.H"
 
-// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineTypeNameAndDebug(explicitSetValue, 0);
-    addToRunTimeSelectionTable
-    (
-        basicSource,
-        explicitSetValue,
-        dictionary
-    );
-}
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-void Foam::explicitSetValue::setFieldData(const dictionary& dict)
-{
-    scalarFields_.clear();
-    vectorFields_.clear();
-
-    wordList fieldTypes(dict.toc().size());
-    wordList fieldNames(dict.toc().size());
-
-    forAll(dict.toc(), i)
-    {
-        const word& fieldName = dict.toc()[i];
-        IOobject io
-        (
-            fieldName,
-            this->mesh().time().timeName(),
-            this->mesh(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        );
-        if (io.headerOk())
-        {
-            fieldTypes[i] = io.headerClassName();
-            fieldNames[i] = dict.toc()[i];
-        }
-        else
-        {
-            FatalErrorIn("explicitSetValue::setFieldData")
-                << "header not OK for field " << io.name()
-                << abort(FatalError);
-        }
-    }
-
-    addField(scalarFields_, fieldTypes, fieldNames, dict);
-    addField(vectorFields_, fieldTypes, fieldNames, dict);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::explicitSetValue::explicitSetValue
-(
-    const word& name,
-    const word& modelType,
-    const dictionary& dict,
-    const fvMesh& mesh
-)
-:
-    basicSource(name, modelType, dict, mesh),
-    coeffs_(dict.subDict(modelType + "Coeffs"))
-{
-    setFieldData(coeffs_.subDict("fieldData"));
-}
-
-
-void Foam::explicitSetValue::setValue(fvMatrix<scalar>& Eqn)
-{
-    setFieldValue(Eqn, scalarFields_[Eqn.psi().name()]);
-}
-
-
-void Foam::explicitSetValue::setValue(fvMatrix<vector>& Eqn)
-{
-    setFieldValue(Eqn, vectorFields_[Eqn.psi().name()]);
+    makeBasicSource(ExplicitSetValue, scalar);
+    makeBasicSource(ExplicitSetValue, vector);
+    makeBasicSource(ExplicitSetValue, sphericalTensor);
+    makeBasicSource(ExplicitSetValue, symmTensor);
+    makeBasicSource(ExplicitSetValue, tensor);
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValueTemplates.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValueTemplates.C
deleted file mode 100644
index f67c318343..0000000000
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValueTemplates.C
+++ /dev/null
@@ -1,105 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-template <class Type>
-void Foam::explicitSetValue::setFieldValue
-(
-    fvMatrix<Type>& Eqn,
-    const Type& value
-) const
-{
-    Type data = value;
-
-    DimensionedField<Type, volMesh> rhs
-    (
-        IOobject
-        (
-            "rhs",
-            Eqn.psi().mesh().time().timeName(),
-            Eqn.psi().mesh(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        Eqn.psi().mesh(),
-        dimensioned<Type>
-        (
-            "zero",
-            dimless,
-            pTraits<Type>::zero
-        )
-    );
-
-    List<Type> values(this->cells().size());
-
-    forAll (values, i)
-    {
-        values[i] = data;
-    }
-
-    Eqn.setValues(this->cells(), values);
-}
-
-
-template <class Type>
-void Foam::explicitSetValue::addField
-(
-    HashTable<Type>& fields,
-    const wordList& fieldTypes,
-    const wordList& fieldNames,
-    const dictionary& fieldDataDict
-)
-{
-    typedef GeometricField<Type, fvPatchField, volMesh> geometricField;
-
-    forAll (fieldTypes, fieldI)
-    {
-        word fieldName = fieldNames[fieldI];
-        word fieldType = fieldTypes[fieldI];
-
-        if
-        (
-            (
-                fieldType
-             == GeometricField<Type, fvPatchField, volMesh>::typeName
-            ) &&
-            (
-                this->mesh().foundObject<geometricField>(fieldName)
-            )
-        )
-        {
-            Type fieldValue = fieldDataDict.lookupOrDefault<Type>
-            (
-                fieldName,
-                pTraits<Type>::zero
-            );
-
-            fields.insert(fieldName, fieldValue);
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.C
new file mode 100644
index 0000000000..1e9c15fbc7
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.C
@@ -0,0 +1,190 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "ExplicitSource.H"
+#include "fvMesh.H"
+#include "fvMatrices.H"
+#include "DimensionedField.H"
+
+// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
+
+template<class Type>
+const Foam::wordList Foam::ExplicitSource<Type>::
+volumeModeTypeNames_
+(
+    IStringStream("(absolute specific)")()
+);
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+typename Foam::ExplicitSource<Type>::volumeModeType
+Foam::ExplicitSource<Type>::wordToVolumeModeType
+(
+    const word& vmtName
+) const
+{
+    forAll(volumeModeTypeNames_, i)
+    {
+        if (vmtName == volumeModeTypeNames_[i])
+        {
+            return volumeModeType(i);
+        }
+    }
+
+    FatalErrorIn
+    (
+        "ExplicitSource<Type>::volumeModeType"
+        "ExplicitSource<Type>::wordToVolumeModeType(const word&)"
+    )   << "Unknown volumeMode type " << vmtName
+        << ". Valid volumeMode types are:" << nl << volumeModeTypeNames_
+        << exit(FatalError);
+
+    return volumeModeType(0);
+}
+
+
+template<class Type>
+Foam::word Foam::ExplicitSource<Type>::volumeModeTypeToWord
+(
+    const volumeModeType& vmtType
+) const
+{
+    if (vmtType > volumeModeTypeNames_.size())
+    {
+        return "UNKNOWN";
+    }
+    else
+    {
+        return volumeModeTypeNames_[vmtType];
+    }
+}
+
+
+template<class Type>
+void Foam::ExplicitSource<Type>::setFieldData(const dictionary& dict)
+{
+    fieldData_.setSize(dict.toc().size());
+
+    label i = 0;
+    forAllConstIter(dictionary, dict, iter)
+    {
+        fieldData_[i].first() = iter().keyword();
+        dict.lookup(iter().keyword()) >> fieldData_[i].second();
+        i++;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::ExplicitSource<Type>::ExplicitSource
+(
+    const word& name,
+    const word& modelType,
+    const dictionary& coeffs,
+    const fvMesh& mesh
+)
+:
+    basicSource(name, modelType, coeffs, mesh),
+    volumeMode_(wordToVolumeModeType(coeffs_.lookup("volumeMode"))),
+    VDash_(1.0),
+    fieldData_()
+{
+    setFieldData(coeffs_.subDict("fieldData"));
+
+    // Set volume normalisation
+    if (volumeMode_ == vmAbsolute)
+    {
+        VDash_ = V_;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::label Foam::ExplicitSource<Type>::applyToField
+(
+    const word& fieldName
+) const
+{
+    forAll(fieldData_, i)
+    {
+        if (fieldData_[i].first() == fieldName)
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+
+template<class Type>
+void Foam::ExplicitSource<Type>::addSup
+(
+    fvMatrix<Type>& eqn,
+    const label fieldI
+)
+{
+    if (debug)
+    {
+        Info<< "ExplicitSource<"<< pTraits<Type>::typeName
+            << ">::addSup for source " << name_ << endl;
+    }
+
+    DimensionedField<Type, volMesh> Su
+    (
+        IOobject
+        (
+            name_ + fieldData_[fieldI].first() + "Sup",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensioned<Type>
+        (
+            "zero",
+            eqn.dimensions()/dimVolume,
+            pTraits<Type>::zero
+        ),
+        false
+    );
+
+    forAll(cells_, i)
+    {
+        Su[cells_[i]] = fieldData_[fieldI].second()/VDash_;
+    }
+
+    eqn -= Su;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.H
similarity index 58%
rename from src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.H
rename to src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.H
index 05c3782254..5c1d3daa2f 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSource.H
@@ -22,39 +22,37 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::explicitSource
+    Foam::ExplicitSource
 
 Description
-    Explicit source.
+    Explicit source
 
     Sources described by:
 
-    explicitSourceCoeffs
-    {
-        points            // list of points when selectionMode = points
-        (
-            (-0.088 0.007 -0.02)
-            (-0.028 0.007 -0.02)
-        );
-        volumeMode          specific;  //absolute
-        fieldData            // field data - usage for multiple fields
+        <Type>ExplicitSourceCoeffs
         {
-            k   30.7;
-            epsilon  1.5;
+            volumeMode      absolute; // specific
+            fieldData
+            {
+                k           30.7;
+                epsilon     1.5;
+            }
         }
-    }
+
+    If volumeMode = 
+        - absolute: values are given as <quantity>
+        - specific: values are given as <quantity>/m3
+
 
 SourceFiles
-    explicitSource.C
+    ExplicitSource.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef explicitSource_H
-#define explicitSource_H
+#ifndef ExplicitSource_H
+#define ExplicitSource_H
 
-#include "cellSet.H"
-#include "volFieldsFwd.H"
-#include "DimensionedField.H"
+#include "Tuple2.H"
 #include "basicSource.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -62,35 +60,31 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of classes
+
+class fvMesh;
+
+template<class Type>
+class ExplicitSource;
+
+// Forward declaration of friend functions
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const ExplicitSource<Type>&
+);
+
 /*---------------------------------------------------------------------------*\
-                       Class explicitSource Declaration
+                      Class ExplicitSource Declaration
 \*---------------------------------------------------------------------------*/
 
-class explicitSource
+template<class Type>
+class ExplicitSource
 :
     public basicSource
 {
-    // Private data
-
-        //- List of field types
-        HashTable<scalar> scalarFields_;
-        HashTable<vector> vectorFields_;
-
-        //- Add source to matrix
-        template<class Type>
-        void addSource(fvMatrix<Type>&, const Type&) const;
-
-        //- Add field names and values to field table for types.
-        template<class Type>
-        void addField
-        (
-            HashTable<Type>& fields,
-            const wordList& fieldTypes,
-            const wordList& fieldNames,
-            const dictionary& dict
-        );
-
-
 public:
 
     // Public data
@@ -103,22 +97,33 @@ public:
         };
 
         //- Word list of volume mode type names
-        static const NamedEnum<volumeModeType, 2> volumeModeTypeNames_;
+        static const wordList volumeModeTypeNames_;
 
 
 protected:
 
     // Protected data
 
-        //- Coefficients dictionary
-        dictionary coeffs_;
+        typedef Tuple2<word, Type> fieldNameValuePair;
 
         //- Volume mode
         volumeModeType volumeMode_;
 
+        //- Volume normalisation
+        scalar VDash_;
+
+        //- Source value per field
+        List<fieldNameValuePair> fieldData_;
+
 
     // Protected functions
 
+        //- Helper function to convert from a word to a volumeModeType
+        volumeModeType wordToVolumeModeType(const word& vtName) const;
+
+        //- Helper function to convert from a volumeModeType to a word
+        word volumeModeTypeToWord(const volumeModeType& vtType) const;
+
         //- Set the local field data
         void setFieldData(const dictionary& dict);
 
@@ -126,13 +131,13 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("explicitSource");
+    TypeName("ExplicitSource");
 
 
     // Constructors
 
         //- Construct from components
-        explicitSource
+        ExplicitSource
         (
             const word& name,
             const word& modelType,
@@ -140,42 +145,37 @@ public:
             const fvMesh& mesh
         );
 
-        //- Return clone
-        autoPtr<explicitSource> clone() const
-        {
-            notImplemented
-            (
-                "autoPtr<explicitSource> clone() const"
-            );
-            return autoPtr<explicitSource>(NULL);
-        }
-
-
 
     // Member Functions
 
+        // Check
+
+            //- Return index of field name if found in fieldNames list
+            virtual label applyToField(const word& fieldName) const;
+
+
         // Access
 
             //- Return const access to the volume mode
             inline const volumeModeType& volumeMode() const;
 
+            //- Return const access to the source field value
+            inline const Type& fieldData() const;
+
 
         // Edit
 
             //- Return access to the volume mode
             inline volumeModeType& volumeMode();
 
-            //- Return points
-            inline  const List<point>& points() const;
+            //- Return access to the source field value
+            inline Type& fieldData();
 
 
         // Evaluation
 
-            //-Source term to fvMatrix<vector>
-            virtual void addSu(fvMatrix<vector>& UEqn);
-
-            //-Source term to fvMatrix<scalar>
-            virtual void addSu(fvMatrix<scalar>& UEqn);
+            //- Add explicit contribution to equation
+            virtual void addSup(fvMatrix<Type>& eqn, const label fieldI);
 
 
         // I-O
@@ -183,15 +183,8 @@ public:
             //- Write the source properties
             virtual void writeData(Ostream&) const;
 
-            //- Read fieldData in sub-dictionary
+            //- Read source dictionary
             virtual bool read(const dictionary& dict);
-
-            //- Ostream operator
-            friend Ostream& operator<<
-            (
-                Ostream& os,
-                const explicitSource& source
-            );
 };
 
 
@@ -201,14 +194,14 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "explicitSourceIO.C"
-#include "explicitSourceI.H"
+#ifdef NoRepository
+#   include "ExplicitSource.C"
+#   include "ExplicitSourceIO.C"
+#endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-#   include "explicitSourceTemplates.C"
-#endif
+#include "ExplicitSourceI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValueI.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceI.H
similarity index 70%
rename from src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValueI.H
rename to src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceI.H
index 35aa075140..0cb38f2a53 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSetValue/explicitSetValueI.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceI.H
@@ -23,14 +23,37 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "explicitSetValue.H"
+#include "ExplicitSource.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline const Foam::List<Foam::point>&
-Foam::explicitSetValue::points() const
+template<class Type>
+inline const typename Foam::ExplicitSource<Type>::volumeModeType&
+Foam::ExplicitSource<Type>::volumeMode() const
 {
-    return points_;
+    return volumeMode_;
+}
+
+
+template<class Type>
+inline const Type& Foam::ExplicitSource<Type>::fieldData() const
+{
+    return fieldData_;
+}
+
+
+template<class Type>
+inline typename Foam::ExplicitSource<Type>::volumeModeType&
+Foam::ExplicitSource<Type>::volumeMode()
+{
+    return volumeMode_;
+}
+
+
+template<class Type>
+inline Type& Foam::ExplicitSource<Type>::fieldData()
+{
+    return fieldData_;
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceI.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceIO.C
similarity index 76%
rename from src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceI.H
rename to src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceIO.C
index 8bc5a62628..1b651bbd49 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceI.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/ExplicitSourceIO.C
@@ -23,28 +23,29 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "explicitSource.H"
+#include "ExplicitSource.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline const Foam::explicitSource::volumeModeType&
-Foam::explicitSource::volumeMode() const
+template<class Type>
+void Foam::ExplicitSource<Type>::writeData(Ostream& os) const
 {
-    return volumeMode_;
+    notImplemented
+    (
+        "void Foam::ExplicitSource<Type>::read(Ostream&) const"
+    );
 }
 
 
-inline Foam::explicitSource::volumeModeType&
-Foam::explicitSource::volumeMode()
+template<class Type>
+bool Foam::ExplicitSource<Type>::read(const dictionary& dict)
 {
-    return volumeMode_;
-}
+    notImplemented
+    (
+        "bool Foam::ExplicitSource<Type>::read(const dictionary&)"
+    );
 
-
-inline const Foam::List<Foam::point>&
-Foam::explicitSource::points() const
-{
-    return points_;
+    return false;
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.C
index af5555f3fb..338a422059 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.C
@@ -23,111 +23,18 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "explicitSource.H"
-#include "fvMesh.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-#include "HashSet.H"
+#include "makeBasicSource.H"
+#include "ExplicitSource.H"
 
-// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineTypeNameAndDebug(explicitSource, 0);
-    addToRunTimeSelectionTable
-    (
-        basicSource,
-        explicitSource,
-        dictionary
-    );
-
-
-    // * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
-
-    template<> const char* NamedEnum
-    <
-        explicitSource::volumeModeType,
-        2
-        >::names[] =
-    {
-        "absolute",
-        "specific"
-    };
-
-    const NamedEnum<explicitSource::volumeModeType, 2>
-        explicitSource::volumeModeTypeNames_;
-}
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-void Foam::explicitSource::setFieldData(const dictionary& dict)
-{
-    scalarFields_.clear();
-    vectorFields_.clear();
-
-    wordList fieldTypes(dict.toc().size());
-    wordList fieldNames(dict.toc().size());
-
-    forAll(dict.toc(), i)
-    {
-        const word& fieldName = dict.toc()[i];
-        IOobject io
-        (
-            fieldName,
-            this->mesh().time().timeName(),
-            this->mesh(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        );
-        if (io.headerOk())
-        {
-            fieldTypes[i] = io.headerClassName();
-            fieldNames[i] = dict.toc()[i];
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "explicitSource::setFieldData"
-            )   << "header not OK " << io.name()
-                << exit(FatalError);
-        }
-    }
-
-    addField(scalarFields_, fieldTypes, fieldNames, dict);
-    addField(vectorFields_, fieldTypes, fieldNames, dict);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::explicitSource::explicitSource
-(
-    const word& name,
-    const word& modelType,
-    const dictionary& dict,
-    const fvMesh& mesh
-)
-:
-    basicSource(name, modelType, dict, mesh),
-    coeffs_(dict.subDict(modelType + "Coeffs")),
-    volumeMode_(volumeModeTypeNames_.read(coeffs_.lookup("volumeMode")))
-{
-    setFieldData(dict_.subDict("fieldData"));
-}
-
-
-void Foam::explicitSource::addSu(fvMatrix<scalar>& Eqn)
-{
-    addSource(Eqn, scalarFields_[Eqn.psi().name()]);
-}
-
-
-void Foam::explicitSource::addSu(fvMatrix<vector>& Eqn)
-{
-    addSource(Eqn, vectorFields_[Eqn.psi().name()]);
+    makeBasicSource(ExplicitSource, scalar);
+    makeBasicSource(ExplicitSource, vector);
+    makeBasicSource(ExplicitSource, sphericalTensor);
+    makeBasicSource(ExplicitSource, symmTensor);
+    makeBasicSource(ExplicitSource, tensor);
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceTemplates.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceTemplates.C
deleted file mode 100644
index 92b94c3b16..0000000000
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceTemplates.C
+++ /dev/null
@@ -1,104 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-template <class Type>
-void Foam::explicitSource::addSource
-(
-    fvMatrix<Type>& Eqn,
-    const Type& sourceData
-) const
-{
-    Type data = sourceData;
-    if (volumeMode_ == vmAbsolute)
-    {
-        // Convert to specific quantity
-        data /= V_;
-    }
-
-    DimensionedField<Type, volMesh> rhs
-    (
-        IOobject
-        (
-            "rhs",
-            Eqn.psi().mesh().time().timeName(),
-            Eqn.psi().mesh(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        Eqn.psi().mesh(),
-        dimensioned<Type>
-        (
-            "zero",
-            Eqn.dimensions()/dimVolume,
-            pTraits<Type>::zero
-        )
-    );
-    UIndirectList<Type>(rhs, this->cells()) = data;
-
-    Eqn -= rhs;
-}
-
-
-template <class Type>
-void Foam::explicitSource::addField
-(
-    HashTable<Type>& fields,
-    const wordList& fieldTypes,
-    const wordList& fieldNames,
-    const dictionary& fieldDataDict
-)
-{
-    typedef GeometricField<Type, fvPatchField, volMesh> geometricField;
-
-    forAll (fieldTypes, fieldI)
-    {
-        word fieldName = fieldNames[fieldI];
-        word fieldType = fieldTypes[fieldI];
-
-        if
-        (
-            (
-                fieldType
-             == GeometricField<Type, fvPatchField, volMesh>::typeName
-            ) &&
-            (
-                this->mesh().foundObject<geometricField>(fieldName)
-            )
-        )
-        {
-            Type fieldValue = fieldDataDict.lookupOrDefault<Type>
-            (
-                fieldName,
-                pTraits<Type>::zero
-            );
-
-            fields.insert(fieldName, fieldValue);
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C
similarity index 59%
rename from src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.C
rename to src/finiteVolume/cfdTools/general/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C
index d2c9912eff..79f2751e7b 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C
@@ -24,8 +24,25 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "pressureGradientExplicitSource.H"
-#include "volFields.H"
+#include "fvMatrices.H"
+#include "DimensionedField.H"
 #include "IFstream.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(pressureGradientExplicitSource, 0);
+
+    addToRunTimeSelectionTable
+    (
+        basicSource,
+        pressureGradientExplicitSource,
+        dictionary
+    );
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -38,7 +55,7 @@ void Foam::pressureGradientExplicitSource::writeGradP() const
         (
             IOobject
             (
-                sourceName_ + "Properties",
+                name_ + "Properties",
                 mesh_.time().timeName(),
                 "uniform",
                 mesh_,
@@ -52,65 +69,77 @@ void Foam::pressureGradientExplicitSource::writeGradP() const
 }
 
 
+void Foam::pressureGradientExplicitSource::update()
+{
+    volVectorField& U = const_cast<volVectorField&>
+    (
+        mesh_.lookupObject<volVectorField>(UName_)
+    );
+
+    const volScalarField& rAU =
+        mesh_.lookupObject<volScalarField>("(1|A(" + UName_ + "))");
+
+    // Integrate flow variables over cell set
+    scalar magUbarAve = 0.0;
+    scalar rAUave = 0.0;
+    const scalarField& cv = mesh_.V();
+    forAll(cells_, i)
+    {
+        label cellI = cells_[i];
+        scalar volCell = cv[cellI];
+        magUbarAve += (flowDir_ & U[cellI])*volCell;
+        rAUave += rAU[cellI]*volCell;
+    }
+
+    // Collect across all processors
+    reduce(magUbarAve, sumOp<scalar>());
+
+    // Volume averages
+    magUbarAve /= V_;
+    rAUave /= V_;
+
+    // Calculate the pressure gradient increment needed to adjust the average
+    // flow-rate to the desired value
+    scalar gradPplus = (mag(Ubar_) - magUbarAve)/rAUave;
+
+    // Apply correction to velocity field
+    forAll(cells_, i)
+    {
+        label cellI = cells_[i];
+        U[cellI] += flowDir_*rAU[cellI]*gradPplus;
+    }
+
+    // Update pressure gradient
+    gradP_.value() += gradPplus;
+
+    Info<< "Uncorrected Ubar = " << magUbarAve << tab
+        << "Pressure gradient = " << gradP_.value() << endl;
+
+    writeGradP();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::pressureGradientExplicitSource::pressureGradientExplicitSource
 (
     const word& sourceName,
-    volVectorField& U
+    const word& modelType,
+    const dictionary& dict,
+    const fvMesh& mesh    
 )
 :
-    sourceName_(sourceName),
-    mesh_(U.mesh()),
-    U_(U),
-    dict_
-    (
-        IOobject
-        (
-            sourceName + "Properties",
-            mesh_.time().constant(),
-            mesh_,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    ),
-    Ubar_(dict_.lookup("Ubar")),
-    gradPini_(dict_.lookup("gradPini")),
+    basicSource(sourceName, modelType, dict, mesh),
+    UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
+    Ubar_(coeffs_.lookup("Ubar")),
+    gradPini_(coeffs_.lookup("gradPini")),
     gradP_(gradPini_),
-    flowDir_(Ubar_/mag(Ubar_)),
-    cellSource_(dict_.lookup("cellSource")),
-    cellSelector_
-    (
-        topoSetSource::New
-        (
-            cellSource_,
-            mesh_,
-            dict_.subDict(cellSource_ + "Coeffs")
-        )
-    ),
-    selectedCellSet_
-    (
-        mesh_,
-        sourceName_ + "CellSet",
-        mesh_.nCells()/10 + 1  // Reasonable size estimate.
-    )
+    flowDir_(Ubar_/mag(Ubar_))
 {
-    // Create the cell set
-    cellSelector_->applyToSet
-    (
-        topoSetSource::NEW,
-        selectedCellSet_
-    );
-
-    // Give some feedback
-    Info<< "    Selected "
-        << returnReduce(selectedCellSet_.size(), sumOp<label>())
-        << " cells" << endl;
-
     // Read the initial pressure gradient from file if it exists
     IFstream propsFile
     (
-        mesh_.time().timeName()/"uniform"/(sourceName_ + "Properties")
+        mesh_.time().timeName()/"uniform"/(name_ + "Properties")
     );
 
     if (propsFile.good())
@@ -126,86 +155,47 @@ Foam::pressureGradientExplicitSource::pressureGradientExplicitSource
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh> >
-Foam::pressureGradientExplicitSource::Su() const
+Foam::label Foam::pressureGradientExplicitSource::applyToField
+(
+    const word& fieldName
+) const
 {
-    tmp<DimensionedField<vector, volMesh> > tSource
-    (
-        new DimensionedField<vector, volMesh>
-        (
-            IOobject
-            (
-                sourceName_,
-                mesh_.time().timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh_,
-            dimensionedVector("zero", gradP_.dimensions(), vector::zero)
-        )
-    );
-
-    DimensionedField<vector, volMesh>& sourceField = tSource();
-
-    forAllConstIter(cellSet, selectedCellSet_, iter)
+    if (fieldName == UName_)
     {
-        label cellI = iter.key();
-
-        sourceField[cellI] = flowDir_*gradP_.value();
+        return 0;
+    }
+    else
+    {
+        return -1;
     }
-
-    return tSource;
 }
 
 
-void Foam::pressureGradientExplicitSource::update()
+void Foam::pressureGradientExplicitSource::addSup
+(
+    fvMatrix<vector>& eqn,
+    const label
+)
 {
-    const volScalarField& rAU =
-        mesh_.lookupObject<volScalarField>("(1|A(" + U_.name() + "))");
+    update();
 
-    // Integrate flow variables over cell set
-    scalar volTot = 0.0;
-    scalar magUbarAve = 0.0;
-    scalar rAUave = 0.0;
-    forAllConstIter(cellSet, selectedCellSet_, iter)
-    {
-        label cellI = iter.key();
+    DimensionedField<vector, volMesh> Su
+    (
+        IOobject
+        (
+            name_ + UName_ + "Sup",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensionedVector("zero", gradP_.dimensions(), vector::zero)
+    );
 
-        scalar volCell = mesh_.V()[cellI];
-        volTot += volCell;
+    UIndirectList<vector>(Su, cells_) = flowDir_*gradP_.value();
 
-        magUbarAve += (flowDir_ & U_[cellI])*volCell;
-        rAUave += rAU[cellI]*volCell;
-    }
-
-    // Collect across all processors
-    reduce(volTot, sumOp<scalar>());
-    reduce(magUbarAve, sumOp<scalar>());
-    reduce(rAUave, sumOp<scalar>());
-
-    // Volume averages
-    magUbarAve /= volTot;
-    rAUave /= volTot;
-
-    // Calculate the pressure gradient increment needed to adjust the average
-    // flow-rate to the desired value
-    scalar gradPplus = (mag(Ubar_) - magUbarAve)/rAUave;
-
-    // Apply correction to velocity field
-    forAllConstIter(cellSet, selectedCellSet_, iter)
-    {
-        label cellI = iter.key();
-        U_[cellI] += flowDir_*rAU[cellI]*gradPplus;
-    }
-
-    // Update pressure gradient
-    gradP_.value() += gradPplus;
-
-    Info<< "Uncorrected Ubar = " << magUbarAve << tab
-        << "Pressure gradient = " << gradP_.value() << endl;
-
-    writeGradP();
+    eqn -= Su;
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.H
similarity index 71%
rename from src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.H
rename to src/finiteVolume/cfdTools/general/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.H
index b4cf73e338..9c3732da49 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.H
@@ -25,10 +25,21 @@ Class
     Foam::pressureGradientExplicitSource
 
 Description
-    Creates a cell set pressure gradient source
+    Creates a pressure gradient source
 
     Note: Currently only handles kinematic pressure
 
+    Sources described by:
+
+        pressureGradientExplicitSourceCoeffs
+        {
+            UName       U;          // name of velocity field
+            Ubar        (10.0 0 0); // desired average velocity
+            gradPini    gradPini [0 2 -2 0 0] 0; // initial pressure gradient
+            flowDir     (1 0 0);    // flow direction
+        }
+        
+
 SourceFiles
     pressureGradientExplicitSource.C
 
@@ -42,6 +53,7 @@ SourceFiles
 #include "cellSet.H"
 #include "fvMesh.H"
 #include "volFields.H"
+#include "basicSource.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,24 +61,17 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-              Class pressureGradientExplicitSource Declaration
+               Class pressureGradientExplicitSource Declaration
 \*---------------------------------------------------------------------------*/
 
 class pressureGradientExplicitSource
+:
+    public basicSource
 {
     // Private data
 
-        //- Name of the source
-        const word sourceName_;
-
-        //- Reference to the mesh
-        const fvMesh& mesh_;
-
-        //- Reference to the velocity field
-        volVectorField& U_;
-
-        //- Properties dictionary
-        IOdictionary dict_;
+        //- Velocity field name
+        word UName_;
 
         //- Average velocity
         vector Ubar_;
@@ -80,21 +85,15 @@ class pressureGradientExplicitSource
         //- Flow direction
         vector flowDir_;
 
-        //- Name of cell source
-        word cellSource_;
-
-        //- The method by which the cells will be selected
-        autoPtr<topoSetSource> cellSelector_;
-
-        //- The set of selected cells
-        cellSet selectedCellSet_;
-
 
     // Private Member Functions
 
         //- Write the pressure gradient to file (for restarts etc)
         void writeGradP() const;
 
+        //- Correct driving force for a constant mass flow rate
+        void update();
+
         //- Disallow default bitwise copy construct
         pressureGradientExplicitSource(const pressureGradientExplicitSource&);
 
@@ -104,26 +103,43 @@ class pressureGradientExplicitSource
 
 public:
 
+    //- Runtime type information
+    TypeName("pressureGradientExplicitSource");
+
+
     // Constructors
 
         //- Construct from explicit source name and mesh
         pressureGradientExplicitSource
         (
             const word& sourceName,
-            volVectorField& U
+            const word& modelType,
+            const dictionary& dict,
+            const fvMesh& mesh
         );
 
 
     // Member Functions
 
+        // Checks
+
+            //- Return index of field name if found in fieldNames list
+            virtual label applyToField(const word& fieldName) const;
+
+
         // Access
 
-            //- Return a tmp field of the source
-            tmp<DimensionedField<vector, volMesh> > Su() const;
+            //- Add explicit contribution to equation
+            virtual void addSup(fvMatrix<vector>& eqn, const label fieldI);
 
 
-        //- Correct driving force for a constant mass flow rate
-        void update();
+        // I-O
+
+            //- Write the source properties
+            virtual void writeData(Ostream&) const;
+
+            //- Read source dictionary
+            virtual bool read(const dictionary& dict);
 };
 
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/timeActivatedExplicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
similarity index 69%
rename from src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/timeActivatedExplicitSource.C
rename to src/finiteVolume/cfdTools/general/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
index 54ee1b3744..b6d1b2d1cf 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/timeActivatedExplicitSource.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
@@ -23,22 +23,34 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "timeActivatedExplicitSource.H"
+#include "pressureGradientExplicitSource.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-namespace Foam
+void Foam::pressureGradientExplicitSource::writeData(Ostream& os) const
 {
-    defineTemplateTypeNameAndDebug
+    notImplemented
     (
-        IOPtrList<scalarTimeActivatedExplicitSource>,
-        0
-    );
-    defineTemplateTypeNameAndDebug
-    (
-        IOPtrList<vectorTimeActivatedExplicitSource>,
-         0
+        "void Foam::pressureGradientExplicitSource::writeData"
+        "("
+            "Ostream&"
+        ") const"
     );
 }
 
+
+bool Foam::pressureGradientExplicitSource::read(const dictionary& dict)
+{
+    notImplemented
+    (
+        "bool Foam::pressureGradientExplicitSource::read"
+        "("
+            "const dictionary&"
+        ") const"
+    );
+
+    return false;
+}
+
+
 // ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.C
index 0444a9408b..7019d3ae2d 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.C
@@ -53,30 +53,31 @@ Foam::radialActuationDiskSource::radialActuationDiskSource
 )
 :
     actuationDiskSource(name, modelType, dict, mesh),
-    coeffsDict_(dict.subDict(modelType + "Coeffs")),
-    coeffs_()
+    radialCoeffs_(coeffs_.lookup("coeffs"))
 {
-    coeffsDict_.lookup("coeffs") >> coeffs_;
-    Info<< "    - creating radial actuation disk zone: "
-        << this->name() << endl;
+    Info<< "    - creating radial actuation disk zone: " << name_ << endl;
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::radialActuationDiskSource::addSu(fvMatrix<vector>& UEqn)
+void Foam::radialActuationDiskSource::addSup
+(
+    fvMatrix<vector>& eqn,
+    const label
+)
 {
     bool compressible = false;
-    if (UEqn.dimensions() == dimensionSet(1, 1, -2, 0, 0))
+    if (eqn.dimensions() == dimForce)
     {
         compressible = true;
     }
 
-    const scalarField& cellsV = this->mesh().V();
-    vectorField& Usource = UEqn.source();
-    const vectorField& U = UEqn.psi();
+    const scalarField& cellsV = mesh_.V();
+    vectorField& Usource = eqn.source();
+    const vectorField& U = eqn.psi();
 
-    if (V() > VSMALL)
+    if (V_ > VSMALL)
     {
         if (compressible)
         {
@@ -85,7 +86,7 @@ void Foam::radialActuationDiskSource::addSu(fvMatrix<vector>& UEqn)
                 Usource,
                 cells_,
                 cellsV,
-                this->mesh().lookupObject<volScalarField>("rho"),
+                mesh_.lookupObject<volScalarField>("rho"),
                 U
             );
         }
@@ -114,12 +115,11 @@ bool Foam::radialActuationDiskSource::read(const dictionary& dict)
 {
     if (basicSource::read(dict))
     {
-        const dictionary& coeffsDict_ = dict.subDict(typeName + "Coeffs");
-        coeffsDict_.readIfPresent("diskDir", diskDir_);
-        coeffsDict_.readIfPresent("Cp", Cp_);
-        coeffsDict_.readIfPresent("Ct", Ct_);
-        coeffsDict_.readIfPresent("diskArea", diskArea_);
-        coeffsDict_.lookup("coeffs") >> coeffs_;
+        coeffs_.readIfPresent("diskDir", diskDir_);
+        coeffs_.readIfPresent("Cp", Cp_);
+        coeffs_.readIfPresent("Ct", Ct_);
+        coeffs_.readIfPresent("diskArea", diskArea_);
+        coeffs_.lookup("coeffs") >> radialCoeffs_;
         return true;
     }
     else
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.H
index 245f002fa5..4c464bcfd3 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.H
@@ -29,17 +29,31 @@ Description
     Actuation disk zone definition.
     Constant values for momentum source for actuation disk
 
-    T = 2*rho*A*sqr(Uo)*a*(1-a)
-    U1 = (1 -a)Uo
+        T = 2*rho*A*sqr(Uo)*a*(1-a)
+        U1 = (1 -a)Uo
+
     where:
-          A: disk area
-          Uo: upstream velocity
-          a: 1 - Cp/Ct
-          U1: velocity at the disk
+        A: disk area
+        Uo: upstream velocity
+        a: 1 - Cp/Ct
+        U1: velocity at the disk
 
 
     The thrust is distributed by a radial function:
-    thrust(r) = T*(C0 + C1*r^2 + C2*r^4)
+
+        thrust(r) = T*(C0 + C1*r^2 + C2*r^4)
+
+    Sources described by:
+
+        actuationDiskSourceCoeffs
+        {
+            fieldName       U;          // name of field to apply source
+            diskDir         (-1 0 0);   // disk direction
+            Cp              0.1;        // power coefficient
+            Ct              0.5;        // thrust coefficient
+            diskArea        5.0;        // disk area
+            coeffs          (0.1 0.5 0.01); // radial distribution coefficients
+        }
 
 
 SourceFiles
@@ -51,10 +65,8 @@ SourceFiles
 #ifndef radialActuationDiskSource_H
 #define radialActuationDiskSource_H
 
-#include "DimensionedField.H"
-#include "volFieldsFwd.H"
-#include "FixedList.H"
 #include "actuationDiskSource.H"
+#include "FixedList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -71,11 +83,8 @@ class radialActuationDiskSource
 {
     // Private data
 
-        //- Coefficients dictionary
-        dictionary coeffsDict_;
-
         //- Coeffcients for the radial distribution
-        FixedList<scalar, 3> coeffs_;
+        FixedList<scalar, 3> radialCoeffs_;
 
 
     // Private Member Functions
@@ -124,7 +133,7 @@ public:
         // Public Functions
 
             //- Source term to fvMatrix<vector>
-            virtual void addSu(fvMatrix<vector>& UEqn);
+            virtual void addSup(fvMatrix<vector>& eqn, const label fieldI);
 
 
         // I-O
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSourceTemplates.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
index 47ac4d0f40..fce5c0a170 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
@@ -61,24 +61,25 @@ addRadialActuationDiskAxialInertialResistance
     const scalar maxR = gMax(mag(zoneCellCentres - avgCentre));
 
     scalar intCoeffs =
-        coeffs_[0]
-      + coeffs_[1]*sqr(maxR)/2.0
-      + coeffs_[2]*pow4(maxR)/3.0;
+        radialCoeffs_[0]
+      + radialCoeffs_[1]*sqr(maxR)/2.0
+      + radialCoeffs_[2]*pow4(maxR)/3.0;
 
     forAll(cells, i)
     {
         T[i] = 2.0*rho[cells[i]]*diskArea_*mag(U[cells[i]])*a/(1.0 - a);
 
-        scalar r = mag(mesh().cellCentres()[cells[i]] - avgCentre);
+        scalar r2 = magSqr(mesh().cellCentres()[cells[i]] - avgCentre);
 
         Tr[i] =
-            T[i]*(coeffs_[0] + coeffs_[1]*sqr(r) + coeffs_[2]*pow4(r))
+            T[i]
+           *(radialCoeffs_[0] + radialCoeffs_[1]*r2 + radialCoeffs_[2]*sqr(r2))
            /intCoeffs;
     }
 
     forAll(cells, i)
     {
-        Usource[cells[i]] += ((Vcells[cells[i]]/V())*Tr[i]*E) & U[cells[i]];
+        Usource[cells[i]] += ((Vcells[cells[i]]/V_)*Tr[i]*E) & U[cells[i]];
     }
 
     if (debug)
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/profileModel/profileModelList.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/profileModel/profileModelList.H
index 74326dced4..0a6c125288 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/profileModel/profileModelList.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/profileModel/profileModelList.H
@@ -28,7 +28,7 @@ Description
     Base class for profile models
 
 SourceFiles
-    profileModel.C
+    profileModelList.C
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
index db4fd5d803..4e9dccd440 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
@@ -28,6 +28,7 @@ License
 #include "mathematicalConstants.H"
 #include "unitConversion.H"
 #include "geometricOneField.H"
+#include "fvMatrices.H"
 
 using namespace Foam::constant;
 
@@ -262,10 +263,8 @@ void Foam::rotorDiskSource::createCoordinateSystem()
         }
         default:
         {
-            FatalErrorIn
-            (
-                "rotorDiskSource::createCoordinateSystem(const geometryMode&);"
-            )   << "Unknown geometryMode " << geometryModeTypeNames_[gm]
+            FatalErrorIn("rotorDiskSource::createCoordinateSystem()")
+                << "Unknown geometryMode " << geometryModeTypeNames_[gm]
                 << ". Available geometry modes include "
                 << geometryModeTypeNames_ << exit(FatalError);
         }
@@ -369,7 +368,7 @@ Foam::rotorDiskSource::rotorDiskSource
 )
 :
     basicSource(name, modelType, dict, mesh),
-    coeffs_(dict_.subDict(type() + "Coeffs")),
+    fieldName_(coeffs_.lookup("fieldName")),
     rhoName_("none"),
     omega_(0.0),
     nBlades_(0),
@@ -399,20 +398,33 @@ Foam::rotorDiskSource::~rotorDiskSource()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::rotorDiskSource::addSu(fvMatrix<vector>& UEqn)
+Foam::label Foam::rotorDiskSource::applyToField(const word& fieldName) const
+{
+    if (fieldName == fieldName_)
+    {
+        return 0;
+    }
+    else
+    {
+        return -1;
+    }
+}
+
+
+void Foam::rotorDiskSource::addSup(fvMatrix<vector>& eqn)
 {
     // add source to lhs of eqn
 
-    const volVectorField& U = UEqn.psi();
+    const volVectorField& U = eqn.psi();
 
-    if (UEqn.dimensions() == dimForce)
+    if (eqn.dimensions() == dimForce)
     {
         coeffs_.lookup("rhoName") >> rhoName_;
 
         const volScalarField& rho =
             mesh_.lookupObject<volScalarField>(rhoName_);
 
-        UEqn += calculateForces
+        eqn += calculateForces
             (
                 rho.internalField(),
                 inflowVelocity(U),
@@ -421,7 +433,7 @@ void Foam::rotorDiskSource::addSu(fvMatrix<vector>& UEqn)
     }
     else
     {
-        UEqn += calculateForces
+        eqn += calculateForces
             (
                 oneField(),
                 inflowVelocity(U),
@@ -431,12 +443,6 @@ void Foam::rotorDiskSource::addSu(fvMatrix<vector>& UEqn)
 }
 
 
-void Foam::rotorDiskSource::addSu(fvMatrix<scalar>& UEqn)
-{
-    // do nothing
-}
-
-
 void Foam::rotorDiskSource::writeData(Ostream& os) const
 {
     os  << indent << name_ << endl;
@@ -448,8 +454,6 @@ bool Foam::rotorDiskSource::read(const dictionary& dict)
 {
     if (basicSource::read(dict))
     {
-        coeffs_ = dict.subDict(type() + "Coeffs");
-
         scalar rpm(readScalar(coeffs_.lookup("rpm")));
         omega_ = rpm/60.0*mathematical::twoPi;
 
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H
index 0d646b9899..dabdcfaee7 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H
@@ -25,11 +25,61 @@ Class
     Foam::rotorDiskSource
 
 Description
-    Cell-zone based momemtum source
+    Cell based momemtum source
 
     Source approximates the mean effects of rotor forces on a cylindrical
     region within the domain
 
+    Sources described by:
+
+        rotorDiskSourceCoeffs
+        {
+            fieldName       U;      // name of field on which to apply source
+            rhoName         rho;    // density field if compressible case
+            nBlades         3;      // number of blades
+            tip effect      0.96;   // normalised radius above which lift = 0
+
+            inletFlowType   local;  // inlet flow type specification
+
+            geometryMode    auto;   // geometry specification
+
+            refDirection    (-1 0 0); // reference direction
+
+            flapCoeffs
+            {
+                beta0           0;  // coning angle [deg]
+                beta1           0;  // lateral flapping coeff
+                beta2           0;  // longitudinal flapping coeff
+            }
+            trimCoeffs
+            {
+                alphac          15; // collective pitch angle [deg]
+                A               0;  // lateral cyclic coeff
+                B               0;  // longitudinal cyclic coeff
+            }
+            blade
+            {
+                ...
+            }
+            profiles
+            {
+                ...
+            }
+        }
+
+    Where:
+
+        geometryMode =
+            auto          : determine rototor co-ord system from cells
+            specified     : specified co-ord system
+
+        inletFlowType =
+            fixed         : specified velocity
+            surfaceNormal : specified normal velocity (positive towards rotor)
+            local         : use local flow conditions
+
+
+
 SourceFiles
     rotorDiskSource.C
     rotorDiskSourceTemplates.C
@@ -44,6 +94,8 @@ SourceFiles
 #include "NamedEnum.H"
 #include "bladeModel.H"
 #include "profileModelList.H"
+#include "volFieldsFwd.H"
+#include "dimensionSet.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -97,8 +149,8 @@ protected:
 
     // Protected data
 
-        //- Coefficients dictionary
-        dictionary coeffs_;
+        //- Name of field on which to apply the source
+        word fieldName_;
 
         //- Name of density field
         word rhoName_;
@@ -212,13 +264,16 @@ public:
     // Member Functions
 
 
+        // Checks
+
+            //- Return index of field name if found in fieldNames list
+            virtual label applyToField(const word& fieldName) const;
+
+
         // Source term addition
 
             //- Source term to fvMatrix<vector>
-            virtual void addSu(fvMatrix<vector>& UEqn);
-
-            //- Source term to fvMatrix<scalar>
-            virtual void addSu(fvMatrix<scalar>& UEqn);
+            virtual void addSup(fvMatrix<vector>& eqn);
 
 
         // I-O
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceTemplates.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceTemplates.C
index 5bc97c703f..4427ecec52 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceTemplates.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceTemplates.C
@@ -27,6 +27,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "mathematicalConstants.H"
 #include "unitConversion.H"
+#include "volFields.H"
 
 using namespace Foam::constant;
 
@@ -175,9 +176,9 @@ Foam::tmp<Foam::volVectorField> Foam::rotorDiskSource::calculateForces
             }
 
             // calculate forces
-            scalar pDyn = 0.5*rho[cellI]*sqr(magUc);
-            scalar f = pDyn*chord*nBlades_*area_[i]/(mathematical::twoPi);
-            vector localForce = vector(0.0, f*Cd, tipFactor*f*Cl);
+            const scalar pDyn = 0.5*rho[cellI]*sqr(magUc);
+            const scalar f = pDyn*chord*nBlades_*area_[i]/(mathematical::twoPi);
+            const vector localForce(0.0, f*Cd, tipFactor*f*Cl);
 
             // accumulate forces
             dragEff += localForce.y();
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.C
deleted file mode 100644
index cce9bc97ae..0000000000
--- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.C
+++ /dev/null
@@ -1,393 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "TimeActivatedExplicitSource.H"
-#include "fvMesh.H"
-#include "volFields.H"
-
-// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
-
-template<class Type>
-const Foam::wordList Foam::TimeActivatedExplicitSource<Type>::
-selectionModeTypeNames_
-(
-    IStringStream("(points cellSet cellZone all)")()
-);
-
-
-template<class Type>
-const Foam::wordList Foam::TimeActivatedExplicitSource<Type>::
-volumeModeTypeNames_
-(
-    IStringStream("(absolute specific)")()
-);
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-typename Foam::TimeActivatedExplicitSource<Type>::selectionModeType
-Foam::TimeActivatedExplicitSource<Type>::wordToSelectionModeType
-(
-    const word& smtName
-) const
-{
-    forAll(selectionModeTypeNames_, i)
-    {
-        if (smtName == selectionModeTypeNames_[i])
-        {
-            return selectionModeType(i);
-        }
-    }
-
-    FatalErrorIn
-    (
-        "TimeActivatedExplicitSource<Type>::selectionModeType"
-        "TimeActivatedExplicitSource<Type>::wordToSelectionModeType"
-        "("
-            "const word&"
-        ")"
-    )   << "Unknown selectionMode type " << smtName
-        << ". Valid selectionMode types are:" << nl << selectionModeTypeNames_
-        << exit(FatalError);
-
-    return selectionModeType(0);
-}
-
-
-template<class Type>
-typename Foam::TimeActivatedExplicitSource<Type>::volumeModeType
-Foam::TimeActivatedExplicitSource<Type>::wordToVolumeModeType
-(
-    const word& vmtName
-) const
-{
-    forAll(volumeModeTypeNames_, i)
-    {
-        if (vmtName == volumeModeTypeNames_[i])
-        {
-            return volumeModeType(i);
-        }
-    }
-
-    FatalErrorIn
-    (
-        "TimeActivatedExplicitSource<Type>::volumeModeType"
-        "TimeActivatedExplicitSource<Type>::wordToVolumeModeType(const word&)"
-    )   << "Unknown volumeMode type " << vmtName
-        << ". Valid volumeMode types are:" << nl << volumeModeTypeNames_
-        << exit(FatalError);
-
-    return volumeModeType(0);
-}
-
-
-template<class Type>
-Foam::word Foam::TimeActivatedExplicitSource<Type>::selectionModeTypeToWord
-(
-    const selectionModeType& smtType
-) const
-{
-    if (smtType > selectionModeTypeNames_.size())
-    {
-        return "UNKNOWN";
-    }
-    else
-    {
-        return selectionModeTypeNames_[smtType];
-    }
-}
-
-
-template<class Type>
-Foam::word Foam::TimeActivatedExplicitSource<Type>::volumeModeTypeToWord
-(
-    const volumeModeType& vmtType
-) const
-{
-    if (vmtType > volumeModeTypeNames_.size())
-    {
-        return "UNKNOWN";
-    }
-    else
-    {
-        return volumeModeTypeNames_[vmtType];
-    }
-}
-
-
-template<class Type>
-void Foam::TimeActivatedExplicitSource<Type>::setSelection
-(
-    const dictionary& dict
-)
-{
-    switch (selectionMode_)
-    {
-        case smPoints:
-        {
-            dict.lookup("points") >> points_;
-            break;
-        }
-        case smCellSet:
-        {
-            dict.lookup("cellSet") >> cellSetName_;
-            break;
-        }
-        case smCellZone:
-        {
-            dict.lookup("cellZone") >> cellSetName_;
-            break;
-        }
-        case smAll:
-        {
-            break;
-        }
-        default:
-        {
-            FatalErrorIn
-            (
-                "TimeActivatedExplicitSource::setSelection(const dictionary&)"
-            )   << "Unknown selectionMode "
-                << selectionModeTypeNames_[selectionMode_]
-                << ". Valid selectionMode types are" << selectionModeTypeNames_
-                << exit(FatalError);
-        }
-    }
-}
-
-
-template<class Type>
-void Foam::TimeActivatedExplicitSource<Type>::setFieldData
-(
-    const dictionary& dict,
-    const wordList& fieldNames
-)
-{
-    dict.lookup("fieldData") >> fieldData_;
-    labelList localFieldIds(fieldData_.size(), -1);
-    forAll(fieldNames, i)
-    {
-        forAll(fieldData_, j)
-        {
-            const word& fdName = fieldData_[j].first();
-            if (fdName == fieldNames[i])
-            {
-                fieldIds_[i] = j;
-                localFieldIds[j] = i;
-                break;
-            }
-        }
-    }
-    forAll(localFieldIds, i)
-    {
-        if (localFieldIds[i] < 0)
-        {
-            FatalErrorIn
-            (
-                "TimeActivatedExplicitSource<Type>::setFieldData"
-                "("
-                    "const dictionary&, "
-                    "const wordList&"
-                ")"
-            )   << "Field " << fieldData_[i].first() << " not found in "
-                << "field list. Available fields are: " << nl << fieldNames
-                << exit(FatalError);
-        }
-    }
-}
-
-
-template<class Type>
-void Foam::TimeActivatedExplicitSource<Type>::setCellSet()
-{
-    Info<< incrIndent << indent << "Source: " << name_ << endl;
-    switch (selectionMode_)
-    {
-        case smPoints:
-        {
-            Info<< indent << "- selecting cells using points" << endl;
-
-            labelHashSet selectedCells;
-
-            forAll(points_, i)
-            {
-                label cellI = mesh_.findCell
-                (
-                    points_[i],
-                    polyMesh::FACEDIAGTETS
-                );
-                if (cellI >= 0)
-                {
-                    selectedCells.insert(cellI);
-                }
-
-                label globalCellI = returnReduce(cellI, maxOp<label>());
-                if (globalCellI < 0)
-                {
-                    WarningIn("TimeActivatedExplicitSource<Type>::setCellIds()")
-                        << "Unable to find owner cell for point " << points_[i]
-                        << endl;
-                }
-            }
-
-            cells_ = selectedCells.toc();
-
-            break;
-        }
-        case smCellSet:
-        {
-            Info<< indent << "- selecting cells using cellSet "
-                << cellSetName_ << endl;
-
-            cellSet selectedCells(mesh_, cellSetName_);
-            cells_ = selectedCells.toc();
-
-            break;
-        }
-        case smCellZone:
-        {
-            Info<< indent << "- selecting cells using cellZone "
-                << cellSetName_ << endl;
-            label zoneID = mesh_.cellZones().findZoneID(cellSetName_);
-            if (zoneID == -1)
-            {
-                FatalErrorIn("TimeActivatedExplicitSource<Type>::setCellIds()")
-                    << "Cannot find cellZone " << cellSetName_ << endl
-                    << "Valid cellZones are " << mesh_.cellZones().names()
-                    << exit(FatalError);
-            }
-            cells_ = mesh_.cellZones()[zoneID];
-
-            break;
-        }
-        case smAll:
-        {
-            Info<< indent << "- selecting all cells" << endl;
-            cells_ = identity(mesh_.nCells());
-
-            break;
-        }
-        default:
-        {
-            FatalErrorIn("TimeActivatedExplicitSource<Type>::setCellIds()")
-                << "Unknown selectionMode "
-                << selectionModeTypeNames_[selectionMode_]
-                << ". Valid selectionMode types are" << selectionModeTypeNames_
-                << exit(FatalError);
-        }
-    }
-
-    // Set volume normalisation
-    if (volumeMode_ == vmAbsolute)
-    {
-        V_ = 0.0;
-        forAll(cells_, i)
-        {
-            V_ += mesh_.V()[cells_[i]];
-        }
-        reduce(V_, sumOp<scalar>());
-    }
-
-    Info<< indent << "- selected "
-        << returnReduce(cells_.size(), sumOp<label>())
-        << " cell(s) with volume " << V_ << nl << decrIndent << endl;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::TimeActivatedExplicitSource<Type>::TimeActivatedExplicitSource
-(
-    const word& name,
-    const dictionary& dict,
-    const fvMesh& mesh,
-    const wordList& fieldNames
-)
-:
-    name_(name),
-    mesh_(mesh),
-    active_(readBool(dict.lookup("active"))),
-    timeStart_(readScalar(dict.lookup("timeStart"))),
-    duration_(readScalar(dict.lookup("duration"))),
-    volumeMode_(wordToVolumeModeType(dict.lookup("volumeMode"))),
-    selectionMode_(wordToSelectionModeType(dict.lookup("selectionMode"))),
-    points_(),
-    cellSetName_("none"),
-    V_(1.0),
-    fieldData_(),
-    fieldIds_(fieldNames.size(), -1)
-{
-    setSelection(dict);
-
-    if (fieldNames.size() == 1)
-    {
-        fieldData_.setSize(1);
-        fieldData_[0].first() = fieldNames[0];
-        dict.lookup("fieldData") >> fieldData_[0].second();
-        fieldIds_[0] = 0;
-    }
-    else
-    {
-        setFieldData(dict, fieldNames);
-    }
-
-    setCellSet();
-}
-
-
-template<class Type>
-void Foam::TimeActivatedExplicitSource<Type>::addToField
-(
-    DimensionedField<Type, volMesh>& Su,
-    const label fieldI
-)
-{
-    const label fid = fieldIds_[fieldI];
-
-    if
-    (
-        active_
-     && (fid >= 0)
-     && (mesh_.time().value() >= timeStart_)
-     && (mesh_.time().value() <= timeEnd())
-    )
-    {
-        // Update the cell set if the mesh is changing
-        if (mesh_.changing())
-        {
-            setCellSet();
-        }
-
-        forAll(cells_, i)
-        {
-            Su[cells_[i]] = fieldData_[fid].second()/V_;
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.H b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.H
deleted file mode 100644
index 73304ef7d8..0000000000
--- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.H
+++ /dev/null
@@ -1,392 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::TimeActivatedExplicitSource
-
-Description
-    Time activated explicit source.
-
-    Sources described by:
-
-    {
-        active          true;      // on/off switch
-        timeStart       0.2;       // start time
-        duration        2.0;       // duration
-        selectionMode   points;    // cellSet/cellZone/all
-        volumeMode      absolute;  // specific
-
-        fieldData                  // field data - usage for multiple fields
-        (
-            (H2O 0.005)
-        );
-
-        fieldData       0.005;     // field data - usage for single field
-
-        points                     // list of points when selectionMode = points
-        (
-            (2.75 0.5 0)
-        );
-
-        cellSet         c0;        // cellSet name when selectionMode=cellSet
-        cellZone        c0;        // cellZone name when selectionMode=cellZone
-    }
-
-SourceFiles
-    TimeActivatedExplicitSource.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef TimeActivatedExplicitSource_H
-#define TimeActivatedExplicitSource_H
-
-#include "Tuple2.H"
-#include "cellSet.H"
-#include "volFieldsFwd.H"
-#include "DimensionedField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes
-
-class fvMesh;
-
-template<class Type>
-class TimeActivatedExplicitSource;
-
-// Forward declaration of friend functions
-
-template<class Type>
-Ostream& operator<<
-(
-    Ostream&,
-    const TimeActivatedExplicitSource<Type>&
-);
-
-/*---------------------------------------------------------------------------*\
-               Class TimeActivatedExplicitSource Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class TimeActivatedExplicitSource
-{
-public:
-
-    // Public data
-
-        //- Enumeration for selection mode types
-        enum selectionModeType
-        {
-            smPoints,
-            smCellSet,
-            smCellZone,
-            smAll
-        };
-
-        //- Word list of selection mode type names
-        static const wordList selectionModeTypeNames_;
-
-        //- Enumeration for volume types
-        enum volumeModeType
-        {
-            vmAbsolute,
-            vmSpecific
-        };
-
-        //- Word list of volume mode type names
-        static const wordList volumeModeTypeNames_;
-
-
-protected:
-
-    // Protected data
-
-        typedef Tuple2<word, Type> fieldNameValuePair;
-
-        //- Source name
-        word name_;
-
-        //- Reference to the mesh database
-        const fvMesh& mesh_;
-
-        //- Source active flag
-        bool active_;
-
-        //- Time start
-        scalar timeStart_;
-
-        //- Duration
-        scalar duration_;
-
-        //- Volume mode
-        volumeModeType volumeMode_;
-
-        //- Cell selection mode
-        selectionModeType selectionMode_;
-
-        //- List of points for "points" selectionMode
-        List<point> points_;
-
-        //- Name of cell set for "cellSet" and "cellZone" selectionMode
-        word cellSetName_;
-
-        //- Set of cells to apply source to
-        labelList cells_;
-
-        //- Sum of cell volumes
-        scalar V_;
-
-        //- List of source field name vs value pairs
-        List<fieldNameValuePair> fieldData_;
-
-        //- Map of fields ids from supplied fields to local field source ids
-        labelList fieldIds_;
-
-
-    // Protected functions
-
-        //- Helper function to convert from a word to a selectionModeType
-        selectionModeType wordToSelectionModeType(const word& smtName) const;
-
-        //- Helper function to convert from a word to a volumeModeType
-        volumeModeType wordToVolumeModeType(const word& vtName) const;
-
-        //- Helper function to convert from a selectionModeType to a word
-        word selectionModeTypeToWord(const selectionModeType& smtType) const;
-
-        //- Helper function to convert from a volumeModeType to a word
-        word volumeModeTypeToWord(const volumeModeType& vtType) const;
-
-        //- Set the cellSet or points selection
-        void setSelection(const dictionary& dict);
-
-        //- Set the local field data
-        void setFieldData(const dictionary& dict, const wordList& fieldNames);
-
-        //- Set the cell set based on the user input selection mode
-        void setCellSet();
-
-
-public:
-
-    // Constructors
-
-        //- Construct from components
-        TimeActivatedExplicitSource
-        (
-            const word& name,
-            const dictionary& dict,
-            const fvMesh& mesh,
-            const wordList& fieldNames
-        );
-
-        //- Return clone
-        autoPtr<TimeActivatedExplicitSource> clone() const
-        {
-            notImplemented
-            (
-                "autoPtr<TimeActivatedExplicitSource> clone() const"
-            );
-            return autoPtr<TimeActivatedExplicitSource>(NULL);
-        }
-
-        //- Return pointer to new TimeActivatedExplicitSource object created
-        //  on the freestore from an Istream
-        class iNew
-        {
-            //- Reference to the mesh database
-            const fvMesh& mesh_;
-
-            //- List of field names
-            const wordList& fieldNames_;
-
-
-        public:
-
-            iNew
-            (
-                const fvMesh& mesh,
-                const wordList& fieldNames
-            )
-            :
-                mesh_(mesh),
-                fieldNames_(fieldNames)
-            {}
-
-            autoPtr<TimeActivatedExplicitSource> operator()(Istream& is) const
-            {
-                const word name(is);
-                const dictionary dict(is);
-
-                return autoPtr<TimeActivatedExplicitSource>
-                (
-                    new TimeActivatedExplicitSource
-                    (
-                        name,
-                        dict,
-                        mesh_,
-                        fieldNames_
-                    )
-                );
-            }
-        };
-
-
-    // Member Functions
-
-        // Access
-
-            //- Return const access to the source name
-            inline const word& name() const;
-
-            //- Return const access to the mesh database
-            inline const fvMesh& mesh() const;
-
-            //- Return const access to the source active flag
-            inline bool active() const;
-
-            //- Return const access to the time start
-            inline scalar timeStart() const;
-
-            //- Return const access to the duration
-            inline scalar duration() const;
-
-            //- Return const access to the time end
-            inline scalar timeEnd() const;
-
-            //- Return const access to the volume mode
-            inline const volumeModeType& volumeMode() const;
-
-            //- Return const access to the cell selection mode
-            inline const selectionModeType& selectionMode() const;
-
-            //- Return const access to the list of points for "points"
-            //  selectionMode
-            inline const List<point>& points() const;
-
-            //- Return const access to the name of cell set for "cellSet"
-            //  selectionMode
-            inline const word& cellSetName() const;
-
-            //- Return const access to the total cell volume
-            inline scalar V() const;
-
-            //- Return const access to the cell set
-            inline const labelList& cells() const;
-
-            //- Return const access to the source field name vs value pairs
-            inline const List<fieldNameValuePair>& fieldData() const;
-
-            //- Return const access to the the map of fields ids from supplied
-            //  fields to local field source ids
-            inline const labelList& fieldIds() const;
-
-
-        // Edit
-
-            //- Return access to the source name
-            inline word& name();
-
-            //- Return access to the source active flag
-            inline bool& active();
-
-            //- Return access to the time start
-            inline scalar& timeStart();
-
-            //- Return access to the duration
-            inline scalar& duration();
-
-            //- Return access to the volume mode
-            inline volumeModeType& volumeMode();
-
-            //- Return access to the cell selection mode
-            inline selectionModeType& selectionMode();
-
-            //- Return access to the list of points for "points" selectionMode
-            inline List<point>& points();
-
-            //- Return access to the name of cell set for "cellSet"
-            //  selectionMode
-            inline word& cellSetName();
-
-            //- Return access to the total cell volume
-            inline scalar& V();
-
-            //- Return access to the cell set
-            inline labelList& cells();
-
-            //- Return access to the source field name vs value pairs
-            inline List<fieldNameValuePair>& fieldData();
-
-            //- Return access to the the map of fields ids from supplied
-            //  fields to local field source ids
-            inline labelList& fieldIds();
-
-
-        // Evaluation
-
-            //- Add the source contribution to field Su
-            void addToField
-            (
-                DimensionedField<Type, volMesh>& Su,
-                const label fieldI
-            );
-
-
-        // I-O
-
-            //- Write the source properties
-            void writeData(Ostream&) const;
-
-            //- Ostream operator
-            friend Ostream& operator<< <Type>
-            (
-                Ostream& os,
-                const TimeActivatedExplicitSource& source
-            );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "TimeActivatedExplicitSource.C"
-#   include "TimeActivatedExplicitSourceIO.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "TimeActivatedExplicitSourceI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceI.H b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceI.H
deleted file mode 100644
index 41ab9b6f5b..0000000000
--- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceI.H
+++ /dev/null
@@ -1,228 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "TimeActivatedExplicitSource.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-inline const Foam::word& Foam::TimeActivatedExplicitSource<Type>::name() const
-{
-    return name_;
-}
-
-
-template<class Type>
-inline const Foam::fvMesh& Foam::TimeActivatedExplicitSource<Type>::mesh() const
-{
-    return mesh_;
-}
-
-
-template<class Type>
-inline bool Foam::TimeActivatedExplicitSource<Type>::active() const
-{
-    return active_;
-}
-
-
-template<class Type>
-inline Foam::scalar Foam::TimeActivatedExplicitSource<Type>::timeStart() const
-{
-    return timeStart_;
-}
-
-
-template<class Type>
-inline Foam::scalar Foam::TimeActivatedExplicitSource<Type>::duration() const
-{
-    return duration_;
-}
-
-
-template<class Type>
-inline Foam::scalar Foam::TimeActivatedExplicitSource<Type>::timeEnd() const
-{
-    return timeStart_ + duration_;
-}
-
-
-template<class Type>
-inline const typename Foam::TimeActivatedExplicitSource<Type>::volumeModeType&
-Foam::TimeActivatedExplicitSource<Type>::volumeMode() const
-{
-    return volumeMode_;
-}
-
-
-template<class Type>
-inline const typename Foam::TimeActivatedExplicitSource<Type>::
-selectionModeType&
-Foam::TimeActivatedExplicitSource<Type>::selectionMode() const
-{
-    return selectionMode_;
-}
-
-
-template<class Type>
-inline const Foam::List<Foam::point>&
-Foam::TimeActivatedExplicitSource<Type>::points() const
-{
-    return points_;
-}
-
-
-template<class Type>
-inline const Foam::word&
-Foam::TimeActivatedExplicitSource<Type>::cellSetName() const
-{
-    return cellSetName_;
-}
-
-
-template<class Type>
-inline Foam::scalar Foam::TimeActivatedExplicitSource<Type>::V() const
-{
-    return V_;
-}
-
-
-template<class Type>
-inline const Foam::labelList&
-Foam::TimeActivatedExplicitSource<Type>::cells() const
-{
-    return cells_;
-}
-
-
-template<class Type>
-inline const Foam::List<typename Foam::TimeActivatedExplicitSource<Type>::
-fieldNameValuePair>&
-Foam::TimeActivatedExplicitSource<Type>::fieldData() const
-{
-    return fieldData_;
-}
-
-
-template<class Type>
-inline const Foam::labelList&
-Foam::TimeActivatedExplicitSource<Type>::fieldIds() const
-{
-    return fieldIds_;
-}
-
-
-template<class Type>
-inline Foam::word& Foam::TimeActivatedExplicitSource<Type>::name()
-{
-    return name_;
-}
-
-
-template<class Type>
-inline bool& Foam::TimeActivatedExplicitSource<Type>::active()
-{
-    return active_;
-}
-
-
-template<class Type>
-inline Foam::scalar& Foam::TimeActivatedExplicitSource<Type>::timeStart()
-{
-    return timeStart_;
-}
-
-
-template<class Type>
-inline Foam::scalar& Foam::TimeActivatedExplicitSource<Type>::duration()
-{
-    return duration_;
-}
-
-
-template<class Type>
-inline typename Foam::TimeActivatedExplicitSource<Type>::volumeModeType&
-Foam::TimeActivatedExplicitSource<Type>::volumeMode()
-{
-    return volumeMode_;
-}
-
-
-template<class Type>
-inline typename Foam::TimeActivatedExplicitSource<Type>::selectionModeType&
-Foam::TimeActivatedExplicitSource<Type>::selectionMode()
-{
-    return selectionMode_;
-}
-
-
-template<class Type>
-inline Foam::List<Foam::point>&
-Foam::TimeActivatedExplicitSource<Type>::points()
-{
-    return points_;
-}
-
-
-template<class Type>
-inline Foam::word& Foam::TimeActivatedExplicitSource<Type>::cellSetName()
-{
-    return cellSetName_;
-}
-
-
-template<class Type>
-inline Foam::scalar& Foam::TimeActivatedExplicitSource<Type>::V()
-{
-    return V_;
-}
-
-
-template<class Type>
-inline Foam::labelList& Foam::TimeActivatedExplicitSource<Type>::cells()
-{
-    return cells_;
-}
-
-
-template<class Type>
-inline Foam::List
-<
-    typename Foam::TimeActivatedExplicitSource<Type>::fieldNameValuePair
->&
-Foam::TimeActivatedExplicitSource<Type>::fieldData()
-{
-    return fieldData_;
-}
-
-
-template<class Type>
-inline Foam::labelList& Foam::TimeActivatedExplicitSource<Type>::fieldIds()
-{
-    return fieldIds_;
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceIO.C b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceIO.C
deleted file mode 100644
index 7b07e62d03..0000000000
--- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceIO.C
+++ /dev/null
@@ -1,101 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "TimeActivatedExplicitSource.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::TimeActivatedExplicitSource<Type>::writeData(Ostream& os) const
-{
-    os  << indent << name_ << nl
-        << indent << token::BEGIN_BLOCK << incrIndent << nl;
-
-    os.writeKeyword("active") << active_ << token::END_STATEMENT << nl;
-    os.writeKeyword("timeStart") << timeStart_ << token::END_STATEMENT << nl;
-    os.writeKeyword("duration") << duration_ << token::END_STATEMENT << nl;
-    os.writeKeyword("selectionMode") << selectionModeTypeToWord(selectionMode_)
-        << token::END_STATEMENT << nl;
-    os.writeKeyword("volumeMode") << volumeModeTypeToWord(volumeMode_)
-        << token::END_STATEMENT << nl;
-
-    if (fieldIds_.size() == 1)
-    {
-        os.writeKeyword("fieldData") << fieldData_[0].second()
-            << token::END_STATEMENT << nl;
-    }
-    else
-    {
-        os.writeKeyword("fieldData") << fieldData_ << nl;
-    }
-
-    switch (selectionMode_)
-    {
-        case smPoints:
-        {
-            os.writeKeyword("points") << nl << indent << points_
-                << token::END_STATEMENT << nl;
-            break;
-        }
-        case smCellSet:
-        {
-            os.writeKeyword("cellSet") << cellSetName_
-                << token::END_STATEMENT << nl;
-            break;
-        }
-        default:
-        {
-            FatalErrorIn
-            (
-                "TimeActivatedExplicitSource<Type>::writeData"
-                "("
-                    "Ostream&, "
-                    "bool"
-                ") const"
-            )   << "Unknown selectionMode "
-                << selectionModeTypeToWord(selectionMode_)
-                << abort(FatalError);
-        }
-    }
-
-    os << decrIndent << indent << token::END_BLOCK << endl;
-}
-
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const TimeActivatedExplicitSource<Type>& source
-)
-{
-    source.writeData(os);
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.C b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.C
deleted file mode 100644
index 65f1216bc7..0000000000
--- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.C
+++ /dev/null
@@ -1,222 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "TimeActivatedExplicitSourceList.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::TimeActivatedExplicitSourceList<Type>::TimeActivatedExplicitSourceList
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dimensionSet& dimensions,
-    const wordList& fieldNames
-)
-:
-    IOPtrList<TimeActivatedExplicitSource<Type> >
-    (
-        IOobject
-        (
-            name + "SourceProperties",
-            mesh.time().constant(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        ),
-        typename TimeActivatedExplicitSource<Type>::iNew(mesh, fieldNames)
-    ),
-    name_(name),
-    mesh_(mesh),
-    dimensions_(dimensions),
-    fieldNames_(fieldNames)
-{}
-
-
-template<class Type>
-Foam::TimeActivatedExplicitSourceList<Type>::TimeActivatedExplicitSourceList
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dimensionSet& dimensions,
-    const word& fieldName
-)
-:
-    IOPtrList<TimeActivatedExplicitSource<Type> >
-    (
-        IOobject
-        (
-            name + "SourceProperties",
-            mesh.time().constant(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        ),
-        typename TimeActivatedExplicitSource<Type>::iNew
-        (
-            mesh,
-            IStringStream('(' + fieldName + ')')()
-        )
-    ),
-    name_(name),
-    mesh_(mesh),
-    dimensions_(dimensions),
-    fieldNames_(1, fieldName)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh> >
-Foam::TimeActivatedExplicitSourceList<Type>::Su(const label fieldI)
-{
-    tmp<DimensionedField<Type, volMesh> > tSu
-    (
-       new DimensionedField<Type, volMesh>
-       (
-           IOobject
-           (
-               name_ + "Source_" + fieldNames_[fieldI],
-               mesh_.time().timeName(),
-               mesh_,
-               IOobject::NO_READ,
-               IOobject::NO_WRITE
-           ),
-           mesh_,
-           dimensioned<Type>("zero", dimensions_, pTraits<Type>::zero)
-       )
-    );
-
-    DimensionedField<Type, volMesh>& Su = tSu();
-
-    forAll(*this, i)
-    {
-        this->operator[](i).addToField(Su, fieldI);
-    }
-
-    return tSu;
-}
-
-
-template<class Type>
-Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh> >
-Foam::TimeActivatedExplicitSourceList<Type>::SuTot()
-{
-    tmp<DimensionedField<Type, volMesh> > tSuTot
-    (
-       new DimensionedField<Type, volMesh>
-       (
-           IOobject
-           (
-               name_ + "TotalSource",
-               mesh_.time().timeName(),
-               mesh_,
-               IOobject::NO_READ,
-               IOobject::NO_WRITE
-           ),
-           mesh_,
-           dimensioned<Type>("zero", dimensions_, pTraits<Type>::zero)
-       )
-    );
-
-    DimensionedField<Type, volMesh>& SuTot = tSuTot();
-
-    forAll(fieldNames_, fieldI)
-    {
-        forAll(*this, sourceI)
-        {
-            this->operator[](sourceI).addToField(SuTot, fieldI);
-        }
-    }
-
-    return tSuTot;
-}
-
-
-template<class Type>
-bool Foam::TimeActivatedExplicitSourceList<Type>::readData(Istream& is)
-{
-    this->clear();
-
-    IOPtrList<TimeActivatedExplicitSource<Type> > newSources
-    (
-        IOobject
-        (
-            name_ + "TimeActivatedExplicitSource",
-            mesh_.time().constant(),
-            mesh_,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        typename TimeActivatedExplicitSource<Type>::iNew(mesh_, fieldNames_)
-    );
-
-    this->transfer(newSources);
-
-    return is.good();
-}
-
-
-template<class Type>
-bool Foam::TimeActivatedExplicitSourceList<Type>::writeData(Ostream& os) const
-{
-    // Write size of list
-    os << nl << this->size();
-
-    // Write beginning of contents
-    os << nl << token::BEGIN_LIST;
-
-    // Write list contents
-    forAll(*this, i)
-    {
-        os << nl;
-        this->operator[](i).writeData(os);
-    }
-
-    // Write end of contents
-    os << token::END_LIST << token::END_STATEMENT << nl;
-
-    // Check state of IOstream
-    return os.good();
-}
-
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const TimeActivatedExplicitSourceList<Type>& sources
-)
-{
-    sources.writeData(os);
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.H b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.H
deleted file mode 100644
index 228d312733..0000000000
--- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.H
+++ /dev/null
@@ -1,171 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 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, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::TimeActivatedExplicitSourceList
-
-Description
-    List of time activeted explict sources
-
-SourceFiles
-    TimeActivatedExplicitSourceList.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef TimeActivatedExplicitSourceList_H
-#define TimeActivatedExplicitSourceList_H
-
-#include "IOPtrList.H"
-#include "TimeActivatedExplicitSource.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes
-class fvMesh;
-
-template<class Type>
-class TimeActivatedExplicitSource;
-
-template<class Type>
-class TimeActivatedExplicitSourceList;
-
-// Forward declaration of friend functions
-
-template<class Type>
-Ostream& operator<<
-(
-    Ostream&,
-    const TimeActivatedExplicitSourceList<Type>&
-);
-
-/*---------------------------------------------------------------------------*\
-             Class TimeActivatedExplicitSourceList Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class TimeActivatedExplicitSourceList
-:
-    public IOPtrList<TimeActivatedExplicitSource<Type> >
-{
-private:
-
-    // Private data
-
-        //- Name of source properties list
-        word name_;
-
-        //- Reference to the mesh database
-        const fvMesh& mesh_;
-
-        //- Dimensions of source properties
-        dimensionSet dimensions_;
-
-        //- List of field names the source is working on
-        wordList fieldNames_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        TimeActivatedExplicitSourceList
-        (
-            const TimeActivatedExplicitSourceList<Type>&
-        );
-
-        //- Disallow default bitwise assignment
-        void operator=(const TimeActivatedExplicitSourceList<Type>&);
-
-
-public:
-
-    // Constructors
-
-        //- Construct from components with list of field names
-        TimeActivatedExplicitSourceList
-        (
-            const word& name,
-            const fvMesh& mesh,
-            const dimensionSet& dimensions,
-            const wordList& fieldNames
-        );
-
-        //- Construct from components with single field name
-        TimeActivatedExplicitSourceList
-        (
-            const word& name,
-            const fvMesh& mesh,
-            const dimensionSet& dimensions,
-            const word& fieldName
-        );
-
-
-    // Member Functions
-
-        // Evaluation
-
-            //- Return the source for field, fieldI
-            tmp<DimensionedField<Type, volMesh> > Su
-            (
-                const label fieldI = 0
-            );
-
-            //- Return the total source for all fields
-            tmp<DimensionedField<Type, volMesh> > SuTot();
-
-
-
-        // I-O
-
-            //- Read data from Istream
-            bool readData(Istream& is);
-
-            //- Write data to Istream
-            bool writeData(Ostream& os) const;
-
-            //- Ostream operator
-            friend Ostream& operator<< <Type>
-            (
-                Ostream& os,
-                const TimeActivatedExplicitSourceList& sources
-            );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "TimeActivatedExplicitSourceList.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/energySourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/energySourceProperties
deleted file mode 100644
index b551f35f22..0000000000
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/energySourceProperties
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      energySourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    // none
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/momentumSourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/momentumSourceProperties
deleted file mode 100644
index c9cf6ca3fe..0000000000
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/momentumSourceProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      momentumSourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    // none
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/massSourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/sourcesProperties
similarity index 93%
rename from tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/massSourceProperties
rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/sourcesProperties
index 11811461db..8aedc2c306 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/massSourceProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/sourcesProperties
@@ -11,13 +11,10 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      massSourcesProperties;
+    object      sourcesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-(
-    // none
-);
-
+// none
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/energySourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/energySourceProperties
deleted file mode 100644
index b551f35f22..0000000000
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/energySourceProperties
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      energySourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    // none
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/momentumSourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/momentumSourceProperties
deleted file mode 100644
index c9cf6ca3fe..0000000000
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/momentumSourceProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      momentumSourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    // none
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/massSourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/sourcesProperties
similarity index 93%
rename from tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/massSourceProperties
rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/sourcesProperties
index 11811461db..8aedc2c306 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/massSourceProperties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/sourcesProperties
@@ -11,13 +11,10 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      massSourcesProperties;
+    object      sourcesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-(
-    // none
-);
-
+// none
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/energySourceProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/energySourceProperties
deleted file mode 100644
index b10138820a..0000000000
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/energySourceProperties
+++ /dev/null
@@ -1,31 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      energySourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    source1
-    {
-        active          true;
-        timeStart       0.15;
-        duration        0.2;
-        selectionMode   cellSet;
-        volumeMode      absolute;
-        fieldData       20000;
-        cellSet         ignitionCells;
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/massSourceProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties
similarity index 73%
rename from tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/massSourceProperties
rename to tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties
index 30c8a7de3a..0c93adb632 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/massSourceProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties
@@ -11,28 +11,28 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      massSourcesProperties;
+    object      sourcesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-(
-    source1
+source1
+{
+    type            scalarExplicitSource;
+    active          true;
+    timeStart       0.15;
+    duration        0.2;
+    selectionMode   cellSet;
+    cellSet         ignitionCells;
+
+    scalarExplicitSourceCoeffs
     {
-        active          true;
-        timeStart       0.2;
-        duration        2.0;
-        selectionMode   points;
         volumeMode      absolute;
         fieldData
-        (
-            (H2O 1e-4) // kg/s
-        );
-        points
-        (
-            (2.75 0.5 0)
-        );
+        {
+            hs              20000;
+        }
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/energySourceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/energySourceProperties
deleted file mode 100644
index 7bb14d0371..0000000000
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/energySourceProperties
+++ /dev/null
@@ -1,34 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      energySourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    source1
-    {
-        active          true;
-        timeStart       0.2;
-        duration        2.0;
-        selectionMode   points;
-        volumeMode      absolute;
-        fieldData       10;
-        points
-        (
-            (2.75 0.5 0)
-        );
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/momentumSourceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/momentumSourceProperties
deleted file mode 100644
index e28bdc8552..0000000000
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/momentumSourceProperties
+++ /dev/null
@@ -1,35 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      momentumSourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    source1
-    {
-        active          true;
-        timeStart       0.2;
-        duration        2.0;
-        selectionMode   points;
-        volumeMode      absolute;
-        fieldData       (0 0.005 0);
-        points
-        (
-            (2.75 0.5 0)
-        );
-    }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/sourcesProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/sourcesProperties
new file mode 100644
index 0000000000..c725f62098
--- /dev/null
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/sourcesProperties
@@ -0,0 +1,87 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      sourcesProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+massSource1
+{
+    type            scalarExplicitSource;
+    active          true;
+    timeStart       0.2;
+    duration        2.0;
+    selectionMode   points;
+    points
+    (
+        (2.75 0.5 0)
+    );
+
+    scalarExplicitSourceCoeffs
+    {
+        volumeMode      absolute;
+        fieldData
+        {
+            H2O         1e-4; // kg/s
+        }
+    }
+}
+
+
+momentumSource1
+{
+    type            vectorExplicitSource;
+    active          true;
+    timeStart       0.2;
+    duration        2.0;
+    selectionMode   points;
+    points
+    (
+        (2.75 0.5 0)
+    );
+
+    vectorExplicitSourceCoeffs
+    {
+        volumeMode      absolute;
+        fieldData
+        {
+            U           (0 0.005 0);
+        }
+    }
+}
+
+
+energySource1
+{
+    type            scalarExplicitSource;
+    active          true;
+    timeStart       0.2;
+    duration        2.0;
+    selectionMode   points;
+    points
+    (
+        (2.75 0.5 0)
+    );
+
+    scalarExplicitSourceCoeffs
+    {
+        volumeMode      absolute;
+        fieldData
+        {
+            hs          10;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/energySourceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/energySourceProperties
deleted file mode 100644
index b551f35f22..0000000000
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/energySourceProperties
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      energySourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    // none
-);
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/momentumSourceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/momentumSourceProperties
deleted file mode 100644
index c9cf6ca3fe..0000000000
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/momentumSourceProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      momentumSourcesProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-(
-    // none
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/massSourceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/sourcesProperties
similarity index 93%
rename from tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/massSourceProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/sourcesProperties
index 11811461db..8aedc2c306 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/massSourceProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/sourcesProperties
@@ -11,13 +11,10 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      massSourcesProperties;
+    object      sourcesProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-(
-    // none
-);
-
+// none
 
 // ************************************************************************* //