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

applications/solvers/basic/scalarTransportFoam/Make/options

@@ -1,11 +1,11 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lfieldSources \
+    -lfvOptions \
     -lmeshTools \
     -lsampling

applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 #include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
 
     simpleControl simple(mesh);
 
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
               + fvm::div(phi, T)
               - fvm::laplacian(DT, T)
              ==
-                sources(T)
+                fvOptions(T)
             );
         }
 

applications/solvers/combustion/XiFoam/EaEqn.H

@@ -16,16 +16,16 @@
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), hea)
-      + sources(rho, hea)
+      + fvOptions(rho, hea)
     );
 
     EaEqn.relax();
 
-    sources.constrain(EaEqn);
+    fvOptions.constrain(EaEqn);
 
     EaEqn.solve();
 
-    sources.correct(hea);
+    fvOptions.correct(hea);
 
     thermo.correct();
 }

applications/solvers/combustion/XiFoam/EauEqn.H

@@ -25,12 +25,12 @@ if (ign.ignited())
         //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), heau)
 
      ==
-        sources(rho, heau)
+        fvOptions(rho, heau)
     );
 
-    sources.constrain(heauEqn);
+    fvOptions.constrain(heauEqn);
 
     heauEqn.solve();
 
-    sources.correct(heau);
+    fvOptions.correct(heau);
 }

applications/solvers/combustion/XiFoam/Make/options

@@ -1,6 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude\
     -I$(LIB_SRC)/engine/lnInclude \
@@ -12,7 +12,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lfieldSources \
+    -lfvOptions \
     -lsampling \
     -lmeshTools \
     -lengine \

applications/solvers/combustion/XiFoam/UEqn.H

@@ -5,17 +5,17 @@
       + turbulence->divDevRhoReff(U)
      ==
         rho*g
-      + sources(rho, U)
+      + fvOptions(rho, U)
     );
 
     UEqn.relax();
 
-    sources.constrain(UEqn);
+    fvOptions.constrain(UEqn);
 
     if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
 
-        sources.correct(U);
+        fvOptions.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/combustion/XiFoam/XiFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ Description
 #include "ignition.H"
 #include "Switch.H"
 #include "pimpleControl.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
     #include "readCombustionProperties.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/XiFoam/bEqn.H

@@ -54,7 +54,7 @@ if (ign.ignited())
       - fvm::Sp(fvc::div(phiSt), b)
       - fvm::laplacian(turbulence->alphaEff(), b)
      ==
-        sources(rho, b)
+        fvOptions(rho, b)
     );
 
 
@@ -67,11 +67,11 @@ if (ign.ignited())
     // ~~~~~~~~~~~
     bEqn.relax();
 
-    sources.constrain(bEqn);
+    fvOptions.constrain(bEqn);
 
     bEqn.solve();
 
-    sources.correct(b);
+    fvOptions.correct(b);
 
     Info<< "min(b) = " << min(b).value() << endl;
 
@@ -160,16 +160,16 @@ if (ign.ignited())
           ==
           - fvm::SuSp(-rho*Rc*Su0/Su, Su)
           - fvm::SuSp(rho*(sigmas + Rc), Su)
-          + sources(rho, Su)
+          + fvOptions(rho, Su)
         );
 
         SuEqn.relax();
 
-        sources.constrain(SuEqn);
+        fvOptions.constrain(SuEqn);
 
         SuEqn.solve();
 
-        sources.correct(Su);
+        fvOptions.correct(Su);
 
         // Limit the maximum Su
         // ~~~~~~~~~~~~~~~~~~~~
@@ -247,16 +247,16 @@ if (ign.ignited())
                 ),
                 Xi
             )
-          + sources(rho, Xi)
+          + fvOptions(rho, Xi)
         );
 
         XiEqn.relax();
 
-        sources.constrain(XiEqn);
+        fvOptions.constrain(XiEqn);
 
         XiEqn.solve();
 
-        sources.correct(Xi);
+        fvOptions.correct(Xi);
 
         // Correct boundedness of Xi
         // ~~~~~~~~~~~~~~~~~~~~~~~~~

applications/solvers/combustion/XiFoam/ftEqn.H

@@ -19,12 +19,12 @@ if (composition.contains("ft"))
       + mvConvection->fvmDiv(phi, ft)
       - fvm::laplacian(turbulence->alphaEff(), ft)
      ==
-        sources(rho, ft)
+        fvOptions(rho, ft)
     );
 
-    sources.constrain(ftEqn);
+    fvOptions.constrain(ftEqn);
 
     ftEqn.solve();
 
-    sources.correct(ft);
+    fvOptions.correct(ft);
 }

applications/solvers/combustion/XiFoam/pEqn.H

@@ -16,7 +16,7 @@ if (pimple.transonic())
         )
     );
 
-    sources.relativeFlux(fvc::interpolate(psi), phid);
+    fvOptions.relativeFlux(fvc::interpolate(psi), phid);
 
     while (pimple.correctNonOrthogonal())
     {
@@ -26,10 +26,10 @@ if (pimple.transonic())
           + fvm::div(phid, p)
           - fvm::laplacian(rho*rAU, p)
          ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
-        sources.constrain(pEqn);
+        fvOptions.constrain(pEqn);
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
@@ -51,7 +51,7 @@ else
         )
     );
 
-    sources.relativeFlux(phiHbyA);
+    fvOptions.relativeFlux(phiHbyA);
 
     while (pimple.correctNonOrthogonal())
     {
@@ -61,10 +61,10 @@ else
           + fvc::div(phiHbyA)
           - fvm::laplacian(rho*rAU, p)
          ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
-        sources.constrain(pEqn);
+        fvOptions.constrain(pEqn);
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
@@ -80,7 +80,7 @@ else
 
 U = HbyA - rAU*fvc::grad(p);
 U.correctBoundaryConditions();
-sources.correct(U);
+fvOptions.correct(U);
 K = 0.5*magSqr(U);
 
 if (thermo.dpdt())

applications/solvers/combustion/coldEngineFoam/Make/options

@@ -10,7 +10,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude
+    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
     -lengine \
@@ -21,4 +21,4 @@ EXE_LIBS = \
     -lspecie \
     -lfiniteVolume \
     -lmeshTools \
-    -lfieldSources
+    -lfvOptions

applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 #include "psiThermo.H"
 #include "turbulenceModel.H"
 #include "OFstream.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 #include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
     #include "createEngineTime.H"
     #include "createEngineMesh.H"
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "readEngineTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/engineFoam/Make/options

@@ -1,7 +1,7 @@
 EXE_INC = \
     -I$(FOAM_SOLVERS)/combustion/XiFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/engine/lnInclude \
@@ -13,7 +13,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lfieldSources \
+    -lfvOptions \
     -lsampling \
     -lmeshTools \
     -lengine \

applications/solvers/combustion/engineFoam/UEqn.H

@@ -4,13 +4,13 @@
       + fvm::div(phi, U)
       + turbulence->divDevRhoReff(U)
      ==
-        sources(rho, U)
+        fvOptions(rho, U)
     );
 
     if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
 
-        sources.correct(U);
+        fvOptions.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/combustion/engineFoam/engineFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ Description
 #include "OFstream.H"
 #include "mathematicalConstants.H"
 #include "pimpleControl.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
     #include "createEngineMesh.H"
     #include "readCombustionProperties.H"
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "readEngineTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/engineFoam/pEqn.H

@@ -13,7 +13,7 @@ if (pimple.transonic())
        *((fvc::interpolate(HbyA) & mesh.Sf()) - fvc::meshPhi(rho, U))
     );
 
-    sources.relativeFlux(fvc::interpolate(psi), phid);
+    fvOptions.relativeFlux(fvc::interpolate(psi), phid);
 
     while (pimple.correctNonOrthogonal())
     {
@@ -23,10 +23,10 @@ if (pimple.transonic())
           + fvm::div(phid, p)
           - fvm::laplacian(rho*rAU, p)
          ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
-        sources.constrain(pEqn);
+        fvOptions.constrain(pEqn);
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
@@ -45,7 +45,7 @@ else
        *((fvc::interpolate(HbyA) & mesh.Sf()) - fvc::meshPhi(rho, U))
     );
 
-    sources.relativeFlux(fvc::interpolate(rho), phiHbyA);
+    fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
 
     while (pimple.correctNonOrthogonal())
     {
@@ -55,10 +55,10 @@ else
           + fvc::div(phiHbyA)
           - fvm::laplacian(rho*rAU, p)
          ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
-        sources.constrain(pEqn);
+        fvOptions.constrain(pEqn);
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
@@ -74,7 +74,7 @@ else
 
 U = HbyA - rAU*fvc::grad(p);
 U.correctBoundaryConditions();
-sources.correct(U);
+fvOptions.correct(U);
 K = 0.5*magSqr(U);
 
 if (thermo.dpdt())

applications/solvers/combustion/fireFoam/Make/options

@@ -1,6 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
     -I${LIB_SRC}/sampling/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
@@ -31,7 +31,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lfieldSources \
+    -lfvOptions \
     -lmeshTools \
     -lsampling \
     -lcompressibleRASModels \

applications/solvers/combustion/fireFoam/UEqn.H

@@ -5,12 +5,12 @@
       + turbulence->divDevRhoReff(U)
      ==
         parcels.SU(U)
-      + sources(rho, U)
+      + fvOptions(rho, U)
     );
 
     UEqn.relax();
 
-    sources.constrain(UEqn);
+    fvOptions.constrain(UEqn);
 
     if (pimple.momentumPredictor())
     {
@@ -27,6 +27,6 @@
             )
         );
 
-        sources.correct(U);
+        fvOptions.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/combustion/fireFoam/YEEqn.H

@@ -30,16 +30,16 @@ tmp<fv::convectionScheme<scalar> > mvConvection
                 parcels.SYi(i, Yi)
               + surfaceFilm.Srho(i)
               + combustion->R(Yi)
-              + sources(rho, Yi)
+              + fvOptions(rho, Yi)
             );
 
             YiEqn.relax();
 
-            sources.constrain(YiEqn);
+            fvOptions.constrain(YiEqn);
 
             YiEqn.solve(mesh.solver("Yi"));
 
-            sources.correct(Yi);
+            fvOptions.correct(Yi);
 
             Yi.max(0.0);
             Yt += Yi;
@@ -75,16 +75,16 @@ tmp<fv::convectionScheme<scalar> > mvConvection
       + radiation->Sh(thermo)
       + parcels.Sh(he)
       + surfaceFilm.Sh()
-      + sources(rho, he)
+      + fvOptions(rho, he)
     );
 
     EEqn.relax();
 
-    sources.constrain(EEqn);
+    fvOptions.constrain(EEqn);
 
     EEqn.solve();
 
-    sources.correct(he);
+    fvOptions.correct(he);
 
     thermo.correct();
 

applications/solvers/combustion/fireFoam/fireFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Description
 #include "solidChemistryModel.H"
 #include "psiCombustionModel.H"
 #include "pimpleControl.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
     #include "createClouds.H"
     #include "createSurfaceFilmModel.H"
     #include "createPyrolysisModel.H"

applications/solvers/combustion/fireFoam/pEqn.H

@@ -21,7 +21,7 @@ surfaceScalarField phiHbyA
   + phig
 );
 
-sources.relativeFlux(phiHbyA);
+fvOptions.relativeFlux(phiHbyA);
 
 while (pimple.correctNonOrthogonal())
 {
@@ -34,10 +34,10 @@ while (pimple.correctNonOrthogonal())
      ==
         parcels.Srho()
       + surfaceFilm.Srho()
-      + sources(psi, p_rgh, rho.name())
+      + fvOptions(psi, p_rgh, rho.name())
     );
 
-    sources.constrain(p_rghEqn);
+    fvOptions.constrain(p_rghEqn);
 
     p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
@@ -46,7 +46,7 @@ while (pimple.correctNonOrthogonal())
         phi = phiHbyA + p_rghEqn.flux();
         U = HbyA + rAU*fvc::reconstruct((p_rghEqn.flux() + phig)/rhorAUf);
         U.correctBoundaryConditions();
-        sources.correct(U);
+        fvOptions.correct(U);
     }
 }
 

applications/solvers/combustion/fireFoam/rhoEqn.H

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

applications/solvers/combustion/reactingFoam/EEqn.H

@@ -19,16 +19,16 @@
 //    - fvm::laplacian(turbulence->muEff(), he)  // unit lewis no.
      ==
         reaction->Sh()
-      + sources(rho, he)
+      + fvOptions(rho, he)
     );
 
     EEqn.relax();
 
-    sources.constrain(EEqn);
+    fvOptions.constrain(EEqn);
 
     EEqn.solve();
 
-    sources.correct(he);
+    fvOptions.correct(he);
 
     thermo.correct();
 

applications/solvers/combustion/reactingFoam/Make/options

@@ -1,6 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
@@ -13,7 +13,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lfieldSources \
+    -lfvOptions \
     -lmeshTools \
     -lsampling \
     -lcompressibleTurbulenceModel \

applications/solvers/combustion/reactingFoam/UEqn.H

@@ -5,17 +5,17 @@
       + turbulence->divDevRhoReff(U)
      ==
         rho*g
-      + sources(rho, U)
+      + fvOptions(rho, U)
     );
 
     UEqn.relax();
 
-    sources.constrain(UEqn);
+    fvOptions.constrain(UEqn);
 
     if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
 
-        sources.correct(U);
+        fvOptions.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/combustion/reactingFoam/YEqn.H

@@ -28,16 +28,16 @@ tmp<fv::convectionScheme<scalar> > mvConvection
               - fvm::laplacian(turbulence->muEff(), Yi)
              ==
                 reaction->R(Yi)
-              + sources(rho, Yi)
+              + fvOptions(rho, Yi)
             );
 
             YiEqn.relax();
 
-            sources.constrain(YiEqn);
+            fvOptions.constrain(YiEqn);
 
             YiEqn.solve(mesh.solver("Yi"));
 
-            sources.correct(Yi);
+            fvOptions.correct(Yi);
 
             Yi.max(0.0);
             Yt += Yi;

applications/solvers/combustion/reactingFoam/pEqn.H

@@ -16,7 +16,7 @@ if (pimple.transonic())
         )
     );
 
-    sources.relativeFlux(fvc::interpolate(psi), phid);
+    fvOptions.relativeFlux(fvc::interpolate(psi), phid);
 
     while (pimple.correctNonOrthogonal())
     {
@@ -26,10 +26,10 @@ if (pimple.transonic())
           + fvm::div(phid, p)
           - fvm::laplacian(rho*rAU, p)
          ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
-        sources.constrain(pEqn);
+        fvOptions.constrain(pEqn);
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
@@ -51,7 +51,7 @@ else
         )
     );
 
-    sources.relativeFlux(fvc::interpolate(rho), phiHbyA);
+    fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
 
     while (pimple.correctNonOrthogonal())
     {
@@ -61,10 +61,10 @@ else
           + fvc::div(phiHbyA)
           - fvm::laplacian(rho*rAU, p)
          ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
-        sources.constrain(pEqn);
+        fvOptions.constrain(pEqn);
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
@@ -80,7 +80,7 @@ else
 
 U = HbyA - rAU*fvc::grad(p);
 U.correctBoundaryConditions();
-sources.correct(U);
+fvOptions.correct(U);
 K = 0.5*magSqr(U);
 
 if (thermo.dpdt())

applications/solvers/combustion/reactingFoam/reactingFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Description
 #include "psiCombustionModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options

@@ -1,7 +1,7 @@
 EXE_INC = \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
@@ -15,7 +15,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lfieldSources \
+    -lfvOptions \
     -lmeshTools \
     -lsampling \
     -lcompressibleTurbulenceModel \

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/UEqn.H

@@ -4,12 +4,12 @@
       + fvm::div(phi, U)
       + turbulence->divDevRhoReff(U)
      ==
-        sources(rho, U)
+        fvOptions(rho, U)
     );
 
     UEqn.relax();
 
-    sources.constrain(UEqn);
+    fvOptions.constrain(UEqn);
 
     if (pimple.momentumPredictor())
     {
@@ -26,6 +26,6 @@
             )
         );
 
-        sources.correct(U);
+        fvOptions.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H

@@ -24,14 +24,14 @@
       + phig
     );
 
-    sources.relativeFlux(fvc::interpolate(rho), phiHbyA);
+    fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
 
     fvScalarMatrix p_rghDDtEqn
     (
         fvc::ddt(rho) + psi*correction(fvm::ddt(p_rgh))
       + fvc::div(phiHbyA)
       ==
-        sources(psi, p_rgh, rho.name())
+        fvOptions(psi, p_rgh, rho.name())
     );
 
     while (pimple.correctNonOrthogonal())
@@ -42,7 +42,7 @@
           - fvm::laplacian(rhorAUf, p_rgh)
         );
 
-        sources.constrain(p_rghEqn);
+        fvOptions.constrain(p_rghEqn);
 
         p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
@@ -58,7 +58,7 @@
             // calculated from the relaxed pressure
             U = HbyA + rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rhorAUf);
             U.correctBoundaryConditions();
-            sources.correct(U);
+            fvOptions.correct(U);
             K = 0.5*magSqr(U);
         }
     }

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 #include "turbulenceModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options

@@ -1,7 +1,7 @@
 EXE_INC = \
     -I$(FOAM_SOLVERS)/combustion/reactingFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
@@ -15,7 +15,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lfieldSources \
+    -lfvOptions \
     -lmeshTools \
     -lsampling \
     -lcompressibleTurbulenceModel \

applications/solvers/combustion/reactingFoam/rhoReactingFoam/pEqn.H

@@ -18,7 +18,7 @@
           + fvc::ddtPhiCorr(rAU, rho, U, phi)
         );
 
-        sources.relativeFlux(phiHbyA);
+        fvOptions.relativeFlux(phiHbyA);
 
         surfaceScalarField phid("phid", fvc::interpolate(thermo.psi())*phiHbyA);
 
@@ -37,10 +37,10 @@
                 pDDtEqn
               - fvm::laplacian(rho*rAU, p)
              ==
-                sources(psi, p, rho.name())
+                fvOptions(psi, p, rho.name())
             );
 
-            sources.constrain(pEqn);
+            fvOptions.constrain(pEqn);
 
             pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
@@ -62,14 +62,14 @@
             )
         );
 
-        sources.relativeFlux(fvc::interpolate(rho), phiHbyA);
+        fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
 
         fvScalarMatrix pDDtEqn
         (
             fvc::ddt(rho) + psi*correction(fvm::ddt(p))
           + fvc::div(phiHbyA)
          ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
         while (pimple.correctNonOrthogonal())
@@ -80,7 +80,7 @@
               - fvm::laplacian(rho*rAU, p)
             );
 
-            sources.constrain(pEqn);
+            fvOptions.constrain(pEqn);
 
             pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
@@ -99,7 +99,7 @@
 
     U = HbyA - rAU*fvc::grad(p);
     U.correctBoundaryConditions();
-    sources.correct(U);
+    fvOptions.correct(U);
     K = 0.5*magSqr(U);
 
     if (thermo.dpdt())

applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 #include "turbulenceModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/compressible/rhoPimpleFoam/EEqn.H

@@ -17,16 +17,16 @@
         )
       - fvm::laplacian(turbulence->alphaEff(), he)
      ==
-        sources(rho, he)
+        fvOptions(rho, he)
     );
 
     EEqn.relax();
 
-    sources.constrain(EEqn);
+    fvOptions.constrain(EEqn);
 
     EEqn.solve();
 
-    sources.correct(he);
+    fvOptions.correct(he);
 
     thermo.correct();
 }

applications/solvers/compressible/rhoPimpleFoam/Make/options

@@ -5,7 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude
+    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
     -lfluidThermophysicalModels \
@@ -16,4 +16,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \
-    -lfieldSources
+    -lfvOptions

applications/solvers/compressible/rhoPimpleFoam/UEqn.H

@@ -6,17 +6,17 @@ tmp<fvVectorMatrix> UEqn
   + fvm::div(phi, U)
   + turbulence->divDevRhoReff(U)
  ==
-    sources(rho, U)
+    fvOptions(rho, U)
 );
 
 UEqn().relax();
 
-sources.constrain(UEqn());
+fvOptions.constrain(UEqn());
 
 if (pimple.momentumPredictor())
 {
     solve(UEqn() == -fvc::grad(p));
 
-    sources.correct(U);
+    fvOptions.correct(U);
     K = 0.5*magSqr(U);
 }

applications/solvers/compressible/rhoPimpleFoam/pEqn.H

@@ -24,7 +24,7 @@ if (pimple.transonic())
         )
     );
 
-    sources.relativeFlux(fvc::interpolate(psi), phid);
+    fvOptions.relativeFlux(fvc::interpolate(psi), phid);
 
     volScalarField Dp("Dp", rho*rAU);
 
@@ -36,10 +36,10 @@ if (pimple.transonic())
           + fvm::div(phid, p)
           - fvm::laplacian(Dp, p)
           ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
-        sources.constrain(pEqn);
+        fvOptions.constrain(pEqn);
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
@@ -61,7 +61,7 @@ else
         )
     );
 
-    sources.relativeFlux(fvc::interpolate(rho), phiHbyA);
+    fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
 
     volScalarField Dp("Dp", rho*rAU);
 
@@ -74,10 +74,10 @@ else
           + fvc::div(phiHbyA)
           - fvm::laplacian(Dp, p)
           ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
-        sources.constrain(pEqn);
+        fvOptions.constrain(pEqn);
 
         pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
@@ -104,7 +104,7 @@ Info<< "rho max/min : " << max(rho).value()
 
 U = HbyA - rAU*fvc::grad(p);
 U.correctBoundaryConditions();
-sources.correct(U);
+fvOptions.correct(U);
 K = 0.5*magSqr(U);
 
 if (thermo.dpdt())

applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options

@@ -7,7 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude
+    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
     -lfluidThermophysicalModels \
@@ -18,4 +18,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \
-    -lfieldSources
+    -lfvOptions

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,8 @@ Application
 
 Description
     Transient solver for laminar or turbulent flow of compressible fluids
-    with support for run-time selectable sources, e.g. MRF, explicit porosity.
+    with support for run-time selectable finite volume options, e.g. MRF,
+    explicit porosity.
 
     Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and
     pseudo-transient simulations with support for local time-stepping for
@@ -37,7 +38,7 @@ Description
 #include "fvCFD.H"
 #include "psiThermo.H"
 #include "turbulenceModel.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 #include "fvcSmooth.H"
 #include "pimpleControl.H"
 #include "bound.H"
@@ -54,7 +55,7 @@ int main(int argc, char *argv[])
 
     #include "setInitialrDeltaT.H"
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

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

applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options

@@ -6,7 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude
+    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
     -lfluidThermophysicalModels \
@@ -17,4 +17,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling \
-    -lfieldSources
+    -lfvOptions

applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H

@@ -7,7 +7,7 @@ volScalarField rAU(1.0/UEqn().A());
 volScalarField rAtU(1.0/(1.0/rAU - UEqn().H1()));
 
 volVectorField HbyA("HbyA", U);
-HbyA = rAU*(UEqn() == sources(rho, U))().H();
+HbyA = rAU*(UEqn() == fvOptions(rho, U))().H();
 
 if (pimple.nCorrPIMPLE() <= 1)
 {
@@ -45,13 +45,13 @@ if (pimple.transonic())
           + fvc::div(phic)
           - fvm::laplacian(Dp, p)
          ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
         // Relax the pressure equation to maintain diagonal dominance
         pEqn.relax();
 
-        sources.constrain(pEqn);
+        fvOptions.constrain(pEqn);
 
         pEqn.solve();
 
@@ -86,10 +86,10 @@ else
           + fvc::div(phiHbyA)
           - fvm::laplacian(Dp, p)
          ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
-        sources.constrain(pEqn);
+        fvOptions.constrain(pEqn);
 
         pEqn.solve();
 
@@ -108,7 +108,7 @@ p.relax();
 
 U = HbyA - rAtU*fvc::grad(p);
 U.correctBoundaryConditions();
-sources.correct(U);
+fvOptions.correct(U);
 K = 0.5*magSqr(U);
 
 if (thermo.dpdt())

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

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

applications/solvers/compressible/rhoSimpleFoam/EEqn.H

@@ -11,16 +11,16 @@
         )
       - fvm::laplacian(turbulence->alphaEff(), he)
      ==
-        sources(rho, he)
+        fvOptions(rho, he)
     );
 
     EEqn.relax();
 
-    sources.constrain(EEqn);
+    fvOptions.constrain(EEqn);
 
     EEqn.solve();
 
-    sources.correct(he);
+    fvOptions.correct(he);
 
     thermo.correct();
 }

applications/solvers/compressible/rhoSimpleFoam/Make/options

@@ -6,7 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude
+    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
     -lfluidThermophysicalModels \
@@ -16,4 +16,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \
-    -lfieldSources
+    -lfvOptions

applications/solvers/compressible/rhoSimpleFoam/UEqn.H

@@ -5,13 +5,13 @@
         fvm::div(phi, U)
       + turbulence->divDevRhoReff(U)
      ==
-        sources(rho, U)
+        fvOptions(rho, U)
     );
 
     UEqn().relax();
 
-    sources.constrain(UEqn());
+    fvOptions.constrain(UEqn());
 
     solve(UEqn() == -fvc::grad(p));
 
-    sources.correct(U);
+    fvOptions.correct(U);

applications/solvers/compressible/rhoSimpleFoam/pEqn.H

@@ -20,7 +20,7 @@
             fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
         );
 
-        sources.relativeFlux(fvc::interpolate(psi), phid);
+        fvOptions.relativeFlux(fvc::interpolate(psi), phid);
 
         while (simple.correctNonOrthogonal())
         {
@@ -29,13 +29,13 @@
                 fvm::div(phid, p)
               - fvm::laplacian(rho*rAU, p)
               ==
-                sources(psi, p, rho.name())
+                fvOptions(psi, p, rho.name())
             );
 
             // Relax the pressure equation to ensure diagonal-dominance
             pEqn.relax();
 
-            sources.constrain(pEqn);
+            fvOptions.constrain(pEqn);
 
             pEqn.setReference(pRefCell, pRefValue);
 
@@ -55,7 +55,7 @@
             fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
         );
 
-        sources.relativeFlux(fvc::interpolate(rho), phiHbyA);
+        fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
 
         closedVolume = adjustPhi(phiHbyA, U, p);
 
@@ -66,12 +66,12 @@
                 fvc::div(phiHbyA)
               - fvm::laplacian(rho*rAU, p)
               ==
-                sources(psi, p, rho.name())
+                fvOptions(psi, p, rho.name())
             );
 
             pEqn.setReference(pRefCell, pRefValue);
 
-            sources.constrain(pEqn);
+            fvOptions.constrain(pEqn);
 
             pEqn.solve();
 
@@ -90,7 +90,7 @@
 
     U = HbyA - rAU*fvc::grad(p);
     U.correctBoundaryConditions();
-    sources.correct(U);
+    fvOptions.correct(U);
 
     // For closed-volume cases adjust the pressure and density levels
     // to obey overall mass continuity

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

@@ -11,16 +11,16 @@
         )
       - fvm::laplacian(turbulence->alphaEff(), he)
      ==
-        sources(rho, he)
+        fvOptions(rho, he)
     );
 
     EEqn.relax();
 
-    sources.constrain(EEqn);
+    fvOptions.constrain(EEqn);
 
     EEqn.solve();
 
-    sources.correct(he);
+    fvOptions.correct(he);
 
     thermo.correct();
 }

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options

@@ -7,7 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude
+    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
     -lfluidThermophysicalModels \
@@ -17,4 +17,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \
-    -lfieldSources
+    -lfvOptions

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

@@ -24,27 +24,27 @@
         trTU = inv(tTU());
         trTU().rename("rAU");
 
-        sources.constrain(UEqn());
+        fvOptions.constrain(UEqn());
 
         volVectorField gradp(fvc::grad(p));
 
         for (int UCorr=0; UCorr<nUCorr; UCorr++)
         {
-            U = trTU() & ((UEqn() == sources(rho, U))().H() - gradp);
+            U = trTU() & ((UEqn() == fvOptions(rho, U))().H() - gradp);
         }
         U.correctBoundaryConditions();
 
-        sources.correct(U);
+        fvOptions.correct(U);
     }
     else
     {
         pZones.addResistance(UEqn());
 
-        sources.constrain(UEqn());
+        fvOptions.constrain(UEqn());
 
-        solve(UEqn() == -fvc::grad(p) + sources(rho, U));
+        solve(UEqn() == -fvc::grad(p) + fvOptions(rho, U));
 
-        sources.correct(U);
+        fvOptions.correct(U);
 
         trAU = 1.0/UEqn().A();
         trAU().rename("rAU");

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

@@ -10,11 +10,11 @@
 
     if (pressureImplicitPorosity)
     {
-        HbyA = trTU() & (UEqn() == sources(rho, U))().H();
+        HbyA = trTU() & (UEqn() == fvOptions(rho, U))().H();
     }
     else
     {
-        HbyA = trAU()*(UEqn() == sources(rho, U))().H();
+        HbyA = trAU()*(UEqn() == fvOptions(rho, U))().H();
     }
 
     UEqn.clear();
@@ -40,7 +40,7 @@
             tpEqn =
             (
                 fvm::laplacian(rho*trTU(), p)
-              + sources(psi, p, rho.name())
+              + fvOptions(psi, p, rho.name())
              ==
                 fvc::div(phiHbyA)
             );
@@ -50,7 +50,7 @@
             tpEqn =
             (
                 fvm::laplacian(rho*trAU(), p)
-              + sources(psi, p, rho.name())
+              + fvOptions(psi, p, rho.name())
              ==
                 fvc::div(phiHbyA)
             );
@@ -58,7 +58,7 @@
 
         tpEqn().setReference(pRefCell, pRefValue);
 
-        sources.constrain(tpEqn(), rho.name());
+        fvOptions.constrain(tpEqn(), rho.name());
 
         tpEqn().solve();
 
@@ -83,7 +83,7 @@
     }
 
     U.correctBoundaryConditions();
-    sources.correct(U);
+    fvOptions.correct(U);
 
     // For closed-volume cases adjust the pressure and density levels
     // to obey overall mass continuity

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 #include "rhoThermo.H"
 #include "RASModel.H"
 #include "IOMRFZoneList.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 #include "IOporosityModelList.H"
 #include "simpleControl.H"
 
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     simpleControl simple(mesh);
 
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
     #include "createZones.H"
     #include "initContinuityErrs.H"
 

applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C

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

applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options

@@ -7,7 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude
+    -I$(LIB_SRC)/fvOptions/lnInclude
 
 EXE_LIBS = \
     -lfluidThermophysicalModels \
@@ -16,4 +16,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \
-    -lfieldSources
+    -lfvOptions

applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/pEqn.H

@@ -7,7 +7,7 @@ volScalarField rAU(1.0/UEqn().A());
 volScalarField rAtU(1.0/(1.0/rAU - UEqn().H1()));
 
 volVectorField HbyA("HbyA", U);
-HbyA = rAU*(UEqn() == sources(rho, U))().H();
+HbyA = rAU*(UEqn() == fvOptions(rho, U))().H();
 
 UEqn.clear();
 
@@ -39,13 +39,13 @@ if (simple.transonic())
           + fvc::div(phic)
           - fvm::laplacian(Dp, p)
          ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
         // Relax the pressure equation to maintain diagonal dominance
         pEqn.relax();
 
-        sources.constrain(pEqn);
+        fvOptions.constrain(pEqn);
 
         pEqn.setReference(pRefCell, pRefValue);
 
@@ -79,10 +79,10 @@ else
             fvc::div(phiHbyA)
           - fvm::laplacian(Dp, p)
           ==
-            sources(psi, p, rho.name())
+            fvOptions(psi, p, rho.name())
         );
 
-        sources.constrain(pEqn);
+        fvOptions.constrain(pEqn);
 
         pEqn.setReference(pRefCell, pRefValue);
 
@@ -104,7 +104,7 @@ p.relax();
 
 U = HbyA - rAtU*fvc::grad(p);
 U.correctBoundaryConditions();
-sources.correct(U);
+fvOptions.correct(U);
 
 // For closed-volume cases adjust the pressure and density levels
 // to obey overall mass continuity

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

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

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Description
 
     Valid when:
     \f[
-        rho_{k} << 1
+        \frac{beta(T - T_{ref})}{rho_{ref}} << 1
     \f]
 
 \*---------------------------------------------------------------------------*/

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,18 +29,18 @@ Description
 
     Uses the Boussinesq approximation:
     \f[
-        rho_{eff} = 1 - beta(T - T_{ref})
+        rho_{k} = 1 - beta(T - T_{ref})
     \f]
 
     where:
-        \f$ rho_{eff} \f$ = the effective (driving) density
+        \f$ rho_{k} \f$ = the effective (driving) density
         beta = thermal expansion coefficient [1/K]
         T = temperature [K]
         \f$ T_{ref} \f$ = reference temperature [K]
 
     Valid when:
     \f[
-        rho_{eff} << 1
+        \frac{beta(T - T_{ref})}{rho_{ref}} << 1
     \f]
 
 \*---------------------------------------------------------------------------*/

applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H

@@ -17,16 +17,16 @@
         )
       - fvm::laplacian(turbulence->alphaEff(), he)
      ==
-        sources(rho, he)
+        fvOptions(rho, he)
     );
 
     EEqn.relax();
 
-    sources.constrain(EEqn);
+    fvOptions.constrain(EEqn);
 
     EEqn.solve();
 
-    sources.correct(he);
+    fvOptions.correct(he);
 
     thermo.correct();
 }

applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options

@@ -2,7 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel
@@ -11,7 +11,7 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lsampling \
     -lmeshTools \
-    -lfieldSources \
+    -lfvOptions \
     -lfluidThermophysicalModels \
     -lradiationModels \
     -lspecie \

applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H

@@ -6,12 +6,12 @@
       + fvm::div(phi, U)
       + turbulence->divDevRhoReff(U)
      ==
-        sources(rho, U)
+        fvOptions(rho, U)
     );
 
     UEqn.relax();
 
-    sources.constrain(UEqn);
+    fvOptions.constrain(UEqn);
 
     if (pimple.momentumPredictor())
     {
@@ -28,6 +28,6 @@
             )
         );
 
-        sources.correct(U);
+        fvOptions.correct(U);
         K = 0.5*magSqr(U);
     }

applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Description
 #include "rhoThermo.H"
 #include "turbulenceModel.H"
 #include "radiationModel.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 #include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
     #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"

applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H

@@ -24,14 +24,14 @@
       + phig
     );
 
-    sources.relativeFlux(fvc::interpolate(rho), phiHbyA);
+    fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
 
     fvScalarMatrix p_rghDDtEqn
     (
         fvc::ddt(rho) + psi*correction(fvm::ddt(p_rgh))
       + fvc::div(phiHbyA)
       ==
-        sources(psi, p_rgh, rho.name())
+        fvOptions(psi, p_rgh, rho.name())
     );
 
     while (pimple.correctNonOrthogonal())
@@ -42,7 +42,7 @@
           - fvm::laplacian(rhorAUf, p_rgh)
         );
 
-        sources.constrain(p_rghEqn);
+        fvOptions.constrain(p_rghEqn);
 
         p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
@@ -58,7 +58,7 @@
             // calculated from the relaxed pressure
             U = HbyA + rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rhorAUf);
             U.correctBoundaryConditions();
-            sources.correct(U);
+            fvOptions.correct(U);
             K = 0.5*magSqr(U);
         }
     }

applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H

@@ -12,16 +12,16 @@
       - fvm::laplacian(turbulence->alphaEff(), he)
      ==
         radiation->Sh(thermo)
-      + sources(rho, he)
+      + fvOptions(rho, he)
     );
 
     EEqn.relax();
 
-    sources.constrain(EEqn);
+    fvOptions.constrain(EEqn);
 
     EEqn.solve();
 
-    sources.correct(he);
+    fvOptions.correct(he);
 
     thermo.correct();
     radiation->correct();

applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options

@@ -1,6 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@@ -11,7 +11,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lfieldSources \
+    -lfvOptions \
     -lsampling \
     -lmeshTools \
     -lfluidThermophysicalModels \

applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H

@@ -5,12 +5,12 @@
         fvm::div(phi, U)
       + turbulence->divDevRhoReff(U)
      ==
-        sources(rho, U)
+        fvOptions(rho, U)
     );
 
     UEqn().relax();
 
-    sources.constrain(UEqn());
+    fvOptions.constrain(UEqn());
 
     if (simple.momentumPredictor())
     {
@@ -27,5 +27,5 @@
             )
         );
 
-        sources.correct(U);
+        fvOptions.correct(U);
     }

applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ Description
 #include "RASModel.H"
 #include "radiationModel.H"
 #include "simpleControl.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
     #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
 

applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H

@@ -17,7 +17,7 @@
         fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
     );
 
-    sources.relativeFlux(fvc::interpolate(rho), phiHbyA);
+    fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
 
     bool closedVolume = adjustPhi(phiHbyA, U, p_rgh);
 
@@ -45,7 +45,7 @@
             // calculated from the relaxed pressure
             U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rhorAUf);
             U.correctBoundaryConditions();
-            sources.correct(U);
+            fvOptions.correct(U);
         }
     }
 

applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options

@@ -15,7 +15,7 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
     -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
 
 
@@ -28,6 +28,6 @@ EXE_LIBS = \
     -lmeshTools \
     -lfiniteVolume \
     -lradiationModels \
-    -lfieldSources \
+    -lfvOptions \
     -lregionModels \
     -lsampling

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ Description
 #include "solidRegionDiffNo.H"
 #include "solidThermo.H"
 #include "radiationModel.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options

@@ -12,7 +12,7 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
 
@@ -25,6 +25,6 @@ EXE_LIBS = \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
     -lradiationModels \
-    -lfieldSources \
+    -lfvOptions \
     -lregionModels \
     -lsampling

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Description
 #include "regionProperties.H"
 #include "solidThermo.H"
 #include "radiationModel.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

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

@@ -12,16 +12,16 @@
       - fvm::laplacian(turb.alphaEff(), he)
      ==
         rad.Sh(thermo)
-      + sources(rho, he)
+      + fvOptions(rho, he)
     );
 
     EEqn.relax();
 
-    sources.constrain(EEqn);
+    fvOptions.constrain(EEqn);
 
     EEqn.solve();
 
-    sources.correct(he);
+    fvOptions.correct(he);
 
     thermo.correct();
     rad.correct();

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

@@ -4,12 +4,12 @@
         fvm::div(phi, U)
       + turb.divDevRhoReff(U)
      ==
-        sources(rho, U)
+        fvOptions(rho, U)
     );
 
     UEqn().relax();
 
-    sources.constrain(UEqn());
+    fvOptions.constrain(UEqn());
 
     solve
     (
@@ -24,4 +24,4 @@
         )
     );
 
-    sources.correct(U);
+    fvOptions.correct(U);

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

@@ -17,7 +17,7 @@
     PtrList<dimensionedScalar> rhoMax(fluidRegions.size());
     PtrList<dimensionedScalar> rhoMin(fluidRegions.size());
 
-    PtrList<IObasicSourceList> fluidSources(fluidRegions.size());
+    PtrList<fv::IOoptionList> fluidFvOptions(fluidRegions.size());
 
     // Populate fluid field pointer lists
     forAll(fluidRegions, i)
@@ -193,11 +193,11 @@
             )
         );
 
-        Info<< "    Adding sources\n" << endl;
+        Info<< "    Adding fvOptions\n" << endl;
-        fluidSources.set
+        fluidFvOptions.set
         (
             i,
-            new IObasicSourceList(fluidRegions[i])
+            new fv::IOoptionList(fluidRegions[i])
         );
     }
 

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

@@ -23,7 +23,7 @@
 
     phiHbyA += phig;
 
-    sources.relativeFlux(fvc::interpolate(rho), phiHbyA);
+    fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
 
     dimensionedScalar compressibility = fvc::domainIntegrate(psi);
     bool compressible = (compressibility.value() > SMALL);
@@ -56,7 +56,7 @@
             // calculated from the relaxed pressure
             U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rhorAUf);
             U.correctBoundaryConditions();
-            sources.correct(U);
+            fvOptions.correct(U);
         }
     }
 

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

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

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

@@ -4,16 +4,16 @@
         fvScalarMatrix hEqn
         (
            - fvm::laplacian(betav*alpha, h, "laplacian(alpha,h)")
-           + sources(rho, h)
+           + fvOptions(rho, h)
         );
 
         hEqn.relax();
 
-        sources.constrain(hEqn);
+        fvOptions.constrain(hEqn);
 
         hEqn.solve();
 
-        sources.correct(h);
+        fvOptions.correct(h);
     }
 }
 

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

@@ -18,16 +18,16 @@
       - fvm::laplacian(turb.alphaEff(), he)
      ==
         rad.Sh(thermo)
-      + sources(rho, he)
+      + fvOptions(rho, he)
     );
 
     EEqn.relax();
 
-    sources.constrain(EEqn);
+    fvOptions.constrain(EEqn);
 
     EEqn.solve(mesh.solver(he.select(finalIter)));
 
-    sources.correct(he);
+    fvOptions.correct(he);
 
     thermo.correct();
     rad.correct();

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

@@ -4,12 +4,12 @@
         fvm::ddt(rho, U)
       + fvm::div(phi, U)
       + turb.divDevRhoReff(U)
-      + sources(rho, U)
+      + fvOptions(rho, U)
     );
 
     UEqn().relax();
 
-    sources.constrain(UEqn());
+    fvOptions.constrain(UEqn());
 
     if (momentumPredictor)
     {
@@ -27,6 +27,6 @@
             mesh.solver(U.select(finalIter))
         );
 
-        sources.correct(U);
+        fvOptions.correct(U);
         K = 0.5*magSqr(U);
     }

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

@@ -14,7 +14,7 @@
 
     List<scalar> initialMassFluid(fluidRegions.size());
 
-    PtrList<IObasicSourceList> fluidSources(fluidRegions.size());
+    PtrList<fv::IOoptionList> fluidFvOptions(fluidRegions.size());
 
     // Populate fluid field pointer lists
     forAll(fluidRegions, i)
@@ -190,10 +190,10 @@
             )
         );
 
-        Info<< "    Adding sources\n" << endl;
+        Info<< "    Adding fvOptions\n" << endl;
-        fluidSources.set
+        fluidFvOptions.set
         (
             i,
-            new IObasicSourceList(fluidRegions[i])
+            new fv::IOoptionList(fluidRegions[i])
         );
     }

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

@@ -24,7 +24,7 @@
       + phig
     );
 
-    sources.relativeFlux(fvc::interpolate(rho), phiHbyA);
+    fvOptions.relativeFlux(fvc::interpolate(rho), phiHbyA);
 
     {
         fvScalarMatrix p_rghDDtEqn
@@ -66,7 +66,7 @@
                 U = HbyA
                   + rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rhorAUf);
                 U.correctBoundaryConditions();
-                sources.correct(U);
+                fvOptions.correct(U);
                 K = 0.5*magSqr(U);
             }
         }

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

@@ -20,7 +20,7 @@
 
     radiation::radiationModel& rad = radiation[i];
 
-    IObasicSourceList& sources = fluidSources[i];
+    fv::IOoptionList& fvOptions = fluidFvOptions[i];
 
     const dimensionedScalar initialMass
     (

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

@@ -1,7 +1,7 @@
     // Initialise solid field pointer lists
     PtrList<solidThermo> thermos(solidRegions.size());
     PtrList<radiation::radiationModel> radiations(solidRegions.size());
-    PtrList<IObasicSourceList> solidHeatSources(solidRegions.size());
+    PtrList<fv::IOoptionList> solidHeatSources(solidRegions.size());
     PtrList<volScalarField> betavSolid(solidRegions.size());
 
     // Populate solid field pointer lists
@@ -16,11 +16,11 @@
         Info<< "    Adding to radiations\n" << endl;
         radiations.set(i, radiation::radiationModel::New(thermos[i].T()));
 
-        Info<< "    Adding sources\n" << endl;
+        Info<< "    Adding fvOptions\n" << endl;
         solidHeatSources.set
         (
             i,
-            new IObasicSourceList(solidRegions[i])
+            new fv::IOoptionList(solidRegions[i])
         );
 
         IOobject betavSolidIO

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

@@ -17,4 +17,4 @@
 
     const volScalarField& betav = betavSolid[i];
 
-    IObasicSourceList& sources = solidHeatSources[i];
+    fv::IOoptionList& fvOptions = solidHeatSources[i];

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

@@ -11,16 +11,16 @@ if (finalIter)
             fvm::ddt(betav*rho, h)
           - fvm::laplacian(betav*alpha, h, "laplacian(alpha,h)")
           ==
-            sources(rho, h)
+            fvOptions(rho, h)
         );
 
         hEqn().relax();
 
-        sources.constrain(hEqn());
+        fvOptions.constrain(hEqn());
 
         hEqn().solve(mesh.solver(h.select(finalIter)));
 
-        sources.correct(h);
+        fvOptions.correct(h);
     }
 }
 

applications/solvers/incompressible/pimpleFoam/Make/options

@@ -4,7 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 
@@ -15,5 +15,5 @@ EXE_LIBS = \
     -lincompressibleLESModels \
     -lfiniteVolume \
     -lmeshTools \
-    -lfieldSources \
+    -lfvOptions \
     -lsampling

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options

@@ -4,7 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
@@ -14,5 +14,5 @@ EXE_LIBS = \
     -lincompressibleLESModels \
     -lfiniteVolume \
     -lmeshTools \
-    -lfieldSources \
+    -lfvOptions \
     -lsampling

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

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

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

@@ -9,8 +9,8 @@
 
     UrelEqn().relax();
 
-    sources.constrain(UrelEqn());
+    fvOptions.constrain(UrelEqn());
 
-    solve(UrelEqn() == -fvc::grad(p) + sources(Urel));
+    solve(UrelEqn() == -fvc::grad(p) + fvOptions(Urel));
 
-    sources.correct(Urel);
+    fvOptions.correct(Urel);

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

@@ -1,6 +1,6 @@
 volScalarField rAUrel(1.0/UrelEqn().A());
 volVectorField HbyA("HbyA", Urel);
-HbyA = rAUrel*(UrelEqn() == sources(Urel))().H();
+HbyA = rAUrel*(UrelEqn() == fvOptions(Urel))().H();
 
 if (pimple.nCorrPISO() <= 1)
 {
@@ -42,4 +42,4 @@ p.relax();
 // Momentum corrector
 Urel = HbyA - rAUrel*fvc::grad(p);
 Urel.correctBoundaryConditions();
-sources.correct(Urel);
+fvOptions.correct(Urel);

applications/solvers/incompressible/pimpleFoam/UEqn.H

@@ -6,12 +6,12 @@ tmp<fvVectorMatrix> UEqn
   + fvm::div(phi, U)
   + turbulence->divDevReff(U)
  ==
-    sources(U)
+    fvOptions(U)
 );
 
 UEqn().relax();
 
-sources.constrain(UEqn());
+fvOptions.constrain(UEqn());
 
 volScalarField rAU(1.0/UEqn().A());
 
@@ -19,5 +19,5 @@ if (pimple.momentumPredictor())
 {
     solve(UEqn() == -fvc::grad(p));
 
-    sources.correct(U);
+    fvOptions.correct(U);
 }

applications/solvers/incompressible/pimpleFoam/pEqn.H

@@ -15,7 +15,7 @@ surfaceScalarField phiHbyA
 
 adjustPhi(phiHbyA, U, p);
 
-sources.relativeFlux(phiHbyA);
+fvOptions.relativeFlux(phiHbyA);
 
 // Non-orthogonal pressure corrector loop
 while (pimple.correctNonOrthogonal())
@@ -43,4 +43,4 @@ p.relax();
 
 U = HbyA - rAU*fvc::grad(p);
 U.correctBoundaryConditions();
-sources.correct(U);
+fvOptions.correct(U);

applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options

@@ -7,7 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/fieldSources/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 
 
@@ -21,5 +21,5 @@ EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
     -lfiniteVolume \
-    -lfieldSources \
+    -lfvOptions \
     -lsampling

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

@@ -9,13 +9,13 @@ tmp<fvVectorMatrix> UEqn
 
 UEqn().relax();
 
-sources.constrain(UEqn());
+fvOptions.constrain(UEqn());
 
 rAU = 1.0/UEqn().A();
 
 if (pimple.momentumPredictor())
 {
-    solve(UEqn() == -fvc::grad(p) + sources(U));
+    solve(UEqn() == -fvc::grad(p) + fvOptions(U));
 
-    sources.correct(U);
+    fvOptions.correct(U);
 }

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

@@ -1,5 +1,5 @@
 volVectorField HbyA("HbyA", U);
-HbyA = rAU*(UEqn() == sources(U))().H();
+HbyA = rAU*(UEqn() == fvOptions(U))().H();
 
 if (pimple.nCorrPISO() <= 1)
 {
@@ -51,4 +51,4 @@ fvc::makeRelative(phi, U);
 
 U = HbyA - rAU*fvc::grad(p);
 U.correctBoundaryConditions();
-sources.correct(U);
+fvOptions.correct(U);

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

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

applications/solvers/incompressible/pimpleFoam/pimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ Description
 
     Sub-models include:
     - turbulence modelling, i.e. laminar, RAS or LES
-    - run-time selectable sources, e.g. MRF, explicit porosity
+    - run-time selectable fvOptions, e.g. MRF, explicit porosity
 
 \*---------------------------------------------------------------------------*/
 
@@ -38,7 +38,7 @@ Description
 #include "singlePhaseTransportModel.H"
 #include "turbulenceModel.H"
 #include "pimpleControl.H"
-#include "IObasicSourceList.H"
+#include "fvIOoptionList.H"
 #include "IOporosityModelList.H"
 #include "IOMRFZoneList.H"
 
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
-    #include "createSources.H"
+    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     pimpleControl pimple(mesh);