ENH: Adding eddyDissipationDiffusionModel, thermocouple probe and thermocoupleTestCase

src/sampling/Make/options

@@ -8,6 +8,7 @@ EXE_INC = \
     -I$(LIB_SRC)/conversion/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
+
 LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \

src/sampling/probes/patchProbes.C

@@ -232,24 +232,6 @@ Foam::patchProbes::patchProbes
 }
 
 
-Foam::patchProbes::patchProbes
-(
-    const word& name,
-    const objectRegistry& obr,
-    const dictionary& dict,
-    const bool loadFromFiles,
-    const bool readFields
-)
-:
-    probes(name, obr, dict, loadFromFiles, false)
-{
-    if (readFields)
-    {
-        read(dict);
-    }
-}
-
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::patchProbes::~patchProbes()

src/sampling/probes/patchProbes.H

@@ -172,18 +172,6 @@ public:
             const bool readFields = true
         );
 
-        //- Construct for given objectRegistry and dictionary.
-        //  Allow the possibility to load fields from files
-        patchProbes
-        (
-            const word& name,
-            const objectRegistry&,
-            const dictionary&,
-            const bool loadFromFiles = false,
-            const bool readFields = true
-        );
-
-
     //- Destructor
     virtual ~patchProbes();
 

src/sampling/probes/probes.C

@@ -273,7 +273,7 @@ Foam::probes::probes
     const bool readFields
 )
 :
-    functionObject(name),
+    stateFunctionObject(name, runTime),
     pointField(0),
     mesh_
     (
@@ -296,31 +296,6 @@ Foam::probes::probes
     }
 }
 
-
-Foam::probes::probes
-(
-    const word& name,
-    const objectRegistry& obr,
-    const dictionary& dict,
-    const bool loadFromFiles,
-    const bool readFields
-)
-:
-    functionObject(name),
-    pointField(0),
-    mesh_(refCast<const fvMesh>(obr)),
-    loadFromFiles_(loadFromFiles),
-    fieldSelection_(),
-    fixedLocations_(true),
-    interpolationScheme_("cell")
-{
-    if (readFields)
-    {
-        read(dict);
-    }
-}
-
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::probes::~probes()

src/sampling/probes/probes.H

@@ -73,7 +73,7 @@ SourceFiles
 #ifndef probes_H
 #define probes_H
 
-#include "functionObject.H"
+#include "stateFunctionObject.H"
 #include "HashPtrTable.H"
 #include "OFstream.H"
 #include "polyMesh.H"
@@ -83,6 +83,8 @@ SourceFiles
 #include "surfaceMesh.H"
 #include "wordReList.H"
 
+using namespace Foam::functionObjects;
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -101,7 +103,7 @@ class mapPolyMesh;
 
 class probes
 :
-    public functionObject,
+    public stateFunctionObject,
     public pointField
 {
 protected:
@@ -241,17 +243,6 @@ public:
             const bool readFields = true
         );
 
-        //- Construct for given objectRegistry and dictionary.
-        //  Allow the possibility to load fields from files
-        probes
-        (
-            const word& name,
-            const objectRegistry& obr,
-            const dictionary& dict,
-            const bool loadFromFiles = false,
-            const bool readFields = true
-        );
-
 
     //- Destructor
     virtual ~probes();