From ea608961c5125b011a9607f8c57a7bb8639ad7fc Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 8 Jan 2013 09:45:23 +0000
Subject: [PATCH] ENH: Updated scalarTransport function object

---
 .../functionObjects/utilities/Make/options             |  4 ++--
 .../utilities/scalarTransport/scalarTransport.C        | 10 +++++-----
 .../utilities/scalarTransport/scalarTransport.H        |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options
index 38f9d8a3a0..a561f6ca13 100644
--- a/src/postProcessing/functionObjects/utilities/Make/options
+++ b/src/postProcessing/functionObjects/utilities/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)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/dsmc/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -14,7 +14,7 @@ EXE_INC = \
 
 LIB_LIBS = \
     -lfiniteVolume \
-    -lfieldSources \
+    -lfvOptions \
     -lmeshTools \
     -lsampling \
     -llagrangian \
diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
index 69e7f1c554..9a2f655624 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.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
@@ -151,7 +151,7 @@ Foam::scalarTransport::scalarTransport
     resetOnStartUp_(false),
     nCorr_(0),
     autoSchemes_(false),
-    sources_(mesh_),
+    fvOptions_(mesh_),
     T_
     (
         IOobject
@@ -205,7 +205,7 @@ void Foam::scalarTransport::read(const dictionary& dict)
 
         dict.lookup("autoSchemes") >> autoSchemes_;
 
-        sources_.reset(dict.subDict("sources"));
+        fvOptions_.reset(dict.subDict("fvOptions"));
     }
 }
 
@@ -246,12 +246,12 @@ void Foam::scalarTransport::execute()
           + fvm::div(phi, T_, divScheme)
           - fvm::laplacian(DT, T_, laplacianScheme)
          ==
-            sources_(T_)
+            fvOptions_(T_)
         );
 
         TEqn.relax(relaxCoeff);
 
-        sources_.constrain(TEqn);
+        fvOptions_.constrain(TEqn);
 
         TEqn.solve(mesh_.solverDict(UName_));
     }
diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
index c948d9d6d2..fdeecdf360 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
@@ -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
@@ -55,7 +55,7 @@ SeeAlso
 #include "surfaceFieldsFwd.H"
 #include "pointFieldFwd.H"
 #include "fvMatricesFwd.H"
-#include "basicSourceList.H"
+#include "fvOptionList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -105,8 +105,8 @@ class scalarTransport
         //- Flag to employ schemes for velocity for scalar transport
         bool autoSchemes_;
 
-        //- Run-time selectable sources
-        basicSourceList sources_;
+        //- Run-time selectable finite volume options, e.g. sources, constraints
+        fv::optionList fvOptions_;
 
         //- The scalar field
         volScalarField T_;