ENH: setFields : all face sets to set patch values

2010-10-15 15:41:32 +01:00 · 2010-10-15 15:41:32 +01:00 · b31f8894aa
commit b31f8894aa
parent 1526db114b
46 changed files with 446 additions and 44 deletions
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@ -22,7 +22,7 @@ License
    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.

 Description
-    Selects a cell set through a dictionary.
+    Set values on a selected set of cells/patchfaces through a dictionary.

 \*---------------------------------------------------------------------------*/

@ -32,12 +32,13 @@ Description
 #include "fvMesh.H"
 #include "topoSetSource.H"
 #include "cellSet.H"
+#include "faceSet.H"
 #include "volFields.H"

 using namespace Foam;

 template<class Type>
-bool setFieldType
+bool setCellFieldType
 (
    const word& fieldTypeDesc,
    const fvMesh& mesh,
@ -65,7 +66,8 @@ bool setFieldType
    // Check field exists
    if (fieldHeader.headerOk())
    {
-        Info<< "    Setting " << fieldHeader.headerClassName()
+        Info<< "    Setting internal values of "
+            << fieldHeader.headerClassName()
            << " " << fieldName << endl;

        fieldType field(fieldHeader, mesh);
@ -96,7 +98,7 @@ bool setFieldType
    {
        WarningIn
        (
-            "void setFieldType"
+            "void setCellFieldType"
            "(const fvMesh& mesh, const labelList& selectedCells,"
            "Istream& fieldValueStream)"
        ) << "Field " << fieldName << " not found" << endl;
@ -106,17 +108,17 @@ bool setFieldType
 }


-class setField
+class setCellField
 {

 public:

-    setField()
+    setCellField()
    {}

-    autoPtr<setField> clone() const
+    autoPtr<setCellField> clone() const
    {
-        return autoPtr<setField>(new setField());
+        return autoPtr<setCellField>(new setCellField());
    }

    class iNew
@ -132,37 +134,200 @@ public:
            selectedCells_(selectedCells)
        {}

-        autoPtr<setField> operator()(Istream& fieldValues) const
+        autoPtr<setCellField> operator()(Istream& fieldValues) const
        {
            word fieldType(fieldValues);

            if
            (
               !(
-                    setFieldType<scalar>
+                    setCellFieldType<scalar>
                        (fieldType, mesh_, selectedCells_, fieldValues)
-                 || setFieldType<vector>
+                 || setCellFieldType<vector>
                        (fieldType, mesh_, selectedCells_, fieldValues)
-                 || setFieldType<sphericalTensor>
+                 || setCellFieldType<sphericalTensor>
                        (fieldType, mesh_, selectedCells_, fieldValues)
-                 || setFieldType<symmTensor>
+                 || setCellFieldType<symmTensor>
                        (fieldType, mesh_, selectedCells_, fieldValues)
-                 || setFieldType<tensor>
+                 || setCellFieldType<tensor>
                        (fieldType, mesh_, selectedCells_, fieldValues)
                )
            )
            {
-                WarningIn("setField::iNew::operator()(Istream& is)")
+                WarningIn("setCellField::iNew::operator()(Istream& is)")
                    << "field type " << fieldType << " not currently supported"
                    << endl;
            }

-            return autoPtr<setField>(new setField());
+            return autoPtr<setCellField>(new setCellField());
        }
    };
 };


+template<class Type>
+bool setFaceFieldType
+(
+    const word& fieldTypeDesc,
+    const fvMesh& mesh,
+    const labelList& selectedFaces,
+    Istream& fieldValueStream
+)
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+
+    if (fieldTypeDesc != fieldType::typeName + "Value")
+    {
+        return false;
+    }
+
+    word fieldName(fieldValueStream);
+
+    IOobject fieldHeader
+    (
+        fieldName,
+        mesh.time().timeName(),
+        mesh,
+        IOobject::MUST_READ
+    );
+
+    // Check field exists
+    if (fieldHeader.headerOk())
+    {
+        Info<< "    Setting patchField values of "
+            << fieldHeader.headerClassName()
+            << " " << fieldName << endl;
+
+        fieldType field(fieldHeader, mesh);
+
+        const Type& value = pTraits<Type>(fieldValueStream);
+
+        // Create flat list of selected faces and their value.
+        Field<Type> allBoundaryValues(mesh.nFaces()-mesh.nInternalFaces());
+        forAll(field.boundaryField(), patchi)
+        {
+            SubField<Type>
+            (
+                allBoundaryValues,
+                field.boundaryField()[patchi].size(),
+                field.boundaryField()[patchi].patch().start()
+              - mesh.nInternalFaces()
+            ).assign(field.boundaryField()[patchi]);
+        }
+
+        // Override
+        labelList nChanged(field.boundaryField().size(), 0);
+        forAll(selectedFaces, i)
+        {
+            label facei = selectedFaces[i];
+            if (mesh.isInternalFace(facei))
+            {
+                WarningIn("setFaceFieldType(..)")
+                    << "Ignoring internal face " << facei << endl;
+            }
+            else
+            {
+                label bFaceI = facei-mesh.nInternalFaces();
+                allBoundaryValues[bFaceI] = value;
+                nChanged[mesh.boundaryMesh().patchID()[bFaceI]]++;
+            }
+        }
+
+        Pstream::listCombineGather(nChanged, plusEqOp<label>());
+        Pstream::listCombineScatter(nChanged);
+
+        // Reassign.
+        forAll(field.boundaryField(), patchi)
+        {
+            if (nChanged[patchi] > 0)
+            {
+                Info<< "    On patch "
+                    << field.boundaryField()[patchi].patch().name()
+                    << " set " << nChanged[patchi] << " values" << endl;
+                field.boundaryField()[patchi] == SubField<Type>
+                (
+                    allBoundaryValues,
+                    field.boundaryField()[patchi].size(),
+                    field.boundaryField()[patchi].patch().start()
+                  - mesh.nInternalFaces()
+                );
+            }
+        }
+
+        field.write();
+    }
+    else
+    {
+        WarningIn
+        (
+            "void setFaceFieldType"
+            "(const fvMesh& mesh, const labelList& selectedFaces,"
+            "Istream& fieldValueStream)"
+        ) << "Field " << fieldName << " not found" << endl;
+    }
+
+    return true;
+}
+
+
+class setFaceField
+{
+
+public:
+
+    setFaceField()
+    {}
+
+    autoPtr<setFaceField> clone() const
+    {
+        return autoPtr<setFaceField>(new setFaceField());
+    }
+
+    class iNew
+    {
+        const fvMesh& mesh_;
+        const labelList& selectedFaces_;
+
+    public:
+
+        iNew(const fvMesh& mesh, const labelList& selectedFaces)
+        :
+            mesh_(mesh),
+            selectedFaces_(selectedFaces)
+        {}
+
+        autoPtr<setFaceField> operator()(Istream& fieldValues) const
+        {
+            word fieldType(fieldValues);
+
+            if
+            (
+               !(
+                    setFaceFieldType<scalar>
+                        (fieldType, mesh_, selectedFaces_, fieldValues)
+                 || setFaceFieldType<vector>
+                        (fieldType, mesh_, selectedFaces_, fieldValues)
+                 || setFaceFieldType<sphericalTensor>
+                        (fieldType, mesh_, selectedFaces_, fieldValues)
+                 || setFaceFieldType<symmTensor>
+                        (fieldType, mesh_, selectedFaces_, fieldValues)
+                 || setFaceFieldType<tensor>
+                        (fieldType, mesh_, selectedFaces_, fieldValues)
+                )
+            )
+            {
+                WarningIn("setFaceField::iNew::operator()(Istream& is)")
+                    << "field type " << fieldType << " not currently supported"
+                    << endl;
+            }
+
+            return autoPtr<setFaceField>(new setFaceField());
+        }
+    };
+};
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 int main(int argc, char *argv[])
@ -194,10 +359,10 @@ int main(int argc, char *argv[])
    if (setFieldsDict.found("defaultFieldValues"))
    {
        Info<< "Setting field default values" << endl;
-        PtrList<setField> defaultFieldValues
+        PtrList<setCellField> defaultFieldValues
        (
            setFieldsDict.lookup("defaultFieldValues"),
-            setField::iNew(mesh, labelList(mesh.nCells()))
+            setCellField::iNew(mesh, labelList(mesh.nCells()))
        );
        Info<< endl;
    }
@ -211,29 +376,54 @@ int main(int argc, char *argv[])
    {
        const entry& region = regions[regionI];

-        autoPtr<topoSetSource> cellSelector =
+        autoPtr<topoSetSource> source =
            topoSetSource::New(region.keyword(), mesh, region.dict());

-        cellSet selectedCellSet
-        (
-            mesh,
-            "cellSet",
-            mesh.nCells()/10+1  // Reasonable size estimate.
-        );
+        if (source().setType() == topoSetSource::CELLSETSOURCE)
+        {
+            cellSet selectedCellSet
+            (
+                mesh,
+                "cellSet",
+                mesh.nCells()/10+1  // Reasonable size estimate.
+            );

-        cellSelector->applyToSet
-        (
-            topoSetSource::NEW,
-            selectedCellSet
-        );
+            source->applyToSet
+            (
+                topoSetSource::NEW,
+                selectedCellSet
+            );

-        PtrList<setField> fieldValues
-        (
-            region.dict().lookup("fieldValues"),
-            setField::iNew(mesh, selectedCellSet.toc())
-        );
+            PtrList<setCellField> fieldValues
+            (
+                region.dict().lookup("fieldValues"),
+                setCellField::iNew(mesh, selectedCellSet.toc())
+            );
+        }
+        else if (source().setType() == topoSetSource::FACESETSOURCE)
+        {
+            faceSet selectedFaceSet
+            (
+                mesh,
+                "faceSet",
+                (mesh.nFaces()-mesh.nInternalFaces())/10+1
+            );
+
+            source->applyToSet
+            (
+                topoSetSource::NEW,
+                selectedFaceSet
+            );
+
+            PtrList<setFaceField> fieldValues
+            (
+                region.dict().lookup("fieldValues"),
+                setFaceField::iNew(mesh, selectedFaceSet.toc())
+            );
+        }
    }

+
    Info<< "\nEnd\n" << endl;

    return 0;
--- a/applications/utilities/preProcessing/setFields/setFieldsDict
+++ b/applications/utilities/preProcessing/setFields/setFieldsDict
@ -23,6 +23,8 @@ defaultFieldValues

 regions
 (
+    // Set cell values
+    // (does zerogradient on boundaries)
    boxToCell
    {
        box (0 0 -1) (0.1461 0.292 1);
@ -32,6 +34,17 @@ regions
            volScalarFieldValue gamma 1
        );
    }
+
+    // Set patch values (using ==)
+    boxToFace
+    {
+        box (0 0 -1) (0.1461 0.292 1);
+
+        fieldValues
+        (
+            volScalarFieldValue gamma 1
+        );
+    }
 );

 // ************************************************************************* //
--- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H
+++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H
@ -102,6 +102,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H
+++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H
@ -93,6 +93,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H
+++ b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H
@ -109,6 +109,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
@ -119,6 +119,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
+++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
@ -116,6 +116,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H
+++ b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H
@ -115,6 +115,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/labelToCell/labelToCell.H
+++ b/src/meshTools/sets/cellSources/labelToCell/labelToCell.H
@ -100,6 +100,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H
+++ b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H
@ -101,6 +101,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H
+++ b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H
@ -100,6 +100,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
@ -115,6 +115,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
+++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
@ -105,6 +105,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet(const topoSetSource::setAction action, topoSet&)
         const;

--- a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H
+++ b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H
@ -111,6 +111,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H
+++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H
@ -109,6 +109,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H
+++ b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H
@ -105,6 +105,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
+++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
@ -195,6 +195,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H
+++ b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H
@ -101,6 +101,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H
+++ b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H
@ -93,6 +93,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return CELLZONESOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H
+++ b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H
@ -92,6 +92,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H
+++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H
@ -101,6 +101,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
@ -120,6 +120,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H
+++ b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H
@ -93,6 +93,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/faceSources/labelToFace/labelToFace.H
+++ b/src/meshTools/sets/faceSources/labelToFace/labelToFace.H
@ -100,6 +100,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
@ -98,6 +98,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H
+++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H
@ -101,6 +101,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
@ -118,6 +118,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H
+++ b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H
@ -101,6 +101,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return FACESETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H
@ -93,6 +93,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return FACEZONESOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H
@ -94,6 +94,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return FACEZONESOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
@ -97,6 +97,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return FACEZONESOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H
+++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H
@ -101,6 +101,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
@ -115,6 +115,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
@ -115,6 +115,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H
+++ b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H
@ -100,6 +100,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H
+++ b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H
@ -100,6 +100,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H
+++ b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H
@ -93,6 +93,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
+++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
@ -123,6 +123,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H
+++ b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H
@ -101,6 +101,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return POINTSETSOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H
+++ b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H
@ -93,6 +93,11 @@ public:

    // Member Functions

+        virtual sourceType setType() const
+        {
+            return POINTZONESOURCE;
+        }
+
        virtual void applyToSet
        (
            const topoSetSource::setAction action,
--- a/src/meshTools/sets/topoSetSource/topoSetSource.H
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.H
@ -67,6 +67,18 @@ public:

    // Public data types

+        //- Enumeration defining the types of sources
+        enum sourceType
+        {
+            CELLSETSOURCE,
+            FACESETSOURCE,
+            POINTSETSOURCE,
+
+            CELLZONESOURCE,
+            FACEZONESOURCE,
+            POINTZONESOURCE
+        };
+
        //- Enumeration defining the valid actions
        enum setAction
        {
@ -268,6 +280,8 @@ public:

    // Member Functions

+        virtual sourceType setType() const = 0;
+
        virtual void applyToSet(const setAction action, topoSet&) const = 0;

 };
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun
@ -6,10 +6,9 @@ cd ${0%/*} || exit 1    # run from this directory

 application=`getApplication`

-compileApplication ../../buoyantPimpleFoam/hotRoom/setHotRoom
 runApplication blockMesh
 cp 0/T.org 0/T
-runApplication setHotRoom
+runApplication setFields
 runApplication $application

 # ----------------------------------------------------------------- end-of-file
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
@ -6,10 +6,9 @@ cd ${0%/*} || exit 1    # run from this directory

 application=`getApplication`

-compileApplication ../../buoyantPimpleFoam/hotRoom/setHotRoom
 runApplication blockMesh
 cp 0/T.org 0/T
-runApplication setHotRoom
+runApplication setFields
 runApplication $application

 # ----------------------------------------------------------------- end-of-file
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean
@ -6,6 +6,5 @@ cd ${0%/*} || exit 1    # run from this directory

 cleanCase
 cp 0/T.org 0/T
-wclean setHotRoom

 # ----------------------------------------------------------------- end-of-file
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun
@ -7,9 +7,8 @@ cd ${0%/*} || exit 1    # run from this directory
 # Get application name
 application=`getApplication`

-compileApplication setHotRoom
 runApplication blockMesh
-runApplication setHotRoom
+runApplication setFields
 runApplication $application

 # ----------------------------------------------------------------- end-of-file
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
@ -6,9 +6,8 @@ cd ${0%/*} || exit 1    # run from this directory

 application=`getApplication`

-compileApplication ../../buoyantPimpleFoam/hotRoom/setHotRoom
 runApplication blockMesh
-runApplication setHotRoom
+runApplication setFields
 runApplication $application

 # ----------------------------------------------------------------- end-of-file