Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

ReleaseNotes-dev

@@ -309,3 +309,8 @@
 * Other
   + compilable with =clang=
     In your prefs.sh set the WM_COMPILER to Clang
+  + dlclose error: upon exit of e.g. paraFoam you can get the error
+    Inconsistency detected by ld.so: dl-close.c: 731: _dl_close: Assertion
+    `map->l_init_called' failed!
+    This seems to happen with a mix of system libraries and a thirdParty
+    compiler.

applications/solvers/basic/potentialFoam/createFields.H

@@ -47,4 +47,10 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell
+    (
+        p,
+        potentialFlow,
+        pRefCell,
+        pRefValue
+    );

applications/solvers/basic/potentialFoam/potentialFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,8 +42,8 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
+    #include "readControls.H"
     #include "createFields.H"
-    #include "readSIMPLEControls.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/solvers/basic/potentialFoam/readControls.H

@@ -0,0 +1,6 @@
+    const dictionary& potentialFlow =
+        mesh.solutionDict().subDict("potentialFlow");
+
+    const int nNonOrthCorr =
+        potentialFlow.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
+

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H

@@ -19,7 +19,7 @@
         pimple.lookupOrDefault<scalar>("maxDeltaT", GREAT)
     );
 
-    volScalarField rDeltaT0 = rDeltaT;
+    volScalarField rDeltaT0("rDeltaT0", rDeltaT);
 
     // Set the reciprocal time-step from the local Courant number
     rDeltaT.dimensionedInternalField() = max

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H

@@ -3,7 +3,7 @@
 tmp<fvVectorMatrix> UEqn
 (
     //pZones.ddt(rho, U)
-    fvc::ddt(rho, U)
+    fvm::ddt(rho, U)
   + fvm::div(phi, U)
   + turbulence->divDevRhoReff(U)
 );

applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H

@@ -49,7 +49,7 @@
         piso.lookupOrDefault<scalar>("maxDeltaT", GREAT)
     );
 
-    volScalarField rDeltaT0 = rDeltaT;
+    volScalarField rDeltaT0("rDeltaT0", rDeltaT);
 
     // Set the reciprocal time-step from the local Courant number
     rDeltaT.dimensionedInternalField() = max

applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H

@@ -11,7 +11,7 @@
     fvVectorMatrix UEqn
     (
         //pZones.ddt(rho, U)
-        fvc::ddt(rho, U)
+        fvm::ddt(rho, U)
       + fvm::div(rhoPhi, U)
       - fvm::laplacian(muEff, U)
       - (fvc::grad(U) & fvc::grad(muEff))

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,6 +37,7 @@ Description
 #include "autoLayerDriver.H"
 #include "searchableSurfaces.H"
 #include "refinementSurfaces.H"
+#include "refinementFeatures.H"
 #include "shellSurfaces.H"
 #include "decompositionMethod.H"
 #include "fvMeshDistribute.H"
@@ -250,6 +251,20 @@ int main(int argc, char *argv[])
         << mesh.time().cpuTimeIncrement() << " s" << nl << endl;
 
 
+    // Read feature meshes
+    // ~~~~~~~~~~~~~~~~~~~
+
+    Info<< "Reading features." << endl;
+    refinementFeatures features
+    (
+        mesh,
+        refineDict.lookup("features")
+    );
+    Info<< "Read features in = "
+        << mesh.time().cpuTimeIncrement() << " s" << nl << endl;
+
+
+
     // Refinement engine
     // ~~~~~~~~~~~~~~~~~
 
@@ -265,6 +280,7 @@ int main(int argc, char *argv[])
         mergeDist,          // tolerance used in sorting coordinates
         overwrite,          // overwrite mesh files?
         surfaces,           // for surface intersection refinement
+        features,           // for feature edges/point based refinement
         shells              // for volume (inside/outside) refinement
     );
     Info<< "Calculated surface intersections in = "
@@ -429,13 +445,19 @@ int main(int argc, char *argv[])
 
         // Snap parameters
         snapParameters snapParams(snapDict);
+        // Temporary hack to get access to resolveFeatureAngle
+        scalar curvature;
+        {
+            refinementParameters refineParams(refineDict);
+            curvature = refineParams.curvature();
+        }
 
         if (!overwrite)
         {
             const_cast<Time&>(mesh.time())++;
         }
 
-        snapDriver.doSnap(snapDict, motionDict, snapParams);
+        snapDriver.doSnap(snapDict, motionDict, curvature, snapParams);
 
         writeMesh
         (

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict

@@ -217,10 +217,10 @@ snapControls
     //  to surface
     nSmoothPatch 3;
 
-    //- Relative distance for points to be attracted by surface feature point
+    //- Maximum relative distance for points to be attracted by surface.
-    //  or edge. True distance is this factor times local
+    //  True distance is this factor times local maximum edge length.
-    //  maximum edge length.
+    // Note: changed(corrected) w.r.t 17x! (17x used 2* tolerance)
-    tolerance 4.0;
+    tolerance 2.0;
 
     //- Number of mesh displacement relaxation iterations.
     nSolveIter 30;

applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -148,6 +148,11 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 
+    // Make sure we do not use the master-only reading since we read
+    // fields (different per processor) as dictionaries.
+    regIOobject::fileModificationChecking = regIOobject::timeStamp;
+
+
     fileName meshDir = polyMesh::meshSubDir;
     fileName regionPrefix = "";
     word regionName = polyMesh::defaultRegion;

applications/utilities/preProcessing/changeDictionary/changeDictionary.C

@@ -305,6 +305,11 @@ int main(int argc, char *argv[])
         instance = args.options()["instance"];
     }
 
+    // Make sure we do not use the master-only reading since we read
+    // fields (different per processor) as dictionaries.
+    regIOobject::fileModificationChecking = regIOobject::timeStamp;
+
+
     // Get the replacement rules from a dictionary
     IOdictionary dict
     (

applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C

@@ -405,6 +405,12 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 
+
+    // Make sure we do not use the master-only reading since we read
+    // fields (different per processor) as dictionaries.
+    regIOobject::fileModificationChecking = regIOobject::timeStamp;
+
+
     instantList timeDirs = timeSelector::select0(runTime, args);
 
     const bool isTestRun = args.optionFound("test");

applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C

@@ -40,6 +40,7 @@ Description
 #include "treeBoundBox.H"
 #include "meshTools.H"
 #include "OFstream.H"
+#include "unitConversion.H"
 
 using namespace Foam;
 
@@ -90,6 +91,55 @@ void deleteBox
 }
 
 
+// Unmark non-manifold edges if individual triangles are not features
+void unmarkBaffles
+(
+    const triSurface& surf,
+    const scalar includedAngle,
+    List<surfaceFeatures::edgeStatus>& edgeStat
+)
+{
+    scalar minCos = Foam::cos(degToRad(180.0 - includedAngle));
+
+    const labelListList& edgeFaces = surf.edgeFaces();
+
+    forAll(edgeFaces, edgeI)
+    {
+        const labelList& eFaces = edgeFaces[edgeI];
+
+        if (eFaces.size() > 2)
+        {
+            label i0 = eFaces[0];
+            //const labelledTri& f0 = surf[i0];
+            const vector& n0 = surf.faceNormals()[i0];
+
+            //Pout<< "edge:" << edgeI << " n0:" << n0 << endl;
+
+            bool same = true;
+
+            for (label i = 1; i < eFaces.size(); i++)
+            {
+                //const labelledTri& f = surf[i];
+                const vector& n = surf.faceNormals()[eFaces[i]];
+
+                //Pout<< "    mag(n&n0): " << mag(n&n0) << endl;
+
+                if (mag(n&n0) < minCos)
+                {
+                    same = false;
+                    break;
+                }
+            }
+
+            if (same)
+            {
+                edgeStat[edgeI] = surfaceFeatures::NONE;
+            }
+        }
+    }
+}
+
+
 // Main program:
 
 int main(int argc, char *argv[])
@@ -138,6 +188,11 @@ int main(int argc, char *argv[])
         "((x0 y0 z0)(x1 y1 z1))",
         "remove edges within specified bounding box"
     );
+    argList::addBoolOption
+    (
+        "writeObj",
+        "write extendedFeatureEdgeMesh obj files"
+    );
 
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -145,6 +200,7 @@ int main(int argc, char *argv[])
     Info<< "Feature line extraction is only valid on closed manifold surfaces."
         << endl;
 
+    bool writeObj = args.optionFound("writeObj");
 
     const fileName surfFileName = args[1];
     const fileName outFileName  = args[2];
@@ -153,6 +209,8 @@ int main(int argc, char *argv[])
         << "Output feature set : " << outFileName << nl
         << endl;
 
+    fileName sFeatFileName = surfFileName.lessExt().name();
+
 
     // Read
     // ~~~~
@@ -164,7 +222,6 @@ int main(int argc, char *argv[])
     Info<< endl;
 
 
-
     // Either construct features from surface&featureangle or read set.
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -187,9 +244,9 @@ int main(int argc, char *argv[])
 
         set = surfaceFeatures(surf, includedAngle);
 
-        Info<< nl << "Writing initial features" << endl;
+        // Info<< nl << "Writing initial features" << endl;
-        set.write("initial.fSet");
+        // set.write("initial.fSet");
-        set.writeObj("initial");
+        // set.writeObj("initial");
     }
     else
     {
@@ -200,7 +257,6 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-
     Info<< nl
         << "Initial feature set:" << nl
         << "    feature points : " << set.featurePoints().size() << nl
@@ -281,11 +337,12 @@ int main(int argc, char *argv[])
     surfaceFeatures newSet(surf);
     newSet.setFromStatus(edgeStat);
 
-    Info<< endl << "Writing trimmed features to " << outFileName << endl;
+    Info<< endl << "Writing trimmed features to "
-    newSet.write(outFileName);
+        << runTime.constant()/"featureEdgeMesh"/outFileName << endl;
+    newSet.write(runTime.constant()/"featureEdgeMesh"/outFileName);
 
-    Info<< endl << "Writing edge objs." << endl;
+    // Info<< endl << "Writing edge objs." << endl;
-    newSet.writeObj("final");
+    // newSet.writeObj("final");
 
     Info<< nl
         << "Final feature set:" << nl
@@ -297,20 +354,22 @@ int main(int argc, char *argv[])
         << "        internal edges : " << newSet.nInternalEdges() << nl
         << endl;
 
-    // Extracting and writing a featureEdgeMesh
+    // Extracting and writing a extendedFeatureEdgeMesh
 
     extendedFeatureEdgeMesh feMesh
     (
         newSet,
         runTime,
-        surfFileName.lessExt().name() + ".featureEdgeMesh"
+        sFeatFileName + ".extendedFeatureEdgeMesh"
     );
 
     Info<< nl << "Writing extendedFeatureEdgeMesh to " << feMesh.objectPath()
         << endl;
 
-
+    if (writeObj)
+    {
         feMesh.writeObj(surfFileName.lessExt().name());
+    }
 
     feMesh.write();
 

bin/tools/CleanFunctions

@@ -95,6 +95,7 @@ cleanCase()
         > /dev/null 2>&1 \
     )
     rm -rf VTK > /dev/null 2>&1
+    rm -f 0/cellLevel 0/pointLevel
 
     if [ -e constant/polyMesh/blockMeshDict.m4 ]
     then

etc/bashrc

@@ -62,7 +62,7 @@ foamInstall=$HOME/$WM_PROJECT
 foamCompiler=system
 
 #- Compiler:
-#    WM_COMPILER = Gcc | Gcc43 | Gcc44 | Gcc45 | Clang | Icc (Intel icc)
+#    WM_COMPILER = Gcc | Gcc43 | Gcc44 | Gcc45 | Gcc46 | Clang | Icc (Intel icc)
 export WM_COMPILER=Gcc
 unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 

etc/cshrc

@@ -61,7 +61,7 @@ if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall
 set foamCompiler=system
 
 #- Compiler:
-#    WM_COMPILER = Gcc | Gcc43 | Gcc44 | Gcc45 | Clang | Icc (Intel icc)
+#    WM_COMPILER = Gcc | Gcc43 | Gcc44 | Gcc45 | Gcc46 | Clang | Icc (Intel icc)
 setenv WM_COMPILER Gcc
 setenv WM_COMPILER_ARCH # defined but empty
 unsetenv WM_COMPILER_LIB_ARCH

etc/settings.csh

@@ -207,6 +207,13 @@ case ThirdParty:
         set gmp_version=gmp-5.0.1
         set mpfr_version=mpfr-2.4.2
         breaksw
+    case Gcc46:
+    case Gcc46++0x:
+        set gcc_version=gcc-4.6.0
+        set gmp_version=gmp-5.0.1
+        set mpfr_version=mpfr-2.4.2
+        set mpc_version=mpc-0.8.1
+        breaksw
     case Gcc45:
     case Gcc45++0x:
         set gcc_version=gcc-4.5.2
@@ -381,6 +388,10 @@ case SYSTEMOPENMPI:
     setenv PLIBS "`mpicc --showme:link`"
     set libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
 
+    # Bit of a hack: strip off 'lib' and hope this is the path to openmpi
+    # include files and libraries.
+    setenv MPI_ARCH_PATH "${libDir:h}"
+
     if ($?FOAM_VERBOSE && $?prompt) then
         echo "Using system installed MPI:"
         echo "    compile flags : $PINC"

etc/settings.sh

@@ -227,6 +227,12 @@ OpenFOAM | ThirdParty)
         gmp_version=gmp-5.0.1
         mpfr_version=mpfr-2.4.2
         ;;
+    Gcc46 | Gcc46++0x)
+        gcc_version=gcc-4.6.0
+        gmp_version=gmp-5.0.1
+        mpfr_version=mpfr-2.4.2
+        mpc_version=mpc-0.8.1
+        ;;
     Gcc45 | Gcc45++0x)
         gcc_version=gcc-4.5.2
         gmp_version=gmp-5.0.1
@@ -402,6 +408,10 @@ SYSTEMOPENMPI)
     export PLIBS="`mpicc --showme:link`"
     libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
 
+    # Bit of a hack: strip off 'lib' and hope this is the path to openmpi
+    # include files and libraries.
+    export MPI_ARCH_PATH="${libDir%/*}"
+
     if [ "$FOAM_VERBOSE" -a "$PS1" ]
     then
         echo "Using system installed MPI:"

src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C

@@ -126,7 +126,7 @@ Foam::treeDataCell::treeDataCell
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::pointField Foam::treeDataCell::points() const
+Foam::pointField Foam::treeDataCell::shapePoints() const
 {
     pointField cc(cellLabels_.size());
 

src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H

@@ -125,7 +125,7 @@ public:
 
             //- Get representative point cloud for all shapes inside
             //  (one point per shape)
-            pointField points() const;
+            pointField shapePoints() const;
 
 
         // Search

src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -287,7 +287,7 @@ Foam::Xfer<Foam::labelList> Foam::PackedBoolList::used() const
 // * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
 
 Foam::PackedBoolList&
-Foam::PackedBoolList::operator=(const UList<bool>& lst)
+Foam::PackedBoolList::operator=(const Foam::UList<bool>& lst)
 {
     this->setSize(lst.size());
 

src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H

@@ -115,7 +115,7 @@ public:
         inline PackedBoolList(const Xfer<PackedList<1> >&);
 
         //- Construct from a list of bools
-        explicit inline PackedBoolList(const UList<bool>&);
+        explicit inline PackedBoolList(const Foam::UList<bool>&);
 
         //- Construct from a list of labels
         //  using the labels as indices to indicate which bits are set

src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ inline Foam::PackedBoolList::PackedBoolList(const Xfer<PackedList<1> >& lst)
 {}
 
 
-inline Foam::PackedBoolList::PackedBoolList(const UList<bool>& lst)
+inline Foam::PackedBoolList::PackedBoolList(const Foam::UList<bool>& lst)
 :
     PackedList<1>()
 {

src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,9 +47,6 @@ SourceFiles
 namespace Foam
 {
 
-class Istream;
-class Ostream;
-
 // Forward declaration of friend functions and operators
 template<class T, class BaseType> class CompactIOField;
 
@@ -58,6 +55,7 @@ template<class T, class BaseType> Istream& operator>>
     Istream&,
     CompactIOField<T, BaseType>&
 );
+
 template<class T, class BaseType> Ostream& operator<<
 (
     Ostream&,
@@ -122,23 +120,6 @@ public:
         void operator=(const CompactIOField<T, BaseType>&);
 
         void operator=(const Field<T>&);
-
-
-    // IOstream operators
-
-        //- Read Field from Istream, discarding contents of existing Field.
-        friend Istream& operator>> <T, BaseType>
-        (
-            Istream&,
-            CompactIOField<T, BaseType>&
-        );
-
-        // Write Field to Ostream.
-        friend Ostream& operator<< <T, BaseType>
-        (
-            Ostream&,
-            const CompactIOField<T, BaseType>&
-        );
 };
 
 

src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C

@@ -124,16 +124,14 @@ Foam::IOdictionary::IOdictionary(const IOobject& io)
     regIOobject(io)
 {
     // Temporary warning
-    if (io.readOpt() == IOobject::MUST_READ)
+    if (debug && io.readOpt() == IOobject::MUST_READ)
     {
         WarningIn("IOdictionary::IOdictionary(const IOobject&)")
-        //FatalErrorIn("IOdictionary::IOdictionary(const IOobject&)")
             << "Dictionary " << name()
             << " constructed with IOobject::MUST_READ"
             " instead of IOobject::MUST_READ_IF_MODIFIED." << nl
             << "Use MUST_READ_IF_MODIFIED if you need automatic rereading."
             << endl;
-            //<< abort(FatalError);
     }
 
     // Everyone check or just master
@@ -182,7 +180,7 @@ Foam::IOdictionary::IOdictionary(const IOobject& io, const dictionary& dict)
     regIOobject(io)
 {
     // Temporary warning
-    if (io.readOpt() == IOobject::MUST_READ)
+    if (debug && io.readOpt() == IOobject::MUST_READ)
     {
         WarningIn
         (

src/OpenFOAM/db/Time/TimeIO.C

@@ -168,6 +168,12 @@ void Foam::Time::readDict()
 
         Pout.precision(IOstream::defaultPrecision());
         Perr.precision(IOstream::defaultPrecision());
+
+        FatalError().precision(IOstream::defaultPrecision());
+        FatalIOError.error::operator()().precision
+        (
+            IOstream::defaultPrecision()
+        );
     }
 
     if (controlDict_.found("writeCompression"))

src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C

@@ -55,6 +55,10 @@ Foam::dlLibraryTable::~dlLibraryTable()
 {
     forAllConstIter(dlLibraryTable, *this, iter)
     {
+        // bug in dlclose - does not call static destructors of
+        // loaded library when actually unloading the library.
+        // See https://bugzilla.novell.com/show_bug.cgi?id=680125 and 657627.
+        // Seems related to using a non-system compiler!
         dlClose(iter.key());
     }
 }

src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,6 +55,7 @@ Ostream& operator<<
     Ostream&,
     const DynamicField<T, SizeInc, SizeMult, SizeDiv>&
 );
+
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 Istream& operator>>
 (
@@ -234,23 +235,6 @@ public:
 
             //- Assignment from UList
             inline void operator=(const UList<T>&);
-
-
-        // IOstream operators
-
-            // Write DynamicField to Ostream.
-            friend Ostream& operator<< <T, SizeInc, SizeMult, SizeDiv>
-            (
-                Ostream&,
-                const DynamicField<T, SizeInc, SizeMult, SizeDiv>&
-            );
-
-            //- Read from Istream, discarding contents of existing DynamicField.
-            friend Istream& operator>> <T, SizeInc, SizeMult, SizeDiv>
-            (
-                Istream&,
-                DynamicField<T, SizeInc, SizeMult, SizeDiv>&
-            );
 };
 
 

src/OpenFOAM/meshes/polyMesh/polyMesh.C

@@ -34,6 +34,8 @@ License
 #include "OSspecific.H"
 #include "demandDrivenData.H"
 #include "polyMeshTetDecomposition.H"
+#include "indexedOctree.H"
+#include "treeDataCell.H"
 
 #include "pointMesh.H"
 

src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C

@@ -25,6 +25,8 @@ License
 
 #include "primitiveMesh.H"
 #include "demandDrivenData.H"
+#include "indexedOctree.H"
+#include "treeDataCell.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H

@@ -67,14 +67,16 @@ SourceFiles
 #include "Map.H"
 #include "EdgeMap.H"
 #include "boundBox.H"
-#include "indexedOctree.H"
-#include "treeDataCell.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward declaration of classes
+class treeDataCell;
+template<class Type> class indexedOctree;
+
 /*---------------------------------------------------------------------------*\
                       Class primitiveMesh Declaration
 \*---------------------------------------------------------------------------*/

src/finiteVolume/cfdTools/general/porousMedia/porousZone.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -445,6 +445,13 @@ void Foam::porousZone::writeDict(Ostream& os, bool subDict) const
         dictPtr->write(os);
     }
 
+    // thermalModel
+    if (const dictionary* dictPtr = dict_.subDictPtr("thermalModel"))
+    {
+        os  << indent << "thermalModel";
+        dictPtr->write(os);
+    }
+
     os  << decrIndent << indent << token::END_BLOCK << endl;
 }
 

src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/mesh/autoMesh/Make/files

@@ -4,6 +4,7 @@ autoHexMeshDriver       = $(autoHexMesh)/autoHexMeshDriver
 $(autoHexMeshDriver)/autoLayerDriver.C
 $(autoHexMeshDriver)/autoLayerDriverShrink.C
 $(autoHexMeshDriver)/autoSnapDriver.C
+$(autoHexMeshDriver)/autoSnapDriverFeature.C
 $(autoHexMeshDriver)/autoRefineDriver.C
 
 $(autoHexMeshDriver)/layerParameters/layerParameters.C
@@ -16,6 +17,7 @@ $(autoHexMesh)/meshRefinement/meshRefinement.C
 $(autoHexMesh)/meshRefinement/meshRefinementMerge.C
 $(autoHexMesh)/meshRefinement/meshRefinementProblemCells.C
 $(autoHexMesh)/meshRefinement/meshRefinementRefine.C
+$(autoHexMesh)/refinementFeatures/refinementFeatures.C
 $(autoHexMesh)/refinementSurfaces/refinementSurfaces.C
 $(autoHexMesh)/shellSurfaces/shellSurfaces.C
 $(autoHexMesh)/trackedParticle/trackedParticle.C

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C

@@ -59,622 +59,6 @@ defineTypeNameAndDebug(autoLayerDriver, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::label Foam::autoLayerDriver::mergePatchFacesUndo
-(
-    const scalar minCos,
-    const scalar concaveCos,
-    const dictionary& motionDict
-)
-{
-    fvMesh& mesh = meshRefiner_.mesh();
-
-    // Patch face merging engine
-    combineFaces faceCombiner(mesh, true);
-
-    // Pick up all candidate cells on boundary
-    labelHashSet boundaryCells(mesh.nFaces()-mesh.nInternalFaces());
-
-    {
-        labelList patchIDs(meshRefiner_.meshedPatches());
-
-        const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-        forAll(patchIDs, i)
-        {
-            label patchI = patchIDs[i];
-
-            const polyPatch& patch = patches[patchI];
-
-            if (!patch.coupled())
-            {
-                forAll(patch, i)
-                {
-                    boundaryCells.insert(mesh.faceOwner()[patch.start()+i]);
-                }
-            }
-        }
-    }
-
-    // Get all sets of faces that can be merged
-    labelListList allFaceSets
-    (
-        faceCombiner.getMergeSets
-        (
-            minCos,
-            concaveCos,
-            boundaryCells
-        )
-    );
-
-    label nFaceSets = returnReduce(allFaceSets.size(), sumOp<label>());
-
-    Info<< "Merging " << nFaceSets << " sets of faces." << nl << endl;
-
-    if (nFaceSets > 0)
-    {
-        if (debug)
-        {
-            faceSet allSets(mesh, "allFaceSets", allFaceSets.size());
-            forAll(allFaceSets, setI)
-            {
-                forAll(allFaceSets[setI], i)
-                {
-                    allSets.insert(allFaceSets[setI][i]);
-                }
-            }
-            Pout<< "Writing all faces to be merged to set "
-                << allSets.objectPath() << endl;
-            allSets.instance() = mesh.time().timeName();
-            allSets.write();
-        }
-
-
-        // Topology changes container
-        polyTopoChange meshMod(mesh);
-
-        // Merge all faces of a set into the first face of the set.
-        faceCombiner.setRefinement(allFaceSets, meshMod);
-
-        // Experimental: store data for all the points that have been deleted
-        meshRefiner_.storeData
-        (
-            faceCombiner.savedPointLabels(),    // points to store
-            labelList(0),                       // faces to store
-            labelList(0)                        // cells to store
-        );
-
-        // Change the mesh (no inflation)
-        autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false, true);
-
-        // Update fields
-        mesh.updateMesh(map);
-
-        // Move mesh (since morphing does not do this)
-        if (map().hasMotionPoints())
-        {
-            mesh.movePoints(map().preMotionPoints());
-        }
-        else
-        {
-            // Delete mesh volumes.
-            mesh.clearOut();
-        }
-
-        faceCombiner.updateMesh(map);
-
-        meshRefiner_.updateMesh(map, labelList(0));
-
-
-        for (label iteration = 0; iteration < 100; iteration++)
-        {
-            Info<< nl
-                << "Undo iteration " << iteration << nl
-                << "----------------" << endl;
-
-
-            // Check mesh for errors
-            // ~~~~~~~~~~~~~~~~~~~~~
-
-            faceSet errorFaces
-            (
-                mesh,
-                "errorFaces",
-                mesh.nFaces()-mesh.nInternalFaces()
-            );
-            bool hasErrors = motionSmoother::checkMesh
-            (
-                false,  // report
-                mesh,
-                motionDict,
-                errorFaces
-            );
-
-            //if (checkEdgeConnectivity)
-            //{
-            //    Info<< "Checking edge-face connectivity (duplicate faces"
-            //        << " or non-consecutive shared vertices)" << endl;
-            //
-            //    label nOldSize = errorFaces.size();
-            //
-            //    hasErrors =
-            //        mesh.checkFaceFaces
-            //        (
-            //            false,
-            //            &errorFaces
-            //        )
-            //     || hasErrors;
-            //
-            //    Info<< "Detected additional "
-            //        <<  returnReduce
-            //            (
-            //                errorFaces.size() - nOldSize,
-            //                sumOp<label>()
-            //            )
-            //        << " faces with illegal face-face connectivity"
-            //        << endl;
-            //}
-
-            if (!hasErrors)
-            {
-                break;
-            }
-
-
-            if (debug)
-            {
-                errorFaces.instance() = mesh.time().timeName();
-                Pout<< "Writing all faces in error to faceSet "
-                    << errorFaces.objectPath() << nl << endl;
-                errorFaces.write();
-            }
-
-
-            // Check any master cells for using any of the error faces
-            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-            DynamicList<label> mastersToRestore(allFaceSets.size());
-
-            forAll(allFaceSets, setI)
-            {
-                label masterFaceI = faceCombiner.masterFace()[setI];
-
-                if (masterFaceI != -1)
-                {
-                    label masterCellII = mesh.faceOwner()[masterFaceI];
-
-                    const cell& cFaces = mesh.cells()[masterCellII];
-
-                    forAll(cFaces, i)
-                    {
-                        if (errorFaces.found(cFaces[i]))
-                        {
-                            mastersToRestore.append(masterFaceI);
-                            break;
-                        }
-                    }
-                }
-            }
-            mastersToRestore.shrink();
-
-            label nRestore = returnReduce
-            (
-                mastersToRestore.size(),
-                sumOp<label>()
-            );
-
-            Info<< "Masters that need to be restored:"
-                << nRestore << endl;
-
-            if (debug)
-            {
-                faceSet restoreSet(mesh, "mastersToRestore", mastersToRestore);
-                restoreSet.instance() = mesh.time().timeName();
-                Pout<< "Writing all " << mastersToRestore.size()
-                    << " masterfaces to be restored to set "
-                    << restoreSet.objectPath() << endl;
-                restoreSet.write();
-            }
-
-
-            if (nRestore == 0)
-            {
-                break;
-            }
-
-
-            // Undo
-            // ~~~~
-
-            // Topology changes container
-            polyTopoChange meshMod(mesh);
-
-            // Merge all faces of a set into the first face of the set.
-            // Experimental:mark all points/faces/cells that have been restored.
-            Map<label> restoredPoints(0);
-            Map<label> restoredFaces(0);
-            Map<label> restoredCells(0);
-
-            faceCombiner.setUnrefinement
-            (
-                mastersToRestore,
-                meshMod,
-                restoredPoints,
-                restoredFaces,
-                restoredCells
-            );
-
-            // Change the mesh (no inflation)
-            autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false, true);
-
-            // Update fields
-            mesh.updateMesh(map);
-
-            // Move mesh (since morphing does not do this)
-            if (map().hasMotionPoints())
-            {
-                mesh.movePoints(map().preMotionPoints());
-            }
-            else
-            {
-                // Delete mesh volumes.
-                mesh.clearOut();
-            }
-
-            faceCombiner.updateMesh(map);
-
-            // Renumber restore maps
-            inplaceMapKey(map().reversePointMap(), restoredPoints);
-            inplaceMapKey(map().reverseFaceMap(), restoredFaces);
-            inplaceMapKey(map().reverseCellMap(), restoredCells);
-
-            // Experimental:restore all points/face/cells in maps
-            meshRefiner_.updateMesh
-            (
-                map,
-                labelList(0),       // changedFaces
-                restoredPoints,
-                restoredFaces,
-                restoredCells
-            );
-
-            Info<< endl;
-        }
-
-        if (debug)
-        {
-            Pout<< "Writing merged-faces mesh to time "
-                << meshRefiner_.timeName() << nl << endl;
-            mesh.write();
-        }
-    }
-    else
-    {
-        Info<< "No faces merged ..." << endl;
-    }
-
-    return nFaceSets;
-}
-
-
-// Remove points. pointCanBeDeleted is parallel synchronised.
-Foam::autoPtr<Foam::mapPolyMesh> Foam::autoLayerDriver::doRemovePoints
-(
-    removePoints& pointRemover,
-    const boolList& pointCanBeDeleted
-)
-{
-    fvMesh& mesh = meshRefiner_.mesh();
-
-    // Topology changes container
-    polyTopoChange meshMod(mesh);
-
-    pointRemover.setRefinement(pointCanBeDeleted, meshMod);
-
-    // Change the mesh (no inflation)
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false, true);
-
-    // Update fields
-    mesh.updateMesh(map);
-
-    // Move mesh (since morphing does not do this)
-    if (map().hasMotionPoints())
-    {
-        mesh.movePoints(map().preMotionPoints());
-    }
-    else
-    {
-        // Delete mesh volumes.
-        mesh.clearOut();
-    }
-
-    pointRemover.updateMesh(map);
-    meshRefiner_.updateMesh(map, labelList(0));
-
-    return map;
-}
-
-
-// Restore faces (which contain removed points)
-Foam::autoPtr<Foam::mapPolyMesh> Foam::autoLayerDriver::doRestorePoints
-(
-    removePoints& pointRemover,
-    const labelList& facesToRestore
-)
-{
-    fvMesh& mesh = meshRefiner_.mesh();
-
-    // Topology changes container
-    polyTopoChange meshMod(mesh);
-
-    // Determine sets of points and faces to restore
-    labelList localFaces, localPoints;
-    pointRemover.getUnrefimentSet
-    (
-        facesToRestore,
-        localFaces,
-        localPoints
-    );
-
-    // Undo the changes on the faces that are in error.
-    pointRemover.setUnrefinement
-    (
-        localFaces,
-        localPoints,
-        meshMod
-    );
-
-    // Change the mesh (no inflation)
-    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false, true);
-
-    // Update fields
-    mesh.updateMesh(map);
-
-    // Move mesh (since morphing does not do this)
-    if (map().hasMotionPoints())
-    {
-        mesh.movePoints(map().preMotionPoints());
-    }
-    else
-    {
-        // Delete mesh volumes.
-        mesh.clearOut();
-    }
-
-    pointRemover.updateMesh(map);
-    meshRefiner_.updateMesh(map, labelList(0));
-
-    return map;
-}
-
-
-// Collect all faces that are both in candidateFaces and in the set.
-// If coupled face also collects the coupled face.
-Foam::labelList Foam::autoLayerDriver::collectFaces
-(
-    const labelList& candidateFaces,
-    const labelHashSet& set
-) const
-{
-    const fvMesh& mesh = meshRefiner_.mesh();
-
-    // Has face been selected?
-    boolList selected(mesh.nFaces(), false);
-
-    forAll(candidateFaces, i)
-    {
-        label faceI = candidateFaces[i];
-
-        if (set.found(faceI))
-        {
-            selected[faceI] = true;
-        }
-    }
-    syncTools::syncFaceList
-    (
-        mesh,
-        selected,
-        orEqOp<bool>()      // combine operator
-    );
-
-    labelList selectedFaces(findIndices(selected, true));
-
-    return selectedFaces;
-}
-
-
-// Pick up faces of cells of faces in set.
-Foam::labelList Foam::autoLayerDriver::growFaceCellFace
-(
-    const labelHashSet& set
-) const
-{
-    const fvMesh& mesh = meshRefiner_.mesh();
-
-    boolList selected(mesh.nFaces(), false);
-
-    forAllConstIter(faceSet, set, iter)
-    {
-        label faceI = iter.key();
-
-        label own = mesh.faceOwner()[faceI];
-
-        const cell& ownFaces = mesh.cells()[own];
-        forAll(ownFaces, ownFaceI)
-        {
-            selected[ownFaces[ownFaceI]] = true;
-        }
-
-        if (mesh.isInternalFace(faceI))
-        {
-            label nbr = mesh.faceNeighbour()[faceI];
-
-            const cell& nbrFaces = mesh.cells()[nbr];
-            forAll(nbrFaces, nbrFaceI)
-            {
-                selected[nbrFaces[nbrFaceI]] = true;
-            }
-        }
-    }
-    syncTools::syncFaceList
-    (
-        mesh,
-        selected,
-        orEqOp<bool>()      // combine operator
-    );
-    return findIndices(selected, true);
-}
-
-
-// Remove points not used by any face or points used by only two faces where
-// the edges are in line
-Foam::label Foam::autoLayerDriver::mergeEdgesUndo
-(
-    const scalar minCos,
-    const dictionary& motionDict
-)
-{
-    fvMesh& mesh = meshRefiner_.mesh();
-
-    Info<< nl
-        << "Merging all points on surface that" << nl
-        << "- are used by only two boundary faces and" << nl
-        << "- make an angle with a cosine of more than " << minCos
-        << "." << nl << endl;
-
-    // Point removal analysis engine with undo
-    removePoints pointRemover(mesh, true);
-
-    // Count usage of points
-    boolList pointCanBeDeleted;
-    label nRemove = pointRemover.countPointUsage(minCos, pointCanBeDeleted);
-
-    if (nRemove > 0)
-    {
-        Info<< "Removing " << nRemove
-            << " straight edge points ..." << nl << endl;
-
-        // Remove points
-        // ~~~~~~~~~~~~~
-
-        doRemovePoints(pointRemover, pointCanBeDeleted);
-
-
-        for (label iteration = 0; iteration < 100; iteration++)
-        {
-            Info<< nl
-                << "Undo iteration " << iteration << nl
-                << "----------------" << endl;
-
-
-            // Check mesh for errors
-            // ~~~~~~~~~~~~~~~~~~~~~
-
-            faceSet errorFaces
-            (
-                mesh,
-                "errorFaces",
-                mesh.nFaces()-mesh.nInternalFaces()
-            );
-            bool hasErrors = motionSmoother::checkMesh
-            (
-                false,  // report
-                mesh,
-                motionDict,
-                errorFaces
-            );
-            //if (checkEdgeConnectivity)
-            //{
-            //    Info<< "Checking edge-face connectivity (duplicate faces"
-            //        << " or non-consecutive shared vertices)" << endl;
-            //
-            //    label nOldSize = errorFaces.size();
-            //
-            //    hasErrors =
-            //        mesh.checkFaceFaces
-            //        (
-            //            false,
-            //            &errorFaces
-            //        )
-            //     || hasErrors;
-            //
-            //    Info<< "Detected additional "
-            //        << returnReduce(errorFaces.size()-nOldSize,sumOp<label>())
-            //        << " faces with illegal face-face connectivity"
-            //        << endl;
-            //}
-
-            if (!hasErrors)
-            {
-                break;
-            }
-
-            if (debug)
-            {
-                errorFaces.instance() = mesh.time().timeName();
-                Pout<< "**Writing all faces in error to faceSet "
-                    << errorFaces.objectPath() << nl << endl;
-                errorFaces.write();
-            }
-
-            labelList masterErrorFaces
-            (
-                collectFaces
-                (
-                    pointRemover.savedFaceLabels(),
-                    errorFaces
-                )
-            );
-
-            label n = returnReduce(masterErrorFaces.size(), sumOp<label>());
-
-            Info<< "Detected " << n
-                << " error faces on boundaries that have been merged."
-                << " These will be restored to their original faces." << nl
-                << endl;
-
-            if (n == 0)
-            {
-                if (hasErrors)
-                {
-                    Info<< "Detected "
-                        << returnReduce(errorFaces.size(), sumOp<label>())
-                        << " error faces in mesh."
-                        << " Restoring neighbours of faces in error." << nl
-                        << endl;
-
-                    labelList expandedErrorFaces
-                    (
-                        growFaceCellFace
-                        (
-                            errorFaces
-                        )
-                    );
-
-                    doRestorePoints(pointRemover, expandedErrorFaces);
-                }
-
-                break;
-            }
-
-            doRestorePoints(pointRemover, masterErrorFaces);
-        }
-
-        if (debug)
-        {
-            Pout<< "Writing merged-edges mesh to time "
-                << meshRefiner_.timeName() << nl << endl;
-            mesh.write();
-        }
-    }
-    else
-    {
-        Info<< "No straight edges simplified and no points removed ..." << endl;
-    }
-
-    return nRemove;
-}
-
-
 // For debugging: Dump displacement to .obj files
 void Foam::autoLayerDriver::dumpDisplacement
 (
@@ -793,7 +177,7 @@ void Foam::autoLayerDriver::checkMeshManifold() const
             << " points where this happens to pointSet "
             << nonManifoldPoints.name() << endl;
 
-        nonManifoldPoints.instance() = mesh.time().timeName();
+        nonManifoldPoints.instance() = meshRefiner_.timeName();
         nonManifoldPoints.write();
     }
     Info<< endl;
@@ -1080,7 +464,6 @@ void Foam::autoLayerDriver::handleWarpedFaces
 }
 
 
-
 //// No extrusion on cells with multiple patch faces. There ususally is a reason
 //// why combinePatchFaces hasn't succeeded.
 //void Foam::autoLayerDriver::handleMultiplePatchFaces
@@ -1133,7 +516,7 @@ void Foam::autoLayerDriver::handleWarpedFaces
 //
 //    if (nMultiPatchCells > 0)
 //    {
-//        multiPatchCells.instance() = mesh.time().timeName();
+//        multiPatchCells.instance() = meshRefiner_.timeName();
 //        Info<< "Writing " << nMultiPatchCells
 //            << " cells with multiple (connected) patch faces to cellSet "
 //            << multiPatchCells.objectPath() << endl;
@@ -2547,9 +1930,15 @@ void Foam::autoLayerDriver::mergePatchFacesUndo
         << "      (0=straight, 180=fully concave)" << nl
         << endl;
 
-    label nChanged = mergePatchFacesUndo(minCos, concaveCos, motionDict);
+    label nChanged = meshRefiner_.mergePatchFacesUndo
+    (
+        minCos,
+        concaveCos,
+        meshRefiner_.meshedPatches(),
+        motionDict
+    );
 
-    nChanged += mergeEdgesUndo(minCos, motionDict);
+    nChanged += meshRefiner_.mergeEdgesUndo(minCos, motionDict);
 }
 
 
@@ -3191,6 +2580,7 @@ void Foam::autoLayerDriver::addLayers
                 "addedCells",
                 findIndices(flaggedCells, true)
             );
+            addedCellSet.instance() = meshRefiner_.timeName();
             Info<< "Writing "
                 << returnReduce(addedCellSet.size(), sumOp<label>())
                 << " added cells to cellSet "
@@ -3203,6 +2593,7 @@ void Foam::autoLayerDriver::addLayers
                 "layerFaces",
                 findIndices(flaggedCells, true)
             );
+            layerFacesSet.instance() = meshRefiner_.timeName();
             Info<< "Writing "
                 << returnReduce(layerFacesSet.size(), sumOp<label>())
                 << " faces inside added layer to faceSet "
@@ -3279,6 +2670,9 @@ void Foam::autoLayerDriver::addLayers
         mesh.clearOut();
     }
 
+    // Reset the instance for if in overwrite mode
+    mesh.setInstance(meshRefiner_.timeName());
+
     meshRefiner_.updateMesh(map, labelList(0));
 
 
@@ -3345,6 +2739,7 @@ void Foam::autoLayerDriver::addLayers
     // ~~~~~~~~~~
 
     cellSet addedCellSet(mesh, "addedCells", findIndices(flaggedCells, true));
+    addedCellSet.instance() = meshRefiner_.timeName();
     Info<< "Writing "
         << returnReduce(addedCellSet.size(), sumOp<label>())
         << " added cells to cellSet "
@@ -3352,6 +2747,7 @@ void Foam::autoLayerDriver::addLayers
     addedCellSet.write();
 
     faceSet layerFacesSet(mesh, "layerFaces", findIndices(flaggedFaces, true));
+    layerFacesSet.instance() = meshRefiner_.timeName();
     Info<< "Writing "
         << returnReduce(layerFacesSet.size(), sumOp<label>())
         << " faces inside added layer to faceSet "

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H

@@ -105,46 +105,6 @@ class autoLayerDriver
 
     // Private Member Functions
 
-
-        // Face merging
-
-            //- Merge patch faces. Undo until no checkMesh errors.
-            label mergePatchFacesUndo
-            (
-                const scalar minCos,
-                const scalar concaveCos,
-                const dictionary&
-            );
-
-            //- Remove points.
-            autoPtr<mapPolyMesh> doRemovePoints
-            (
-                removePoints& pointRemover,
-                const boolList& pointCanBeDeleted
-            );
-
-            //- Restore faces (which contain removed points)
-            autoPtr<mapPolyMesh> doRestorePoints
-            (
-                removePoints& pointRemover,
-                const labelList& facesToRestore
-            );
-
-            //- Return candidateFaces that are also in set.
-            labelList collectFaces
-            (
-                const labelList& candidateFaces,
-                const labelHashSet& set
-            ) const;
-
-            //- Pick up faces of cells of faces in set.
-            labelList growFaceCellFace(const labelHashSet&) const;
-
-            //- Remove points not used by any face or points used by only
-            //  two faces where the edges are in line
-            label mergeEdgesUndo(const scalar minCos, const dictionary&);
-
-
         // Layers
 
             //- For debugging: Dump displacement to .obj files

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,8 +30,8 @@ License
 #include "cellSet.H"
 #include "syncTools.H"
 #include "refinementParameters.H"
-#include "featureEdgeMesh.H"
 #include "refinementSurfaces.H"
+#include "refinementFeatures.H"
 #include "shellSurfaces.H"
 #include "mapDistributePolyMesh.H"
 #include "unitConversion.H"
@@ -48,62 +48,6 @@ defineTypeNameAndDebug(autoRefineDriver, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Read explicit feature edges
-Foam::label Foam::autoRefineDriver::readFeatureEdges
-(
-    const PtrList<dictionary>& featDicts,
-    PtrList<featureEdgeMesh>& featureMeshes,
-    labelList& featureLevels
-) const
-{
-    Info<< "Reading external feature lines." << endl;
-
-    const fvMesh& mesh = meshRefiner_.mesh();
-
-    featureMeshes.setSize(featDicts.size());
-    featureLevels.setSize(featDicts.size());
-
-    forAll(featDicts, i)
-    {
-        const dictionary& dict = featDicts[i];
-
-        fileName featFileName(dict.lookup("file"));
-
-        featureMeshes.set
-        (
-            i,
-            new featureEdgeMesh
-            (
-                IOobject
-                (
-                    featFileName,                       // name
-                    //mesh.time().findInstance("triSurface", featFileName),
-                    //                                    // instance
-                    mesh.time().constant(),             // instance
-                    "triSurface",                       // local
-                    mesh.time(),                        // registry
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE,
-                    false
-                )
-            )
-        );
-
-        featureMeshes[i].mergePoints(meshRefiner_.mergeDistance());
-        featureLevels[i] = readLabel(dict.lookup("level"));
-
-        Info<< "Refinement level " << featureLevels[i]
-            << " for all cells crossed by feature " << featFileName
-            << " (" << featureMeshes[i].points().size() << " points, "
-            << featureMeshes[i].edges().size() << " edges)." << endl;
-    }
-
-    Info<< "Read feature lines in = "
-        << mesh.time().cpuTimeIncrement() << " s" << nl << endl;
-
-    return featureMeshes.size();
-}
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -128,23 +72,15 @@ Foam::autoRefineDriver::autoRefineDriver
 Foam::label Foam::autoRefineDriver::featureEdgeRefine
 (
     const refinementParameters& refineParams,
-    const PtrList<dictionary>& featDicts,
     const label maxIter,
     const label minRefine
 )
 {
     const fvMesh& mesh = meshRefiner_.mesh();
 
-    // Read explicit feature edges
-    PtrList<featureEdgeMesh> featureMeshes;
-    // Per feature the refinement level
-    labelList featureLevels;
-    readFeatureEdges(featDicts, featureMeshes, featureLevels);
-
-
     label iter = 0;
 
-    if (featureMeshes.size() && maxIter > 0)
+    if (meshRefiner_.features().size() && maxIter > 0)
     {
         for (; iter < maxIter; iter++)
         {
@@ -160,9 +96,6 @@ Foam::label Foam::autoRefineDriver::featureEdgeRefine
                     refineParams.keepPoints()[0],    // For now only use one.
                     refineParams.curvature(),
 
-                    featureMeshes,
-                    featureLevels,
-
                     true,               // featureRefinement
                     false,              // internalRefinement
                     false,              // surfaceRefinement
@@ -266,8 +199,6 @@ Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
         // Only look at surface intersections (minLevel and surface curvature),
         // do not do internal refinement (refinementShells)
 
-        const PtrList<featureEdgeMesh> dummyFeatures;
-
         labelList candidateCells
         (
             meshRefiner_.refineCandidates
@@ -275,9 +206,6 @@ Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
                 refineParams.keepPoints()[0],
                 refineParams.curvature(),
 
-                dummyFeatures,      // dummy featureMeshes;
-                labelList(0),       // dummy featureLevels;
-
                 false,              // featureRefinement
                 false,              // internalRefinement
                 true,               // surfaceRefinement
@@ -432,8 +360,6 @@ Foam::label Foam::autoRefineDriver::shellRefine
             << "----------------------------" << nl
             << endl;
 
-        const PtrList<featureEdgeMesh> dummyFeatures;
-
         labelList candidateCells
         (
             meshRefiner_.refineCandidates
@@ -441,9 +367,6 @@ Foam::label Foam::autoRefineDriver::shellRefine
                 refineParams.keepPoints()[0],
                 refineParams.curvature(),
 
-                dummyFeatures,      // dummy featureMeshes;
-                labelList(0),       // dummy featureLevels;
-
                 false,              // featureRefinement
                 true,               // internalRefinement
                 false,              // surfaceRefinement
@@ -459,7 +382,7 @@ Foam::label Foam::autoRefineDriver::shellRefine
                 << " cells to cellSet candidateCellsFromShells." << endl;
 
             cellSet c(mesh, "candidateCellsFromShells", candidateCells);
-            c.instance() = mesh.time().timeName();
+            c.instance() = meshRefiner_.timeName();
             c.write();
         }
 
@@ -677,6 +600,7 @@ void Foam::autoRefineDriver::splitAndMergeBaffles
         handleSnapProblems,                 // remove perp edge connected cells
         perpAngle,                          // perp angle
         false,                              // merge free standing baffles?
+        //true,                               // merge free standing baffles?
         motionDict,
         const_cast<Time&>(mesh.time()),
         globalToPatch_,
@@ -735,7 +659,8 @@ void Foam::autoRefineDriver::splitAndMergeBaffles
 
 void Foam::autoRefineDriver::mergePatchFaces
 (
-    const refinementParameters& refineParams
+    const refinementParameters& refineParams,
+    const dictionary& motionDict
 )
 {
     const fvMesh& mesh = meshRefiner_.mesh();
@@ -750,11 +675,12 @@ void Foam::autoRefineDriver::mergePatchFaces
         const_cast<Time&>(mesh.time())++;
     }
 
-    meshRefiner_.mergePatchFaces
+    meshRefiner_.mergePatchFacesUndo
     (
         Foam::cos(degToRad(45.0)),
         Foam::cos(degToRad(45.0)),
-        meshRefiner_.meshedPatches()
+        meshRefiner_.meshedPatches(),
+        motionDict
     );
 
     if (debug)
@@ -762,7 +688,7 @@ void Foam::autoRefineDriver::mergePatchFaces
         meshRefiner_.checkData();
     }
 
-    meshRefiner_.mergeEdges(Foam::cos(degToRad(45.0)));
+    meshRefiner_.mergeEdgesUndo(Foam::cos(degToRad(45.0)), motionDict);
 
     if (debug)
     {
@@ -789,13 +715,10 @@ void Foam::autoRefineDriver::doRefine
     // Check that all the keep points are inside the mesh.
     refineParams.findCells(mesh);
 
-    PtrList<dictionary> featDicts(refineDict.lookup("features"));
-
     // Refine around feature edges
     featureEdgeRefine
     (
         refineParams,
-        featDicts,
         100,    // maxIter
         0       // min cells to refine
     );
@@ -833,7 +756,7 @@ void Foam::autoRefineDriver::doRefine
     // Do something about cells with refined faces on the boundary
     if (prepareForSnapping)
     {
-        mergePatchFaces(refineParams);
+        mergePatchFaces(refineParams, motionDict);
     }
 
 

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,6 @@ namespace Foam
 {
 
 // Forward declaration of classes
-class featureEdgeMesh;
 class refinementParameters;
 class meshRefinement;
 class decompositionMethod;
@@ -71,19 +70,10 @@ class autoRefineDriver
 
     // Private Member Functions
 
-        //- Read explicit feature edges
-        label readFeatureEdges
-        (
-            const PtrList<dictionary>& featDicts,
-            PtrList<featureEdgeMesh>& featureMeshes,
-            labelList& featureLevel
-        ) const;
-
         //- Refine all cells pierced by explicit feature edges
         label featureEdgeRefine
         (
             const refinementParameters& refineParams,
-            const PtrList<dictionary>& featDicts,
             const label maxIter,
             const label minRefine
         );
@@ -130,7 +120,8 @@ class autoRefineDriver
         //- Merge refined boundary faces (from exposing coarser cell)
         void mergePatchFaces
         (
-            const refinementParameters& refineParams
+            const refinementParameters& refineParams,
+            const dictionary& motionDict
         );
 
 

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,6 @@ Description
 \*----------------------------------------------------------------------------*/
 
 #include "autoSnapDriver.H"
-#include "Time.H"
 #include "motionSmoother.H"
 #include "polyTopoChange.H"
 #include "OFstream.H"
@@ -36,13 +35,12 @@ Description
 #include "Time.H"
 #include "OFstream.H"
 #include "mapPolyMesh.H"
-#include "motionSmoother.H"
 #include "pointEdgePoint.H"
 #include "PointEdgeWave.H"
 #include "mergePoints.H"
 #include "snapParameters.H"
 #include "refinementSurfaces.H"
-
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -509,9 +507,7 @@ void Foam::autoSnapDriver::dumpMove
 )
 {
     // Dump direction of growth into file
-    Pout<< nl << "Dumping move direction to " << fName << nl
+    Pout<< nl << "Dumping move direction to " << fName << endl;
-        << "View this Lightwave-OBJ file with e.g. javaview" << nl
-        << endl;
 
     OFstream nearestStream(fName);
 
@@ -652,8 +648,7 @@ Foam::scalarField Foam::autoSnapDriver::calcSnapDistance
         -GREAT              // null value
     );
 
-    tmp<scalarField> tfld = snapParams.snapTol()*maxEdgeLen;
+    return snapParams.snapTol()*maxEdgeLen;
-    return tfld();
 }
 
 
@@ -688,6 +683,7 @@ void Foam::autoSnapDriver::preSmoothPatch
 
         // The current mesh is the starting mesh to smooth from.
         meshMover.setDisplacement(patchDisp);
+
         meshMover.correct();
 
         scalar oldErrorReduction = -1;
@@ -828,7 +824,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
             (
                 unzonedSurfaces,
                 localPoints,
-                sqr(4*snapDist),        // sqr of attract distance
+                sqr(snapDist),        // sqr of attract distance
                 hitSurface,
                 hitInfo
             );
@@ -880,7 +876,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
             (
                 labelList(1, zoneSurfI),
                 pointField(localPoints, zonePointIndices),
-                sqr(4*scalarField(minSnapDist, zonePointIndices)),
+                sqr(scalarField(minSnapDist, zonePointIndices)),
                 hitSurface,
                 hitInfo
             );
@@ -956,8 +952,8 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
         mesh,
         pp.meshPoints(),
         patchDisp,
-        minMagEqOp(),                   // combine op
+        minMagSqrEqOp<point>(),         // combine op
-        vector(GREAT, GREAT, GREAT)     // null value
+        vector(GREAT, GREAT, GREAT)     // null value (note: cannot use VGREAT)
     );
 
 
@@ -990,13 +986,12 @@ void Foam::autoSnapDriver::smoothDisplacement
 ) const
 {
     const fvMesh& mesh = meshRefiner_.mesh();
-    const pointMesh& pMesh = meshMover.pMesh();
     const indirectPrimitivePatch& pp = meshMover.patch();
 
     Info<< "Smoothing displacement ..." << endl;
 
     // Set edge diffusivity as inverse of distance to patch
-    scalarField edgeGamma(1.0/(edgePatchDist(pMesh, pp) + SMALL));
+    scalarField edgeGamma(1.0/(edgePatchDist(meshMover.pMesh(), pp) + SMALL));
     //scalarField edgeGamma(mesh.nEdges(), 1.0);
     //scalarField edgeGamma(wallGamma(mesh, pp, 10, 1));
 
@@ -1010,7 +1005,6 @@ void Foam::autoSnapDriver::smoothDisplacement
             Info<< "Iteration " << iter << endl;
         }
         pointVectorField oldDisp(disp);
-
         meshMover.smooth(oldDisp, edgeGamma, disp);
     }
     Info<< "Displacement smoothed in = "
@@ -1045,7 +1039,7 @@ void Foam::autoSnapDriver::smoothDisplacement
 }
 
 
-void Foam::autoSnapDriver::scaleMesh
+bool Foam::autoSnapDriver::scaleMesh
 (
     const snapParameters& snapParams,
     const label nInitErrors,
@@ -1061,6 +1055,8 @@ void Foam::autoSnapDriver::scaleMesh
 
     scalar oldErrorReduction = -1;
 
+    bool meshOk = false;
+
     Info<< "Moving mesh ..." << endl;
     for (label iter = 0; iter < 2*snapParams.nSnap(); iter++)
     {
@@ -1072,10 +1068,11 @@ void Foam::autoSnapDriver::scaleMesh
             oldErrorReduction = meshMover.setErrorReduction(0.0);
         }
 
-        if (meshMover.scaleMesh(checkFaces, baffles, true, nInitErrors))
+        meshOk = meshMover.scaleMesh(checkFaces, baffles, true, nInitErrors);
+
+        if (meshOk)
         {
             Info<< "Successfully moved mesh" << endl;
-
             break;
         }
         if (debug)
@@ -1098,6 +1095,8 @@ void Foam::autoSnapDriver::scaleMesh
     }
     Info<< "Moved mesh in = "
         << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
+
+    return meshOk;
 }
 
 
@@ -1191,7 +1190,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::repatchToSurface
         (
             unzonedSurfaces,
             localFaceCentres,
-            sqr(4*faceSnapDist),    // sqr of attract distance
+            sqr(faceSnapDist),    // sqr of attract distance
             hitSurface,
             hitRegion
         );
@@ -1260,6 +1259,7 @@ void Foam::autoSnapDriver::doSnap
 (
     const dictionary& snapDict,
     const dictionary& motionDict,
+    const scalar featureCos,
     const snapParameters& snapParams
 )
 {
@@ -1278,6 +1278,21 @@ void Foam::autoSnapDriver::doSnap
     List<labelPair> baffles;
     meshRefiner_.createZoneBaffles(globalToPatch_, baffles);
 
+
+    bool doFeatures = false;
+    label nFeatIter = 1;
+    if (snapParams.nFeatureSnap() > 0)
+    {
+        doFeatures = true;
+        nFeatIter = snapParams.nFeatureSnap();
+
+        Info<< "Snapping to features in " << nFeatIter
+            << " iterations ..." << endl;
+    }
+
+
+    bool meshOk = false;
+
     {
         autoPtr<indirectPrimitivePatch> ppPtr
         (
@@ -1287,10 +1302,9 @@ void Foam::autoSnapDriver::doSnap
                 adaptPatchIDs
             )
         );
-        indirectPrimitivePatch& pp = ppPtr();
 
         // Distance to attract to nearest feature on surface
-        const scalarField snapDist(calcSnapDistance(snapParams, pp));
+        const scalarField snapDist(calcSnapDistance(snapParams, ppPtr()));
 
 
         // Construct iterative mesh mover.
@@ -1302,7 +1316,7 @@ void Foam::autoSnapDriver::doSnap
         motionSmoother meshMover
         (
             mesh,
-            pp,
+            ppPtr(),
             adaptPatchIDs,
             meshRefinement::makeDisplacementField(pMesh, adaptPatchIDs),
             motionDict
@@ -1330,19 +1344,97 @@ void Foam::autoSnapDriver::doSnap
         // Pre-smooth patch vertices (so before determining nearest)
         preSmoothPatch(snapParams, nInitErrors, baffles, meshMover);
 
+        if (debug)
+        {
+            Pout<< "Writing patch smoothed mesh to time "
+                << meshRefiner_.timeName() << '.' << endl;
+            meshRefiner_.write
+            (
+                debug,
+                mesh.time().path()/meshRefiner_.timeName()
+            );
+            Pout<< "Dumped mesh in = "
+                << mesh.time().cpuTimeIncrement() << " s\n" << nl << endl;
+        }
+
+
+        for (label iter = 0; iter < nFeatIter; iter++)
+        {
+            Info<< nl
+                << "Morph iteration " << iter << nl
+                << "-----------------" << endl;
+
             // Calculate displacement at every patch point. Insert into
             // meshMover.
-        calcNearestSurface(snapDist, meshMover);
+            vectorField disp = calcNearestSurface(snapDist, meshMover);
 
-        //// Get smoothly varying internal displacement field.
+            // Override displacement with feature edge attempt
-        //- 2009-12-16 : was not found to be beneficial. Keeping internal
+            if (doFeatures)
-        // fields fixed slightly increases skewness (on boundary)
+            {
-        // but lowers non-orthogonality quite a bit (e.g. 65->59 degrees).
+                disp = calcNearestSurfaceFeature
-        // Maybe if better smoother?
+                (
-        //smoothDisplacement(snapParams, meshMover);
+                    iter,
+                    featureCos,
+                    scalar(iter+1)/nFeatIter,
+                    snapDist,
+                    disp,
+                    meshMover
+                );
+            }
+
+            if (debug&meshRefinement::OBJINTERSECTIONS)
+            {
+                dumpMove
+                (
+                    mesh.time().path()
+                  / "patchDisplacement_" + name(iter) + ".obj",
+                    ppPtr().localPoints(),
+                    ppPtr().localPoints() + disp
+                );
+            }
+
+            // Get smoothly varying internal displacement field.
+            smoothDisplacement(snapParams, meshMover);
 
             // Apply internal displacement to mesh.
-        scaleMesh(snapParams, nInitErrors, baffles, meshMover);
+            meshOk = scaleMesh
+            (
+                snapParams,
+                nInitErrors,
+                baffles,
+                meshMover
+            );
+
+            if (!meshOk)
+            {
+                Info<< "Did not succesfully snap mesh. Giving up."
+                    << nl << endl;
+
+                // Use current mesh as base mesh
+                meshMover.correct();
+
+                break;
+            }
+
+            if (debug)
+            {
+                const_cast<Time&>(mesh.time())++;
+                Pout<< "Writing scaled mesh to time "
+                    << meshRefiner_.timeName() << endl;
+                meshRefiner_.write
+                (
+                    debug,
+                    mesh.time().path()/meshRefiner_.timeName()
+                );
+                Pout<< "Writing displacement field ..." << endl;
+                meshMover.displacement().write();
+                tmp<pointScalarField> magDisp(mag(meshMover.displacement()));
+                magDisp().write();
+            }
+
+            // Use current mesh as base mesh
+            meshMover.correct();
+        }
     }
 
     // Merge any introduced baffles.
@@ -1350,6 +1442,34 @@ void Foam::autoSnapDriver::doSnap
 
     // Repatch faces according to nearest.
     repatchToSurface(snapParams, adaptPatchIDs);
+
+    // Repatching might have caused faces to be on same patch and hence
+    // mergeable so try again to merge coplanar faces
+    label nChanged = meshRefiner_.mergePatchFacesUndo
+    (
+        featureCos,  // minCos
+        featureCos,  // concaveCos
+        meshRefiner_.meshedPatches(),
+        motionDict
+    );
+
+    nChanged += meshRefiner_.mergeEdgesUndo
+    (
+        featureCos,
+        motionDict
+    );
+
+    if (nChanged > 0 && debug)
+    {
+        const_cast<Time&>(mesh.time())++;
+        Pout<< "Writing patchFace merged mesh to time "
+            << meshRefiner_.timeName() << endl;
+        meshRefiner_.write
+        (
+            debug,
+            mesh.time().path()/meshRefiner_.timeName()
+        );
+    }
 }
 
 

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,6 +29,7 @@ Description
 
 SourceFiles
     autoSnapDriver.C
+    autoSnapDriverFeature.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -45,6 +46,7 @@ namespace Foam
 // Forward declaration of classes
 class motionSmoother;
 class snapParameters;
+class pointConstraint;
 
 /*---------------------------------------------------------------------------*\
                            Class autoSnapDriver Declaration
@@ -52,23 +54,6 @@ class snapParameters;
 
 class autoSnapDriver
 {
-    // Private classes
-
-        //- Combine operator class for equalizing displacements.
-        class minMagEqOp
-        {
-        public:
-
-            void operator()(vector& x, const vector& y) const
-            {
-                if (magSqr(y) < magSqr(x))
-                {
-                    x = y;
-                }
-            }
-        };
-
-
     // Private data
 
         //- Mesh+surface
@@ -124,6 +109,174 @@ class autoSnapDriver
                 const vectorField&
             );
 
+            // Feature line snapping
+
+                void smoothAndConstrain
+                (
+                    const indirectPrimitivePatch& pp,
+                    const List<pointConstraint>& constraints,
+                    vectorField& disp
+                ) const;
+                void calcNearest
+                (
+                    const pointField& points,
+                    vectorField& disp,
+                    vectorField& surfaceNormal
+                ) const;
+                void calcNearestFace
+                (
+                    const label iter,
+                    const indirectPrimitivePatch& pp,
+                    vectorField& faceDisp,
+                    vectorField& faceSurfaceNormal,
+                    vectorField& faceRotation
+                ) const;
+                void interpolateFaceToPoint
+                (
+                    const label iter,
+                    const indirectPrimitivePatch& pp,
+                    const vectorField& faceSurfaceNormal,
+
+                    const vectorField& faceDisp,
+                    const vectorField& faceRotation,
+
+                    vectorField& patchDisp,
+                    vectorField& patchRotationDisp
+                ) const;
+                void correctAttraction
+                (
+                    const DynamicList<point>& surfacePoints,
+                    const DynamicList<label>& surfaceCount,
+                    const point& edgePt,
+                    const vector& edgeNormal,   // normalised normal
+                    const point& pt,
+                    vector& edgeOffset  // offset from pt to point on edge
+                ) const;
+                void binFeatureFace
+                (
+                    const label iter,
+                    const scalar featureCos,
+
+                    const indirectPrimitivePatch& pp,
+                    const scalar snapDist,
+
+                    const point& fc,
+                    const vector& faceSurfaceNormal,
+                    const vector& faceDisp,
+
+                    DynamicList<point>& surfacePoints,
+                    DynamicList<vector>& surfaceNormals,
+                    DynamicList<label>& surfaceCount
+                ) const;
+                void binFeatureFaces
+                (
+                    const label iter,
+                    const scalar featureCos,
+
+                    const indirectPrimitivePatch& pp,
+                    const scalarField& snapDist,
+                    const label pointI,
+
+                    const List<List<point> >& pointFaceNormals,
+                    const List<List<point> >& pointFaceDisp,
+                    const List<List<point> >& pointFaceCentres,
+
+                    DynamicList<point>& surfacePoints,
+                    DynamicList<vector>& surfaceNormals,
+                    DynamicList<label>& surfaceCount
+                ) const;
+
+                void featureAttractionUsingReconstruction
+                (
+                    const label iter,
+                    const scalar featureCos,
+                    const indirectPrimitivePatch& pp,
+                    const scalarField& snapDist,
+
+                    const List<List<point> >& pointFaceNormals,
+                    const List<List<point> >& pointFaceDisp,
+                    const List<List<point> >& pointFaceCentres,
+
+                    vectorField& patchAttraction,
+                    List<pointConstraint>& patchConstraints
+                ) const;
+
+                void determineAllFeatures
+                (
+                    const label iter,
+                    const scalar featureCos,
+
+                    const indirectPrimitivePatch&,
+                    const scalarField&,
+
+                    const List<List<point> >& pointFaceNormals,
+                    const List<List<point> >& pointFaceDisp,
+                    const List<List<point> >& pointFaceCentres,
+
+                    List<labelList>& pointAttractor,
+                    List<List<pointConstraint> >& pointConstraints,
+                    // Feature-edge to pp point
+                    List<List<DynamicList<point> > >& edgeAttractors,
+                    List<List<DynamicList<pointConstraint> > >& edgeConstraints,
+                    vectorField& patchAttraction,
+                    List<pointConstraint>& patchConstraints
+                ) const;
+                void determineFeatures
+                (
+                    const label iter,
+                    const scalar featureCos,
+
+                    const indirectPrimitivePatch&,
+                    const scalarField&,
+
+                    const List<List<point> >& pointFaceNormals,
+                    const List<List<point> >& pointFaceDisp,
+                    const List<List<point> >& pointFaceCentres,
+
+                    List<labelList>& pointAttractor,
+                    List<List<pointConstraint> >& pointConstraints,
+                    // Feature-edge to pp point
+                    List<List<DynamicList<point> > >& edgeAttractors,
+                    List<List<DynamicList<pointConstraint> > >& edgeConstraints,
+                    vectorField& patchAttraction,
+                    List<pointConstraint>& patchConstraints
+                ) const;
+
+                void featureAttractionUsingFeatureEdges
+                (
+                    const label iter,
+                    const scalar featureCos,
+                    const indirectPrimitivePatch& pp,
+                    const scalarField& snapDist,
+
+                    const List<List<point> >& pointFaceNormals,
+                    const List<List<point> >& pointFaceDisp,
+                    const List<List<point> >& pointFaceCentres,
+
+                    vectorField& patchAttraction,
+                    List<pointConstraint>& patchConstraints
+                ) const;
+                void preventFaceSqueeze
+                (
+                    const label iter,
+                    const scalar featureCos,
+                    const indirectPrimitivePatch& pp,
+                    const scalarField& snapDist,
+
+                    vectorField& patchAttraction,
+                    List<pointConstraint>& patchConstraints
+                ) const;
+
+                vectorField calcNearestSurfaceFeature
+                (
+                    const label iter,
+                    const scalar featureCos,
+                    const scalar featureAttract,
+                    const scalarField& snapDist,
+                    const vectorField& nearestDisp,
+                    motionSmoother& meshMover
+                ) const;
+
 
         //- Disallow default bitwise copy construct
         autoSnapDriver(const autoSnapDriver&);
@@ -188,6 +341,7 @@ public:
                 motionSmoother& meshMover
             ) const;
 
+
             //- Smooth the displacement field to the internal.
             void smoothDisplacement
             (
@@ -196,8 +350,9 @@ public:
             ) const;
 
             //- Do the hard work: move the mesh according to displacement,
-            //  locally relax the displacement.
+            //  locally relax the displacement. Return true if ended up with
-            void scaleMesh
+            //  correct mesh, false if not.
+            bool scaleMesh
             (
                 const snapParameters& snapParams,
                 const label nInitErrors,
@@ -212,11 +367,11 @@ public:
                 const labelList& adaptPatchIDs
             );
 
-
             void doSnap
             (
                 const dictionary& snapDict,
                 const dictionary& motionDict,
+                const scalar featureCos,
                 const snapParameters& snapParams
             );
 

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,23 +27,14 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from dictionary
-Foam::snapParameters::snapParameters(const dictionary& dict, const label dummy)
-:
-    nSmoothPatch_(readLabel(dict.lookup("nSmoothPatch"))),
-    snapTol_(readScalar(dict.lookup("snapTol"))),
-    nSmoothDispl_(readLabel(dict.lookup("nSmoothDispl"))),
-    nSnap_(readLabel(dict.lookup("nSnap")))
-{}
-
-
 // Construct from dictionary
 Foam::snapParameters::snapParameters(const dictionary& dict)
 :
     nSmoothPatch_(readLabel(dict.lookup("nSmoothPatch"))),
     snapTol_(readScalar(dict.lookup("tolerance"))),
     nSmoothDispl_(readLabel(dict.lookup("nSolveIter"))),
-    nSnap_(readLabel(dict.lookup("nRelaxIter")))
+    nSnap_(readLabel(dict.lookup("nRelaxIter"))),
+    nFeatureSnap_(dict.lookupOrDefault("nFeatureSnapIter", -1))
 {}
 
 

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,6 +61,8 @@ class snapParameters
 
         const label nSnap_;
 
+        const label nFeatureSnap_;
+
 
     // Private Member Functions
 
@@ -75,10 +77,7 @@ public:
 
     // Constructors
 
-        //- Construct from dictionary - old syntax
+        //- Construct from dictionary
-        snapParameters(const dictionary& dict, const label dummy);
-
-        //- Construct from dictionary - new syntax
         snapParameters(const dictionary& dict);
 
 
@@ -114,6 +113,12 @@ public:
             {
                 return nSnap_;
             }
+
+            label nFeatureSnap() const
+            {
+                return nFeatureSnap_;
+            }
+
 };
 
 

src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C

@@ -31,6 +31,7 @@ License
 #include "Time.H"
 #include "refinementHistory.H"
 #include "refinementSurfaces.H"
+#include "refinementFeatures.H"
 #include "decompositionMethod.H"
 #include "regionSplit.H"
 #include "fvMeshDistribute.H"
@@ -216,8 +217,8 @@ void Foam::meshRefinement::updateIntersections(const labelList& changedFaces)
     // Extend segments a bit
     {
         const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
-        start += smallVec;
+        start -= smallVec;
-        end -= smallVec;
+        end += smallVec;
     }
 
 
@@ -327,8 +328,8 @@ void Foam::meshRefinement::checkData()
         // Extend segments a bit
         {
             const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
-            start += smallVec;
+            start -= smallVec;
-            end -= smallVec;
+            end += smallVec;
         }
 
 
@@ -497,6 +498,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRemoveCells
         mesh_.clearOut();
     }
 
+    // Reset the instance for if in overwrite mode
+    mesh_.setInstance(timeName());
+    setInstance(mesh_.facesInstance());
+
     // Update local mesh data
     cellRemover.updateMesh(map);
 
@@ -857,6 +862,7 @@ Foam::meshRefinement::meshRefinement
     const scalar mergeDistance,
     const bool overwrite,
     const refinementSurfaces& surfaces,
+    const refinementFeatures& features,
     const shellSurfaces& shells
 )
 :
@@ -865,6 +871,7 @@ Foam::meshRefinement::meshRefinement
     overwrite_(overwrite),
     oldInstance_(mesh.pointsInstance()),
     surfaces_(surfaces),
+    features_(features),
     shells_(shells),
     meshCutter_
     (
@@ -1271,6 +1278,10 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
 
         // Update numbering of meshRefiner
         distribute(map);
+
+        // Set correct instance (for if overwrite)
+        mesh_.setInstance(timeName());
+        setInstance(mesh_.facesInstance());
     }
     return map;
 }
@@ -1449,6 +1460,8 @@ Foam::tmp<Foam::pointVectorField> Foam::meshRefinement::makeDisplacementField
         }
     }
 
+    // Note: time().timeName() instead of meshRefinement::timeName() since
+    // postprocessable field.
     tmp<pointVectorField> tfld
     (
         new pointVectorField
@@ -1456,7 +1469,7 @@ Foam::tmp<Foam::pointVectorField> Foam::meshRefinement::makeDisplacementField
             IOobject
             (
                 "pointDisplacement",
-                mesh.time().timeName(), //timeName(),
+                mesh.time().timeName(),
                 mesh,
                 IOobject::NO_READ,
                 IOobject::AUTO_WRITE
@@ -1930,10 +1943,6 @@ void Foam::meshRefinement::distribute(const mapDistributePolyMesh& map)
             pointMap.clear();
         }
     }
-
-    // If necessary reset the instance
-    mesh_.setInstance(timeName());
-    setInstance(mesh_.facesInstance());
 }
 
 
@@ -2059,10 +2068,6 @@ void Foam::meshRefinement::updateMesh
             data.transfer(newFaceData);
         }
     }
-
-    // If necessary reset the instance
-    mesh_.setInstance(timeName());
-    setInstance(mesh_.facesInstance());
 }
 
 
@@ -2118,12 +2123,32 @@ void Foam::meshRefinement::printMeshInfo(const bool debug, const string& msg)
             << "  points(local):" << mesh_.nPoints()
             << endl;
     }
-    else
+
     {
+        PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh_));
+        label nMasterFaces = 0;
+        forAll(isMasterFace, i)
+        {
+            if (isMasterFace[i])
+            {
+                nMasterFaces++;
+            }
+        }
+
+        PackedBoolList isMasterPoint(syncTools::getMasterPoints(mesh_));
+        label nMasterPoints = 0;
+        forAll(isMasterPoint, i)
+        {
+            if (isMasterPoint[i])
+            {
+                nMasterPoints++;
+            }
+        }
+
         Info<< msg.c_str()
             << " : cells:" << pData.nTotalCells()
-            << "  faces:" << pData.nTotalFaces()
+            << "  faces:" << returnReduce(nMasterFaces, sumOp<label>())
-            << "  points:" << pData.nTotalPoints()
+            << "  points:" << returnReduce(nMasterPoints, sumOp<label>())
             << endl;
     }
 
@@ -2168,12 +2193,14 @@ Foam::word Foam::meshRefinement::timeName() const
 
 void Foam::meshRefinement::dumpRefinementLevel() const
 {
+    // Note: use time().timeName(), not meshRefinement::timeName()
+    // so as to dump the fields to 0, not to constant.
     volScalarField volRefLevel
     (
         IOobject
         (
             "cellLevel",
-            mesh_.time().timeName(),// Dump to current time, not to mesh inst
+            mesh_.time().timeName(),
             mesh_,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE,
@@ -2201,7 +2228,7 @@ void Foam::meshRefinement::dumpRefinementLevel() const
         IOobject
         (
             "pointLevel",
-            mesh_.time().timeName(),// Dump to current time, not to mesh inst
+            mesh_.time().timeName(),
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
@@ -2266,8 +2293,8 @@ void Foam::meshRefinement::dumpIntersections(const fileName& prefix) const
         // Extend segments a bit
         {
             const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
-            start += smallVec;
+            start -= smallVec;
-            end -= smallVec;
+            end += smallVec;
         }
 
 

src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H

@@ -62,13 +62,14 @@ class fvMesh;
 class mapDistributePolyMesh;
 class decompositionMethod;
 class refinementSurfaces;
+class refinementFeatures;
 class shellSurfaces;
 class removeCells;
-class featureEdgeMesh;
 class fvMeshDistribute;
 class searchableSurface;
 class regionSplit;
 class globalIndex;
+class removePoints;
 
 /*---------------------------------------------------------------------------*\
                            Class meshRefinement Declaration
@@ -118,6 +119,9 @@ private:
         //- All surface-intersection interaction
         const refinementSurfaces& surfaces_;
 
+        //- All feature-edge interaction
+        const refinementFeatures& features_;
+
         //- All shell-refinement interaction
         const shellSurfaces& shells_;
 
@@ -260,8 +264,6 @@ private:
             label markFeatureRefinement
             (
                 const point& keepPoint,
-                const PtrList<featureEdgeMesh>& featureMeshes,
-                const labelList& featureLevels,
                 const label nAllowRefine,
 
                 labelList& refineCell,
@@ -415,12 +417,6 @@ private:
                 const labelList& globalToPatch
             ) const;
 
-            ////- Initial test of marking faces using geometric information.
-            //labelList markFacesOnProblemCellsGeometric
-            //(
-            //    const dictionary& motionDict
-            //) const;
-
 
         // Baffle merging
 
@@ -501,6 +497,7 @@ public:
             const scalar mergeDistance,
             const bool overwrite,
             const refinementSurfaces&,
+            const refinementFeatures&,
             const shellSurfaces&
         );
 
@@ -542,6 +539,12 @@ public:
                 return surfaces_;
             }
 
+            //- reference to feature edge mesh
+            const refinementFeatures& features() const
+            {
+                return features_;
+            }
+
             //- reference to refinement shells (regions)
             const shellSurfaces& shells() const
             {
@@ -648,9 +651,6 @@ public:
                 const point& keepPoint,
                 const scalar curvature,
 
-                const PtrList<featureEdgeMesh>& featureMeshes,
-                const labelList& featureLevels,
-
                 const bool featureRefinement,
                 const bool internalRefinement,
                 const bool surfaceRefinement,
@@ -803,19 +803,45 @@ public:
                     const Map<label>& cellsToRestore
                 );
 
+            // Merging coplanar faces and edges
 
-            //- Merge faces on the same patch (usually from exposing refinement)
+                label mergePatchFacesUndo
-            //  Returns global number of faces merged.
-            label mergePatchFaces
                 (
                     const scalar minCos,
                     const scalar concaveCos,
-                const labelList& patchIDs
+                    const labelList& patchIDs,
+                    const dictionary& motionDict
                 );
 
-            //- Remove points not used by any face or points used
+                autoPtr<mapPolyMesh> doRemovePoints
-            // by only two faces where the edges are in line
+                (
-            autoPtr<mapPolyMesh> mergeEdges(const scalar minCos);
+                    removePoints& pointRemover,
+                    const boolList& pointCanBeDeleted
+                );
+
+                autoPtr<mapPolyMesh> doRestorePoints
+                (
+                    removePoints& pointRemover,
+                    const labelList& facesToRestore
+                );
+
+                labelList collectFaces
+                (
+                    const labelList& candidateFaces,
+                    const labelHashSet& set
+                ) const;
+
+                // Pick up faces of cells of faces in set.
+                labelList growFaceCellFace
+                (
+                    const labelHashSet& set
+                ) const;
+
+                label mergeEdgesUndo
+                (
+                    const scalar minCos,
+                    const dictionary& motionDict
+                );
 
 
         // Debug/IO

src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C

@@ -286,8 +286,8 @@ void Foam::meshRefinement::getBafflePatches
     // Extend segments a bit
     {
         const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
-        start += smallVec;
+        start -= smallVec;
-        end -= smallVec;
+        end += smallVec;
     }
 
 
@@ -524,6 +524,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createBaffles
         mesh_.clearOut();
     }
 
+
+    // Reset the instance for if in overwrite mode
+    mesh_.setInstance(timeName());
+
     //- Redo the intersections on the newly create baffle faces. Note that
     //  this changes also the cell centre positions.
     faceSet baffledFacesSet(mesh_, "baffledFacesSet", 2*nBaffles);
@@ -644,7 +648,7 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::getDuplicateFaces
         }
         Pout<< "Writing duplicate faces (baffles) to faceSet "
             << duplicateFaceSet.name() << nl << endl;
-        duplicateFaceSet.instance() = mesh_.time().timeName();
+        duplicateFaceSet.instance() = timeName();
         duplicateFaceSet.write();
     }
 
@@ -724,9 +728,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createZoneBaffles
             if (debug)
             {
                 const_cast<Time&>(mesh_.time())++;
-                Pout<< "Writing baffled mesh to time "
+                Pout<< "Writing zone-baffled mesh to time " << timeName()
-                    << mesh_.time().timeName() << endl;
+                    << endl;
-                mesh_.write();
+                write(debug, mesh_.time().path()/"baffles");
             }
         }
         Info<< "Created " << nZoneFaces << " baffles in = "
@@ -746,14 +750,6 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::filterDuplicateFaces
     const List<labelPair>& couples
 ) const
 {
-    // Construct addressing engine for all duplicate faces (only one
-    // for each pair)
-
-    // Duplicate faces in mesh labels (first face of each pair only)
-    // (reused later on to mark off filtered couples. see below)
-    labelList duplicateFaces(couples.size());
-
-
     // All duplicate faces on edge of the patch are to be merged.
     // So we count for all edges of duplicate faces how many duplicate
     // faces use them.
@@ -824,7 +820,8 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::filterDuplicateFaces
 
 
     // Baffles which are not next to other boundaries and baffles will have
-    // value 2*1000000+2*1
+    // nBafflesPerEdge value 2*1000000+2*1 (from 2 boundary faces which are
+    // both baffle faces)
 
     List<labelPair> filteredCouples(couples.size());
     label filterI = 0;
@@ -967,6 +964,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeBaffles
         mesh_.clearOut();
     }
 
+    // Reset the instance for if in overwrite mode
+    mesh_.setInstance(timeName());
+
     // Update intersections. Recalculate intersections on merged faces since
     // this seems to give problems? Note: should not be nessecary since
     // baffles preserve intersections from when they were created.
@@ -1789,7 +1789,7 @@ void Foam::meshRefinement::baffleAndSplitMesh
                     problemTopo.insert(faceI);
                 }
             }
-            problemTopo.instance() = mesh_.time().timeName();
+            problemTopo.instance() = timeName();
             Pout<< "Dumping " << problemTopo.size()
                 << " problem faces to " << problemTopo.objectPath() << endl;
             problemTopo.write();
@@ -2246,6 +2246,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::dupNonManifoldPoints()
         mesh_.clearOut();
     }
 
+    // Reset the instance for if in overwrite mode
+    mesh_.setInstance(timeName());
+
     // Update intersections. Is mapping only (no faces created, positions stay
     // same) so no need to recalculate intersections.
     updateMesh(map, labelList(0));
@@ -2457,8 +2460,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
         // Extend segments a bit
         {
             const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
-            start += smallVec;
+            start -= smallVec;
-            end -= smallVec;
+            end += smallVec;
         }
 
 
@@ -2782,6 +2785,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
         mesh_.clearOut();
     }
 
+    // Reset the instance for if in overwrite mode
+    mesh_.setInstance(timeName());
+
     // Print some stats (note: zones are synchronised)
     if (mesh_.cellZones().size() > 0)
     {

src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,25 +27,240 @@ License
 #include "combineFaces.H"
 #include "polyTopoChange.H"
 #include "removePoints.H"
+#include "faceSet.H"
+#include "Time.H"
+#include "motionSmoother.H"
+#include "syncTools.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Merge faces that are in-line.
+//// Merge faces that are in-line.
-Foam::label Foam::meshRefinement::mergePatchFaces
+//Foam::label Foam::meshRefinement::mergePatchFaces
+//(
+//    const scalar minCos,
+//    const scalar concaveCos,
+//    const labelList& patchIDs
+//)
+//{
+//    // Patch face merging engine
+//    combineFaces faceCombiner(mesh_);
+//
+//    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+//
+//    // Pick up all candidate cells on boundary
+//    labelHashSet boundaryCells(mesh_.nFaces()-mesh_.nInternalFaces());
+//
+//    forAll(patchIDs, i)
+//    {
+//        label patchI = patchIDs[i];
+//
+//        const polyPatch& patch = patches[patchI];
+//
+//        if (!patch.coupled())
+//        {
+//            forAll(patch, i)
+//            {
+//                boundaryCells.insert(mesh_.faceOwner()[patch.start()+i]);
+//            }
+//        }
+//    }
+//
+//    // Get all sets of faces that can be merged
+//    labelListList mergeSets
+//    (
+//        faceCombiner.getMergeSets
+//        (
+//            minCos,
+//            concaveCos,
+//            boundaryCells
+//        )
+//    );
+//
+//    label nFaceSets = returnReduce(mergeSets.size(), sumOp<label>());
+//
+//    Info<< "mergePatchFaces : Merging " << nFaceSets
+//        << " sets of faces." << endl;
+//
+//    if (nFaceSets > 0)
+//    {
+//        // Topology changes container
+//        polyTopoChange meshMod(mesh_);
+//
+//        // Merge all faces of a set into the first face of the set. Remove
+//        // unused points.
+//        faceCombiner.setRefinement(mergeSets, meshMod);
+//
+//        // Change the mesh (no inflation)
+//        autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+//
+//        // Update fields
+//        mesh_.updateMesh(map);
+//
+//        // Move mesh (since morphing does not do this)
+//        if (map().hasMotionPoints())
+//        {
+//            mesh_.movePoints(map().preMotionPoints());
+//        }
+//        else
+//        {
+//            // Delete mesh volumes. No other way to do this?
+//            mesh_.clearOut();
+//        }
+//
+//
+//        // Reset the instance for if in overwrite mode
+//        mesh_.setInstance(timeName());
+//
+//        faceCombiner.updateMesh(map);
+//
+//        // Get the kept faces that need to be recalculated.
+//        // Merging two boundary faces might shift the cell centre
+//        // (unless the faces are absolutely planar)
+//        labelHashSet retestFaces(6*mergeSets.size());
+//
+//        forAll(mergeSets, setI)
+//        {
+//            label oldMasterI = mergeSets[setI][0];
+//
+//            label faceI = map().reverseFaceMap()[oldMasterI];
+//
+//            // faceI is always uncoupled boundary face
+//            const cell& cFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
+//
+//            forAll(cFaces, i)
+//            {
+//                retestFaces.insert(cFaces[i]);
+//            }
+//        }
+//        updateMesh(map, retestFaces.toc());
+//    }
+//
+//
+//    return nFaceSets;
+//}
+//
+//
+//// Remove points not used by any face or points used by only two faces where
+//// the edges are in line
+//Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeEdges
+//(
+//    const scalar minCos
+//)
+//{
+//    // Point removal analysis engine
+//    removePoints pointRemover(mesh_);
+//
+//    // Count usage of points
+//    boolList pointCanBeDeleted;
+//    label nRemove = pointRemover.countPointUsage(minCos, pointCanBeDeleted);
+//
+//    Info<< "Removing " << nRemove
+//        << " straight edge points." << endl;
+//
+//    autoPtr<mapPolyMesh> map;
+//
+//    if (nRemove > 0)
+//    {
+//        // Save my local faces that will change. These changed faces might
+//        // cause a shift in the cell centre which needs to be retested.
+//        // Have to do this before changing mesh since point will be removed.
+//        labelHashSet retestOldFaces(nRemove / Pstream::nProcs());
+//
+//        {
+//            const faceList& faces = mesh_.faces();
+//
+//            forAll(faces, faceI)
+//            {
+//                const face& f = faces[faceI];
+//
+//                forAll(f, fp)
+//                {
+//                    if (pointCanBeDeleted[f[fp]])
+//                    {
+//                        retestOldFaces.insert(faceI);
+//                        break;
+//                    }
+//                }
+//            }
+//        }
+//
+//        // Topology changes container
+//        polyTopoChange meshMod(mesh_);
+//
+//        pointRemover.setRefinement(pointCanBeDeleted, meshMod);
+//
+//        // Change the mesh (no inflation)
+//        map = meshMod.changeMesh(mesh_, false, true);
+//
+//        // Update fields
+//        mesh_.updateMesh(map);
+//
+//        // Move mesh (since morphing does not do this)
+//        if (map().hasMotionPoints())
+//        {
+//            mesh_.movePoints(map().preMotionPoints());
+//        }
+//        else
+//        {
+//            // Delete mesh volumes. No other way to do this?
+//            mesh_.clearOut();
+//        }
+//
+//        // Reset the instance for if in overwrite mode
+//        mesh_.setInstance(timeName());
+//
+//        pointRemover.updateMesh(map);
+//
+//        // Get the kept faces that need to be recalculated.
+//        labelHashSet retestFaces(6*retestOldFaces.size());
+//
+//        const cellList& cells = mesh_.cells();
+//
+//        forAllConstIter(labelHashSet, retestOldFaces, iter)
+//        {
+//            label faceI = map().reverseFaceMap()[iter.key()];
+//
+//            const cell& ownFaces = cells[mesh_.faceOwner()[faceI]];
+//
+//            forAll(ownFaces, i)
+//            {
+//                retestFaces.insert(ownFaces[i]);
+//            }
+//
+//            if (mesh_.isInternalFace(faceI))
+//            {
+//                const cell& neiFaces = cells[mesh_.faceNeighbour()[faceI]];
+//
+//                forAll(neiFaces, i)
+//                {
+//                    retestFaces.insert(neiFaces[i]);
+//                }
+//            }
+//        }
+//        updateMesh(map, retestFaces.toc());
+//    }
+//
+//    return map;
+//}
+
+
+Foam::label Foam::meshRefinement::mergePatchFacesUndo
 (
     const scalar minCos,
     const scalar concaveCos,
-    const labelList& patchIDs
+    const labelList& patchIDs,
+    const dictionary& motionDict
 )
 {
     // Patch face merging engine
-    combineFaces faceCombiner(mesh_);
+    combineFaces faceCombiner(mesh_, true);
-
-    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
     // Pick up all candidate cells on boundary
     labelHashSet boundaryCells(mesh_.nFaces()-mesh_.nInternalFaces());
 
+    {
+        const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
         forAll(patchIDs, i)
         {
             label patchI = patchIDs[i];
@@ -60,9 +275,10 @@ Foam::label Foam::meshRefinement::mergePatchFaces
                 }
             }
         }
+    }
 
     // Get all sets of faces that can be merged
-    labelListList mergeSets
+    labelListList allFaceSets
     (
         faceCombiner.getMergeSets
         (
@@ -72,19 +288,44 @@ Foam::label Foam::meshRefinement::mergePatchFaces
         )
     );
 
-    label nFaceSets = returnReduce(mergeSets.size(), sumOp<label>());
+    label nFaceSets = returnReduce(allFaceSets.size(), sumOp<label>());
 
-    Info<< "mergePatchFaces : Merging " << nFaceSets
+    Info<< "Merging " << nFaceSets << " sets of faces." << nl << endl;
-        << " sets of faces." << endl;
 
     if (nFaceSets > 0)
     {
+        if (debug)
+        {
+            faceSet allSets(mesh_, "allFaceSets", allFaceSets.size());
+            forAll(allFaceSets, setI)
+            {
+                forAll(allFaceSets[setI], i)
+                {
+                    allSets.insert(allFaceSets[setI][i]);
+                }
+            }
+            Pout<< "Writing all faces to be merged to set "
+                << allSets.objectPath() << endl;
+            allSets.instance() = timeName();
+            allSets.write();
+
+            const_cast<Time&>(mesh_.time())++;
+        }
+
+
         // Topology changes container
         polyTopoChange meshMod(mesh_);
 
-        // Merge all faces of a set into the first face of the set. Remove
+        // Merge all faces of a set into the first face of the set.
-        // unused points.
+        faceCombiner.setRefinement(allFaceSets, meshMod);
-        faceCombiner.setRefinement(mergeSets, meshMod);
+
+        // Experimental: store data for all the points that have been deleted
+        storeData
+        (
+            faceCombiner.savedPointLabels(),    // points to store
+            labelList(0),                       // faces to store
+            labelList(0)                        // cells to store
+        );
 
         // Change the mesh (no inflation)
         autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
@@ -99,90 +340,169 @@ Foam::label Foam::meshRefinement::mergePatchFaces
         }
         else
         {
-            // Delete mesh volumes. No other way to do this?
+            // Delete mesh volumes.
             mesh_.clearOut();
         }
 
+        // Reset the instance for if in overwrite mode
+        mesh_.setInstance(timeName());
+
         faceCombiner.updateMesh(map);
 
-        // Get the kept faces that need to be recalculated.
+        updateMesh(map, labelList(0));
-        // Merging two boundary faces might shift the cell centre
-        // (unless the faces are absolutely planar)
-        labelHashSet retestFaces(6*mergeSets.size());
 
-        forAll(mergeSets, setI)
+        if (debug)
         {
-            label oldMasterI = mergeSets[setI][0];
+            Pout<< "Writing initial merged-faces mesh to time "
+                << timeName() << nl << endl;
+            write();
+        }
 
-            label faceI = map().reverseFaceMap()[oldMasterI];
+        for (label iteration = 0; iteration < 100; iteration++)
+        {
+            Info<< nl
+                << "Undo iteration " << iteration << nl
+                << "----------------" << endl;
 
-            // faceI is always uncoupled boundary face
+
-            const cell& cFaces = mesh_.cells()[mesh_.faceOwner()[faceI]];
+            // Check mesh for errors
+            // ~~~~~~~~~~~~~~~~~~~~~
+
+            faceSet errorFaces
+            (
+                mesh_,
+                "errorFaces",
+                mesh_.nFaces()-mesh_.nInternalFaces()
+            );
+            bool hasErrors = motionSmoother::checkMesh
+            (
+                false,  // report
+                mesh_,
+                motionDict,
+                errorFaces
+            );
+
+            //if (checkEdgeConnectivity)
+            //{
+            //    Info<< "Checking edge-face connectivity (duplicate faces"
+            //        << " or non-consecutive shared vertices)" << endl;
+            //
+            //    label nOldSize = errorFaces.size();
+            //
+            //    hasErrors =
+            //        mesh_.checkFaceFaces
+            //        (
+            //            false,
+            //            &errorFaces
+            //        )
+            //     || hasErrors;
+            //
+            //    Info<< "Detected additional "
+            //        <<  returnReduce
+            //            (
+            //                errorFaces.size() - nOldSize,
+            //                sumOp<label>()
+            //            )
+            //        << " faces with illegal face-face connectivity"
+            //        << endl;
+            //}
+
+            if (!hasErrors)
+            {
+                break;
+            }
+
+
+            if (debug)
+            {
+                errorFaces.instance() = timeName();
+                Pout<< "Writing all faces in error to faceSet "
+                    << errorFaces.objectPath() << nl << endl;
+                errorFaces.write();
+            }
+
+
+            // Check any master cells for using any of the error faces
+            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+            DynamicList<label> mastersToRestore(allFaceSets.size());
+
+            forAll(allFaceSets, setI)
+            {
+                label masterFaceI = faceCombiner.masterFace()[setI];
+
+                if (masterFaceI != -1)
+                {
+                    label masterCellII = mesh_.faceOwner()[masterFaceI];
+
+                    const cell& cFaces = mesh_.cells()[masterCellII];
 
                     forAll(cFaces, i)
                     {
-                retestFaces.insert(cFaces[i]);
+                        if (errorFaces.found(cFaces[i]))
-            }
-        }
-        updateMesh(map, retestFaces.toc());
-    }
-
-
-    return nFaceSets;
-}
-
-
-// Remove points not used by any face or points used by only two faces where
-// the edges are in line
-Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeEdges
-(
-    const scalar minCos
-)
                         {
-    // Point removal analysis engine
+                            mastersToRestore.append(masterFaceI);
-    removePoints pointRemover(mesh_);
-
-    // Count usage of points
-    boolList pointCanBeDeleted;
-    label nRemove = pointRemover.countPointUsage(minCos, pointCanBeDeleted);
-
-    Info<< "Removing " << nRemove
-        << " straight edge points." << endl;
-
-    autoPtr<mapPolyMesh> map;
-
-    if (nRemove > 0)
-    {
-        // Save my local faces that will change. These changed faces might
-        // cause a shift in the cell centre which needs to be retested.
-        // Have to do this before changing mesh since point will be removed.
-        labelHashSet retestOldFaces(nRemove / Pstream::nProcs());
-
-        {
-            const faceList& faces = mesh_.faces();
-
-            forAll(faces, faceI)
-            {
-                const face& f = faces[faceI];
-
-                forAll(f, fp)
-                {
-                    if (pointCanBeDeleted[f[fp]])
-                    {
-                        retestOldFaces.insert(faceI);
                             break;
                         }
                     }
                 }
             }
+            mastersToRestore.shrink();
+
+            label nRestore = returnReduce
+            (
+                mastersToRestore.size(),
+                sumOp<label>()
+            );
+
+            Info<< "Masters that need to be restored:"
+                << nRestore << endl;
+
+            if (debug)
+            {
+                faceSet restoreSet(mesh_, "mastersToRestore", mastersToRestore);
+                restoreSet.instance() = timeName();
+                Pout<< "Writing all " << mastersToRestore.size()
+                    << " masterfaces to be restored to set "
+                    << restoreSet.objectPath() << endl;
+                restoreSet.write();
+            }
+
+
+            if (nRestore == 0)
+            {
+                break;
+            }
+
+
+            // Undo
+            // ~~~~
+
+            if (debug)
+            {
+                const_cast<Time&>(mesh_.time())++;
+            }
 
             // Topology changes container
             polyTopoChange meshMod(mesh_);
 
-        pointRemover.setRefinement(pointCanBeDeleted, meshMod);
+            // Merge all faces of a set into the first face of the set.
+            // Experimental:mark all points/faces/cells that have been restored.
+            Map<label> restoredPoints(0);
+            Map<label> restoredFaces(0);
+            Map<label> restoredCells(0);
+
+            faceCombiner.setUnrefinement
+            (
+                mastersToRestore,
+                meshMod,
+                restoredPoints,
+                restoredFaces,
+                restoredCells
+            );
 
             // Change the mesh (no inflation)
-        map = meshMod.changeMesh(mesh_, false, true);
+            autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
 
             // Update fields
             mesh_.updateMesh(map);
@@ -194,43 +514,364 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::mergeEdges
             }
             else
             {
-            // Delete mesh volumes. No other way to do this?
+                // Delete mesh volumes.
                 mesh_.clearOut();
             }
 
+
+            // Reset the instance for if in overwrite mode
+            mesh_.setInstance(timeName());
+
+            faceCombiner.updateMesh(map);
+
+            // Renumber restore maps
+            inplaceMapKey(map().reversePointMap(), restoredPoints);
+            inplaceMapKey(map().reverseFaceMap(), restoredFaces);
+            inplaceMapKey(map().reverseCellMap(), restoredCells);
+
+            // Experimental:restore all points/face/cells in maps
+            updateMesh
+            (
+                map,
+                labelList(0),       // changedFaces
+                restoredPoints,
+                restoredFaces,
+                restoredCells
+            );
+
+            if (debug)
+            {
+                Pout<< "Writing merged-faces mesh to time "
+                    << timeName() << nl << endl;
+                write();
+            }
+
+            Info<< endl;
+        }
+    }
+    else
+    {
+        Info<< "No faces merged ..." << endl;
+    }
+
+    return nFaceSets;
+}
+
+
+// Remove points. pointCanBeDeleted is parallel synchronised.
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRemovePoints
+(
+    removePoints& pointRemover,
+    const boolList& pointCanBeDeleted
+)
+{
+    // Topology changes container
+    polyTopoChange meshMod(mesh_);
+
+    pointRemover.setRefinement(pointCanBeDeleted, meshMod);
+
+    // Change the mesh (no inflation)
+    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+
+    // Update fields
+    mesh_.updateMesh(map);
+
+    // Move mesh (since morphing does not do this)
+    if (map().hasMotionPoints())
+    {
+        mesh_.movePoints(map().preMotionPoints());
+    }
+    else
+    {
+        // Delete mesh volumes.
+        mesh_.clearOut();
+    }
+
+    // Reset the instance for if in overwrite mode
+    mesh_.setInstance(timeName());
+
     pointRemover.updateMesh(map);
-
+    updateMesh(map, labelList(0));
-        // Get the kept faces that need to be recalculated.
-        labelHashSet retestFaces(6*retestOldFaces.size());
-
-        const cellList& cells = mesh_.cells();
-
-        forAllConstIter(labelHashSet, retestOldFaces, iter)
-        {
-            label faceI = map().reverseFaceMap()[iter.key()];
-
-            const cell& ownFaces = cells[mesh_.faceOwner()[faceI]];
-
-            forAll(ownFaces, i)
-            {
-                retestFaces.insert(ownFaces[i]);
-            }
-
-            if (mesh_.isInternalFace(faceI))
-            {
-                const cell& neiFaces = cells[mesh_.faceNeighbour()[faceI]];
-
-                forAll(neiFaces, i)
-                {
-                    retestFaces.insert(neiFaces[i]);
-                }
-            }
-        }
-        updateMesh(map, retestFaces.toc());
-    }
 
     return map;
 }
 
 
+// Restore faces (which contain removed points)
+Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::doRestorePoints
+(
+    removePoints& pointRemover,
+    const labelList& facesToRestore
+)
+{
+    // Topology changes container
+    polyTopoChange meshMod(mesh_);
+
+    // Determine sets of points and faces to restore
+    labelList localFaces, localPoints;
+    pointRemover.getUnrefimentSet
+    (
+        facesToRestore,
+        localFaces,
+        localPoints
+    );
+
+    // Undo the changes on the faces that are in error.
+    pointRemover.setUnrefinement
+    (
+        localFaces,
+        localPoints,
+        meshMod
+    );
+
+    // Change the mesh (no inflation)
+    autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh_, false, true);
+
+    // Update fields
+    mesh_.updateMesh(map);
+
+    // Move mesh (since morphing does not do this)
+    if (map().hasMotionPoints())
+    {
+        mesh_.movePoints(map().preMotionPoints());
+    }
+    else
+    {
+        // Delete mesh volumes.
+        mesh_.clearOut();
+    }
+
+    // Reset the instance for if in overwrite mode
+    mesh_.setInstance(timeName());
+
+    pointRemover.updateMesh(map);
+    updateMesh(map, labelList(0));
+
+    return map;
+}
+
+
+// Collect all faces that are both in candidateFaces and in the set.
+// If coupled face also collects the coupled face.
+Foam::labelList Foam::meshRefinement::collectFaces
+(
+    const labelList& candidateFaces,
+    const labelHashSet& set
+) const
+{
+    // Has face been selected?
+    boolList selected(mesh_.nFaces(), false);
+
+    forAll(candidateFaces, i)
+    {
+        label faceI = candidateFaces[i];
+
+        if (set.found(faceI))
+        {
+            selected[faceI] = true;
+        }
+    }
+    syncTools::syncFaceList
+    (
+        mesh_,
+        selected,
+        orEqOp<bool>()      // combine operator
+    );
+
+    labelList selectedFaces(findIndices(selected, true));
+
+    return selectedFaces;
+}
+
+
+// Pick up faces of cells of faces in set.
+Foam::labelList Foam::meshRefinement::growFaceCellFace
+(
+    const labelHashSet& set
+) const
+{
+    boolList selected(mesh_.nFaces(), false);
+
+    forAllConstIter(faceSet, set, iter)
+    {
+        label faceI = iter.key();
+
+        label own = mesh_.faceOwner()[faceI];
+
+        const cell& ownFaces = mesh_.cells()[own];
+        forAll(ownFaces, ownFaceI)
+        {
+            selected[ownFaces[ownFaceI]] = true;
+        }
+
+        if (mesh_.isInternalFace(faceI))
+        {
+            label nbr = mesh_.faceNeighbour()[faceI];
+
+            const cell& nbrFaces = mesh_.cells()[nbr];
+            forAll(nbrFaces, nbrFaceI)
+            {
+                selected[nbrFaces[nbrFaceI]] = true;
+            }
+        }
+    }
+    syncTools::syncFaceList
+    (
+        mesh_,
+        selected,
+        orEqOp<bool>()      // combine operator
+    );
+    return findIndices(selected, true);
+}
+
+
+// Remove points not used by any face or points used by only two faces where
+// the edges are in line
+Foam::label Foam::meshRefinement::mergeEdgesUndo
+(
+    const scalar minCos,
+    const dictionary& motionDict
+)
+{
+    Info<< nl
+        << "Merging all points on surface that" << nl
+        << "- are used by only two boundary faces and" << nl
+        << "- make an angle with a cosine of more than " << minCos
+        << "." << nl << endl;
+
+    // Point removal analysis engine with undo
+    removePoints pointRemover(mesh_, true);
+
+    // Count usage of points
+    boolList pointCanBeDeleted;
+    label nRemove = pointRemover.countPointUsage(minCos, pointCanBeDeleted);
+
+    if (nRemove > 0)
+    {
+        Info<< "Removing " << nRemove
+            << " straight edge points ..." << nl << endl;
+
+        // Remove points
+        // ~~~~~~~~~~~~~
+
+        doRemovePoints(pointRemover, pointCanBeDeleted);
+
+
+        for (label iteration = 0; iteration < 100; iteration++)
+        {
+            Info<< nl
+                << "Undo iteration " << iteration << nl
+                << "----------------" << endl;
+
+
+            // Check mesh for errors
+            // ~~~~~~~~~~~~~~~~~~~~~
+
+            faceSet errorFaces
+            (
+                mesh_,
+                "errorFaces",
+                mesh_.nFaces()-mesh_.nInternalFaces()
+            );
+            bool hasErrors = motionSmoother::checkMesh
+            (
+                false,  // report
+                mesh_,
+                motionDict,
+                errorFaces
+            );
+            //if (checkEdgeConnectivity)
+            //{
+            //    Info<< "Checking edge-face connectivity (duplicate faces"
+            //        << " or non-consecutive shared vertices)" << endl;
+            //
+            //    label nOldSize = errorFaces.size();
+            //
+            //    hasErrors =
+            //        mesh_.checkFaceFaces
+            //        (
+            //            false,
+            //            &errorFaces
+            //        )
+            //     || hasErrors;
+            //
+            //    Info<< "Detected additional "
+            //        << returnReduce(errorFaces.size()-nOldSize,sumOp<label>())
+            //        << " faces with illegal face-face connectivity"
+            //        << endl;
+            //}
+
+            if (!hasErrors)
+            {
+                break;
+            }
+
+            if (debug)
+            {
+                errorFaces.instance() = timeName();
+                Pout<< "**Writing all faces in error to faceSet "
+                    << errorFaces.objectPath() << nl << endl;
+                errorFaces.write();
+            }
+
+            labelList masterErrorFaces
+            (
+                collectFaces
+                (
+                    pointRemover.savedFaceLabels(),
+                    errorFaces
+                )
+            );
+
+            label n = returnReduce(masterErrorFaces.size(), sumOp<label>());
+
+            Info<< "Detected " << n
+                << " error faces on boundaries that have been merged."
+                << " These will be restored to their original faces." << nl
+                << endl;
+
+            if (n == 0)
+            {
+                if (hasErrors)
+                {
+                    Info<< "Detected "
+                        << returnReduce(errorFaces.size(), sumOp<label>())
+                        << " error faces in mesh."
+                        << " Restoring neighbours of faces in error." << nl
+                        << endl;
+
+                    labelList expandedErrorFaces
+                    (
+                        growFaceCellFace
+                        (
+                            errorFaces
+                        )
+                    );
+
+                    doRestorePoints(pointRemover, expandedErrorFaces);
+                }
+
+                break;
+            }
+
+            doRestorePoints(pointRemover, masterErrorFaces);
+        }
+
+        if (debug)
+        {
+            const_cast<Time&>(mesh_.time())++;
+            Pout<< "Writing merged-edges mesh to time "
+                << timeName() << nl << endl;
+            write();
+        }
+    }
+    else
+    {
+        Info<< "No straight edges simplified and no points removed ..." << endl;
+    }
+
+    return nRemove;
+}
+
+
 // ************************************************************************* //

src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -202,7 +202,7 @@ Foam::Map<Foam::label> Foam::meshRefinement::findEdgeConnectedProblemCells
     if (debug)
     {
         faceSet fSet(mesh_, "edgeConnectedFaces", candidateFaces);
-        fSet.instance() = mesh_.time().timeName();
+        fSet.instance() = timeName();
         Pout<< "Writing " << fSet.size()
             << " with problematic topology to faceSet "
             << fSet.objectPath() << endl;
@@ -265,7 +265,7 @@ Foam::Map<Foam::label> Foam::meshRefinement::findEdgeConnectedProblemCells
 
     if (debug)
     {
-        perpFaces.instance() = mesh_.time().timeName();
+        perpFaces.instance() = timeName();
         Pout<< "Writing " << perpFaces.size()
             << " faces that are perpendicular to the surface to set "
             << perpFaces.objectPath() << endl;
@@ -427,6 +427,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
 
     // Count of faces marked for baffling
     label nBaffleFaces = 0;
+    PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh_));
 
     // Count of faces not baffled since would not cause a collapse
     label nPrevented = 0;
@@ -483,7 +484,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
         if (debug)
         {
             cellSet problemCellSet(mesh_, "problemCells", problemCells.toc());
-            problemCellSet.instance() = mesh_.time().timeName();
+            problemCellSet.instance() = timeName();
             Pout<< "Writing " << problemCellSet.size()
                 << " cells that are edge connected to coarser cell to set "
                 << problemCellSet.objectPath() << endl;
@@ -918,7 +919,10 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
                         else
                         {
                             facePatch[faceI] = getBafflePatch(facePatch, faceI);
+                            if (isMasterFace[faceI])
+                            {
                                 nBaffleFaces++;
+                            }
 
                             // Do NOT update boundary data since this would grow
                             // blocked faces across gaps.

src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C

@@ -28,6 +28,7 @@ License
 #include "syncTools.H"
 #include "Time.H"
 #include "refinementSurfaces.H"
+#include "refinementFeatures.H"
 #include "shellSurfaces.H"
 #include "faceSet.H"
 #include "decompositionMethod.H"
@@ -53,6 +54,11 @@ Foam::labelList Foam::meshRefinement::getChangedFaces
     const polyMesh& mesh = map.mesh();
 
     labelList changedFaces;
+
+    // For reporting: number of masterFaces changed
+    label nMasterChanged = 0;
+    PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh));
+
     {
         // Mark any face on a cell which has been added or changed
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -182,36 +188,26 @@ Foam::labelList Foam::meshRefinement::getChangedFaces
         // Now we have in changedFace marked all affected faces. Pack.
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-        label nChanged = 0;
+        changedFaces = findIndices(changedFace, true);
+
+        // Count changed master faces.
+        nMasterChanged = 0;
 
         forAll(changedFace, faceI)
         {
-            if (changedFace[faceI])
+            if (changedFace[faceI] && isMasterFace[faceI])
             {
-                nChanged++;
+                nMasterChanged++;
             }
         }
 
-        changedFaces.setSize(nChanged);
-        nChanged = 0;
-
-        forAll(changedFace, faceI)
-        {
-            if (changedFace[faceI])
-            {
-                changedFaces[nChanged++] = faceI;
     }
-        }
-    }
-
-    label nChangedFaces = changedFaces.size();
-    reduce(nChangedFaces, sumOp<label>());
 
     if (debug)
     {
         Pout<< "getChangedFaces : Detected "
             << " local:" << changedFaces.size()
-            << " global:" << nChangedFaces
+            << " global:" << returnReduce(nMasterChanged, sumOp<label>())
             << " changed faces out of " << mesh.globalData().nTotalFaces()
             << endl;
 
@@ -252,8 +248,6 @@ bool Foam::meshRefinement::markForRefine
 Foam::label Foam::meshRefinement::markFeatureRefinement
 (
     const point& keepPoint,
-    const PtrList<featureEdgeMesh>& featureMeshes,
-    const labelList& featureLevels,
     const label nAllowRefine,
 
     labelList& refineCell,
@@ -287,9 +281,11 @@ Foam::label Foam::meshRefinement::markFeatureRefinement
 
     if (cellI != -1)
     {
-        forAll(featureMeshes, featI)
+        forAll(features_, featI)
         {
-            const featureEdgeMesh& featureMesh = featureMeshes[featI];
+            const featureEdgeMesh& featureMesh = features_[featI];
+            const label featureLevel = features_.levels()[featI];
+
             const labelListList& pointEdges = featureMesh.pointEdges();
 
             forAll(pointEdges, pointI)
@@ -315,7 +311,7 @@ Foam::label Foam::meshRefinement::markFeatureRefinement
                             tetFaceI,
                             tetPtI,
                             featureMesh.points()[pointI],   // endpos
-                            featureLevels[featI],           // level
+                            featureLevel,                   // level
                             featI,                          // featureMesh
                             pointI                          // end point
                         )
@@ -339,11 +335,11 @@ Foam::label Foam::meshRefinement::markFeatureRefinement
     maxFeatureLevel = -1;
 
     // Whether edge has been visited.
-    List<PackedBoolList> featureEdgeVisited(featureMeshes.size());
+    List<PackedBoolList> featureEdgeVisited(features_.size());
 
-    forAll(featureMeshes, featI)
+    forAll(features_, featI)
     {
-        featureEdgeVisited[featI].setSize(featureMeshes[featI].edges().size());
+        featureEdgeVisited[featI].setSize(features_[featI].edges().size());
         featureEdgeVisited[featI] = 0u;
     }
 
@@ -359,7 +355,7 @@ Foam::label Foam::meshRefinement::markFeatureRefinement
             label featI = tp.i();
             label pointI = tp.j();
 
-            const featureEdgeMesh& featureMesh = featureMeshes[featI];
+            const featureEdgeMesh& featureMesh = features_[featI];
             const labelList& pEdges = featureMesh.pointEdges()[pointI];
 
             // Particle now at pointI. Check connected edges to see which one
@@ -629,8 +625,8 @@ Foam::label Foam::meshRefinement::markSurfaceRefinement
     // Extend segments a bit
     {
         const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
-        start += smallVec;
+        start -= smallVec;
-        end -= smallVec;
+        end += smallVec;
     }
 
 
@@ -845,8 +841,8 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
     // Extend segments a bit
     {
         const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
-        start += smallVec;
+        start -= smallVec;
-        end -= smallVec;
+        end += smallVec;
     }
 
 
@@ -1068,9 +1064,6 @@ Foam::labelList Foam::meshRefinement::refineCandidates
     const point& keepPoint,
     const scalar curvature,
 
-    const PtrList<featureEdgeMesh>& featureMeshes,
-    const labelList& featureLevels,
-
     const bool featureRefinement,
     const bool internalRefinement,
     const bool surfaceRefinement,
@@ -1134,8 +1127,6 @@ Foam::labelList Foam::meshRefinement::refineCandidates
             label nFeatures = markFeatureRefinement
             (
                 keepPoint,
-                featureMeshes,
-                featureLevels,
                 nAllowRefine,
 
                 refineCell,
@@ -1251,6 +1242,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::refine
         mesh_.clearOut();
     }
 
+    // Reset the instance for if in overwrite mode
+    mesh_.setInstance(timeName());
+
     // Update intersection info
     updateMesh(map, getChangedFaces(map, cellsToRefine));
 

src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C

@@ -0,0 +1,233 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "refinementFeatures.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::refinementFeatures::refinementFeatures
+(
+    const objectRegistry& io,
+    const PtrList<dictionary>& featDicts
+)
+:
+    PtrList<featureEdgeMesh>(featDicts.size()),
+    levels_(featDicts.size()),
+    edgeTrees_(featDicts.size()),
+    pointTrees_(featDicts.size())
+{
+    // Read features
+
+    forAll(featDicts, i)
+    {
+        const dictionary& dict = featDicts[i];
+
+        fileName featFileName(dict.lookup("file"));
+
+        set
+        (
+            i,
+            new featureEdgeMesh
+            (
+                IOobject
+                (
+                    featFileName,                       // name
+                    io.time().constant(),               // instance
+                    "triSurface",                       // local
+                    io.time(),                          // registry
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE,
+                    false
+                )
+            )
+        );
+
+        const featureEdgeMesh& eMesh = operator[](i);
+
+        //eMesh.mergePoints(meshRefiner_.mergeDistance());
+        levels_[i] = readLabel(dict.lookup("level"));
+
+        Info<< "Refinement level " << levels_[i]
+            << " for all cells crossed by feature " << featFileName
+            << " (" << eMesh.points().size() << " points, "
+            << eMesh.edges().size() << " edges)." << endl;
+    }
+
+
+    // Search engines
+
+    forAll(*this, i)
+    {
+        const featureEdgeMesh& eMesh = operator[](i);
+        const pointField& points = eMesh.points();
+        const edgeList& edges = eMesh.edges();
+
+        // Calculate bb of all points
+        const treeBoundBox bb(points);
+
+        edgeTrees_.set
+        (
+            i,
+            new indexedOctree<treeDataEdge>
+            (
+                treeDataEdge
+                (
+                    false,                  // do not cache bb
+                    edges,
+                    points,
+                    identity(edges.size())
+                ),
+                bb,     // overall search domain
+                8,      // maxLevel
+                10,     // leafsize
+                3.0     // duplicity
+            )
+        );
+
+
+        // Detect feature points from edges.
+        const labelListList& pointEdges = eMesh.pointEdges();
+        DynamicList<label> featurePoints;
+        forAll(pointEdges, pointI)
+        {
+            if (pointEdges[pointI].size() > 2)
+            {
+                featurePoints.append(pointI);
+            }
+        }
+
+        Info<< "Detected " << featurePoints.size()
+            << " featurePoints out of " << points.size() << endl;
+
+        pointTrees_.set
+        (
+            i,
+            new indexedOctree<treeDataPoint>
+            (
+                treeDataPoint(points, featurePoints),
+                bb,     // overall search domain
+                8,      // maxLevel
+                10,     // leafsize
+                3.0     // duplicity
+            )
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::refinementFeatures::findNearestEdge
+(
+    const pointField& samples,
+    const scalarField& nearestDistSqr,
+    labelList& nearFeature,
+    List<pointIndexHit>& nearInfo
+) const
+{
+    nearFeature.setSize(samples.size());
+    nearFeature = -1;
+    nearInfo.setSize(samples.size());
+
+    forAll(edgeTrees_, featI)
+    {
+        const indexedOctree<treeDataEdge>& tree = edgeTrees_[featI];
+        forAll(samples, sampleI)
+        {
+            const point& sample = samples[sampleI];
+
+            scalar distSqr;
+            if (nearInfo[sampleI].hit())
+            {
+                distSqr = magSqr(nearInfo[sampleI].hitPoint()-sample);
+            }
+            else
+            {
+                distSqr = nearestDistSqr[sampleI];
+            }
+
+            pointIndexHit info = tree.findNearest(sample, distSqr);
+
+            if (info.hit())
+            {
+                nearInfo[sampleI] = info;
+                nearFeature[sampleI] = featI;
+            }
+        }
+    }
+}
+
+
+void Foam::refinementFeatures::findNearestPoint
+(
+    const pointField& samples,
+    const scalarField& nearestDistSqr,
+    labelList& nearFeature,
+    labelList& nearIndex
+) const
+{
+    nearFeature.setSize(samples.size());
+    nearFeature = -1;
+    nearIndex.setSize(samples.size());
+    nearIndex = -1;
+
+    forAll(pointTrees_, featI)
+    {
+        const indexedOctree<treeDataPoint>& tree = pointTrees_[featI];
+        forAll(samples, sampleI)
+        {
+            const point& sample = samples[sampleI];
+
+            scalar distSqr;
+            if (nearFeature[sampleI] != -1)
+            {
+                label nearFeatI = nearFeature[sampleI];
+                const indexedOctree<treeDataPoint>& nearTree =
+                    pointTrees_[nearFeatI];
+                label featPointI =
+                    nearTree.shapes().pointLabels()[nearIndex[sampleI]];
+                const point& featPt =
+                    operator[](nearFeatI).points()[featPointI];
+                distSqr = magSqr(featPt-sample);
+            }
+            else
+            {
+                distSqr = nearestDistSqr[sampleI];
+            }
+
+            pointIndexHit info = tree.findNearest(sample, distSqr);
+
+            if (info.hit())
+            {
+                nearFeature[sampleI] = featI;
+                nearIndex[sampleI] = info.index();
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //

src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.H

@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::refinementFeatures
+
+Description
+    Encapsulates queries for features.
+
+SourceFiles
+    refinementFeatures.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef refinementFeatures_H
+#define refinementFeatures_H
+
+#include "featureEdgeMesh.H"
+#include "indexedOctree.H"
+#include "treeDataEdge.H"
+#include "treeDataPoint.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class refinementFeatures Declaration
+\*---------------------------------------------------------------------------*/
+
+class refinementFeatures
+:
+    public PtrList<featureEdgeMesh>
+{
+private:
+
+    // Private data
+
+        //- Refinement levels
+        labelList levels_;
+
+        //- Edge
+        PtrList<indexedOctree<treeDataEdge> > edgeTrees_;
+
+        //- Features points
+        PtrList<indexedOctree<treeDataPoint> > pointTrees_;
+
+
+    // Private Member Functions
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        refinementFeatures
+        (
+            const objectRegistry& io,
+            const PtrList<dictionary>& featDicts
+        );
+
+
+    // Member Functions
+
+        // Access
+
+            const labelList& levels() const
+            {
+                return levels_;
+            }
+
+            const PtrList<indexedOctree<treeDataEdge> >& edgeTrees() const
+            {
+                return edgeTrees_;
+            }
+
+            const PtrList<indexedOctree<treeDataPoint> >& pointTrees() const
+            {
+                return pointTrees_;
+            }
+
+
+        // Query
+
+            //- Find nearest point on nearest feature edge
+            void findNearestEdge
+            (
+                const pointField& samples,
+                const scalarField& nearestDistSqr,
+                labelList& nearFeature,
+                List<pointIndexHit>& nearInfo
+            ) const;
+
+            //- Find nearest feature point. Is an index into feature points
+            //  which itself is an index into the edgeMesh points.
+            //  So the point index is
+            //      pointTrees()[nearFeature].shapes().pointLabels()[nearIndex]
+            //  Wip.
+            void findNearestPoint
+            (
+                const pointField& samples,
+                const scalarField& nearestDistSqr,
+                labelList& nearFeature,
+                labelList& nearIndex
+            ) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

src/meshTools/indexedOctree/treeDataEdge.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ Foam::treeDataEdge::treeDataEdge
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::pointField Foam::treeDataEdge::points() const
+Foam::pointField Foam::treeDataEdge::shapePoints() const
 {
     pointField eMids(edgeLabels_.size());
 

src/meshTools/indexedOctree/treeDataEdge.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ public:
 
             //- Get representative point cloud for all shapes inside
             //  (one point per shape)
-            pointField points() const;
+            pointField shapePoints() const;
 
 
         // Search

src/meshTools/indexedOctree/treeDataFace.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,7 +144,7 @@ Foam::treeDataFace::treeDataFace
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::pointField Foam::treeDataFace::points() const
+Foam::pointField Foam::treeDataFace::shapePoints() const
 {
     pointField cc(faceLabels_.size());
 

src/meshTools/indexedOctree/treeDataFace.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -140,7 +140,7 @@ public:
 
             //- Get representative point cloud for all shapes inside
             //  (one point per shape)
-            pointField points() const;
+            pointField shapePoints() const;
 
 
         // Search

src/meshTools/indexedOctree/treeDataPoint.C

@@ -54,7 +54,7 @@ Foam::treeDataPoint::treeDataPoint
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::pointField Foam::treeDataPoint::points() const
+Foam::pointField Foam::treeDataPoint::shapePoints() const
 {
     if (pointLabels_.size())
     {

src/meshTools/indexedOctree/treeDataPoint.H

@@ -86,7 +86,12 @@ public:
 
             inline label size() const
             {
-                return points_.size();
+                return
+                (
+                    pointLabels_.size()
+                  ? pointLabels_.size()
+                  : points_.size()
+                );
             }
 
             inline const labelList& pointLabels() const
@@ -94,9 +99,14 @@ public:
                 return pointLabels_;
             }
 
+            const pointField& points() const
+            {
+                return points_;
+            }
+
             //- Get representative point cloud for all shapes inside
             //  (one point per shape)
-            pointField points() const;
+            pointField shapePoints() const;
 
 
         // Search

src/meshTools/indexedOctree/treeDataPrimitivePatch.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ template
 >
 Foam::pointField
 Foam::treeDataPrimitivePatch<Face, FaceList, PointField, PointType>::
-points() const
+shapePoints() const
 {
     pointField cc(patch_.size());
 

src/meshTools/indexedOctree/treeDataPrimitivePatch.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ public:
 
             //- Get representative point cloud for all shapes inside
             //  (one point per shape)
-            pointField points() const;
+            pointField shapePoints() const;
 
 
         // Search

src/meshTools/indexedOctree/treeDataTriSurface.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -187,7 +187,7 @@ Foam::treeDataTriSurface::treeDataTriSurface(const triSurface& surface)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::pointField Foam::treeDataTriSurface::points() const
+Foam::pointField Foam::treeDataTriSurface::shapePoints() const
 {
     const pointField& points = surface_.points();
 

src/meshTools/indexedOctree/treeDataTriSurface.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ public:
 
             //- Get representative point cloud for all shapes inside
             //  (one point per shape)
-            pointField points() const;
+            pointField shapePoints() const;
 
 
         // Search

src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,12 +55,9 @@ Foam::topoSetSource::addToUsageTable Foam::nearestToCell::usage_
 
 void Foam::nearestToCell::combine(topoSet& set, const bool add) const
 {
-    // Construct search engine withouth tet decomposition.
-    meshSearch queryMesh(mesh_, false);
-
     forAll(points_, pointI)
     {
-        addOrDelete(set, queryMesh.findNearestCell(points_[pointI]), add);
+        addOrDelete(set, mesh_.findNearestCell(points_[pointI]), add);
     }
 }
 

src/meshTools/sets/topoSets/faceSet.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -140,7 +140,7 @@ void faceSet::sync(const polyMesh& mesh)
     }
 
     reduce(nAdded, sumOp<label>());
-    if (nAdded > 0)
+    if (debug && nAdded > 0)
     {
         Info<< "Added an additional " << nAdded
             << " faces on coupled patches. "

src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C

@@ -282,7 +282,10 @@ Foam::label Foam::ptscotchDecomp::decomposeZeroDomains
             <<
             (
                 cWeights.size()
-              ? scalarField::subField(cWeights, nCells, startCell)
+              ? static_cast<const scalarField&>
+                (
+                    scalarField::subField(cWeights, nCells, startCell)
+                )
               : scalarField(0)
             );
 

src/postProcessing/functionObjects/utilities/dsmcFields/IOdsmcFields.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -143,7 +143,7 @@ void Foam::dsmcFields::write()
             iDofMeanName
         );
 
-        volVectorField fDMean =  obr_.lookupObject<volVectorField>
+        const volVectorField& fDMean = obr_.lookupObject<volVectorField>
         (
             fDMeanName
         );

src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFieldsFunctionObject.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFieldsFunctionObject.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/regionModels/regionModel/regionModel1D/regionModel1D.C

@@ -114,6 +114,8 @@ void Foam::regionModels::regionModel1D::initialise()
             boundaryFaceCells_[localPyrolysisFaceI].transfer(cellIDs);
 
             localPyrolysisFaceI++;
+
+            nLayers_ = nCells;
         }
     }
 
@@ -266,6 +268,7 @@ Foam::regionModels::regionModel1D::regionModel1D(const fvMesh& mesh)
     boundaryFaceFaces_(),
     boundaryFaceCells_(),
     boundaryFaceOppositeFace_(),
+    nLayers_(0),
     nMagSfPtr_(NULL),
     moveMesh_(false)
 {}
@@ -283,6 +286,7 @@ Foam::regionModels::regionModel1D::regionModel1D
     boundaryFaceFaces_(regionMesh().nCells()),
     boundaryFaceCells_(regionMesh().nCells()),
     boundaryFaceOppositeFace_(regionMesh().nCells()),
+    nLayers_(0),
     nMagSfPtr_(NULL),
     moveMesh_(true)
 {

src/regionModels/regionModel/regionModel1D/regionModel1D.H

@@ -88,6 +88,9 @@ protected:
             //- Global boundary face IDs oppossite coupled patch
             labelList boundaryFaceOppositeFace_;
 
+            //- Number of layers in the region
+            label nLayers_;
+
 
         // Geometry
 
@@ -115,7 +118,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("regionModel");
+    TypeName("regionModel1D");
 
 
     // Constructors
@@ -152,6 +155,9 @@ public:
                 //- Return the global boundary face IDs oppossite coupled patch
                 inline const labelList& boundaryFaceOppositeFace() const;
 
+                //- Return the number of layers in the region
+                inline label nLayers() const;
+
 
             // Geometry
 

src/regionModels/regionModel/regionModel1D/regionModel1DI.H

@@ -49,6 +49,12 @@ Foam::regionModels::regionModel1D::boundaryFaceOppositeFace() const
 }
 
 
+inline Foam::label Foam::regionModels::regionModel1D::nLayers() const
+{
+    return nLayers_;
+}
+
+
 inline const Foam::surfaceScalarField&
 Foam::regionModels::regionModel1D::nMagSf() const
 {

src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C

@@ -197,7 +197,7 @@ Foam::scalar Foam::radiation::radiativeIntensityRay::correct()
             1.0/constant::mathematical::pi*omega_
            *(
                 k*blackBody_.bLambda(lambdaI)
-              + absorptionEmission_.ECont(lambdaI)
+              + absorptionEmission_.ECont(lambdaI)/4
             )
         );
 

src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,8 +51,8 @@ namespace porousMedia
 
 Foam::porousMedia::fixedTemperature::fixedTemperature(const porousZone& pZone)
 :
-    thermalModel(pZone, typeName),
+    thermalModel(pZone),
-    T_(readScalar(coeffDict_.lookup("T")))
+    T_(readScalar(thermalCoeffs_.lookup("T")))
 {}
 
 

src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,6 @@ Description
 #define fixedTemperature_H
 
 #include "thermalModel.H"
-#include "autoPtr.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -81,7 +80,7 @@ public:
         //- Add the thermal source to the enthalpy equation
         virtual void addEnthalpySource
         (
-            const basicThermo& thermo,
+            const basicThermo&,
             const volScalarField& rho,
             fvScalarMatrix& hEqn
         ) const;

src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,6 @@ Description
 #define noThermalModel_H
 
 #include "thermalModel.H"
-#include "autoPtr.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -73,7 +72,7 @@ public:
         //- Add the thermal source to the enthalpy equation
         virtual void addEnthalpySource
         (
-            const basicThermo& thermo,
+            const basicThermo&,
             const volScalarField& rho,
             fvScalarMatrix& hEqn
         ) const;

src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,18 +42,18 @@ namespace porousMedia
 Foam::porousMedia::thermalModel::thermalModel(const porousZone& pZone)
 :
     pZone_(pZone),
-    coeffDict_(dictionary::null)
+    thermalCoeffs_(pZone.dict().subDictPtr("thermalModel"))
 {}
 
 
 Foam::porousMedia::thermalModel::thermalModel
 (
     const porousZone& pZone,
-    const word& modelType
+    const dictionary& thermalCoeffs
 )
 :
     pZone_(pZone),
-    coeffDict_(pZone_.dict().subDict(modelType + "Coeffs"))
+    thermalCoeffs_(thermalCoeffs)
 {}
 
 

src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,8 +63,8 @@ protected:
         //- Reference to the porous zone
         const porousZone& pZone_;
 
-        //- Sub-model coefficients dictionary
+        //- Thermal model coefficients dictionary
-        const dictionary coeffDict_;
+        const dictionary thermalCoeffs_;
 
 
 public:
@@ -87,11 +87,11 @@ public:
 
     // Constructors
 
-        //- Construct null from porous zone
+        //- Construct from porous zone, coefficients from "thermalModel" entry
         thermalModel(const porousZone&);
 
-        //- Construct from porous zone and model type name
+        //- Construct from porous zone and thermal model coefficients
-        thermalModel(const porousZone&, const word& modelType);
+        thermalModel(const porousZone&, const dictionary& thermalCoeffs);
 
 
     //- Destructor
@@ -107,7 +107,7 @@ public:
         //- Add the thermal source to the enthalpy equation
         virtual void addEnthalpySource
         (
-            const basicThermo& thermo,
+            const basicThermo&,
             const volScalarField& rho,
             fvScalarMatrix& hEqn
         ) const = 0;

src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModelNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,13 @@ Foam::porousMedia::thermalModel::New
     const porousZone& pZone
 )
 {
-    const word modelType(pZone.dict().lookup("thermalModel"));
+    // a missing thermalModel is the same as type "none"
+    word modelType("none");
+
+    if (const dictionary* dictPtr = pZone.dict().subDictPtr("thermalModel"))
+    {
+        dictPtr->lookup("type") >> modelType;
+    }
 
     Info<< "Selecting thermalModel " << modelType << endl;
 

src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,9 +50,12 @@ void Foam::thermalPorousZone::addEnthalpySource
     const volScalarField& rho,
     fvScalarMatrix& hEqn
 ) const
+{
+    if (model_.valid())
     {
         model_->addEnthalpySource(thermo, rho, hEqn);
     }
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ public:
         //- Add the thermal source to the enthalpy equation
         void addEnthalpySource
         (
-            const basicThermo& thermo,
+            const basicThermo&,
             const volScalarField& rho,
             fvScalarMatrix& hEqn
         ) const;

src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,8 @@ Description
     thermalPorousZone.
 
     The input file \c constant/thermalPorousZone is implemented as
-    IOPtrList\<thermalPorousZone\> and contains the following type of data:
+    IOPtrList\<thermalPorousZone\> (but written as a dictionary)
+    and contains the following type of data:
 
     \verbatim
     1
@@ -94,7 +95,7 @@ public:
         //- Add the thermal source to the enthalpy equation
         void addEnthalpySource
         (
-            const basicThermo& thermo,
+            const basicThermo&,
             const volScalarField& rho,
             fvScalarMatrix& hEqn
         ) const;

tutorials/basic/potentialFoam/cylinder/system/fvSchemes

@@ -22,7 +22,7 @@ ddtSchemes
 
 gradSchemes
 {
-    default         Gauss linear;
+    default         leastSquares;
 }
 
 divSchemes

tutorials/basic/potentialFoam/cylinder/system/fvSolution

@@ -26,7 +26,7 @@ solvers
     }
 }
 
-SIMPLE
+potentialFlow
 {
     nNonOrthogonalCorrectors 3;
 }

tutorials/basic/potentialFoam/pitzDaily/system/fvSolution

@@ -26,7 +26,7 @@ solvers
     }
 }
 
-SIMPLE
+potentialFlow
 {
     nNonOrthogonalCorrectors 0;
 }

tutorials/combustion/dieselFoam/aachenBomb/0/N2

@@ -18,8 +18,6 @@ dimensions          [ 0 0 0 0 0 0 0 ];
 
 internalField       uniform 0.766;
 
-referenceLevel      0;
-
 boundaryField
 {
     walls

tutorials/combustion/dieselFoam/aachenBomb/0/alphat

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     location    "0";
     object      alphat;

tutorials/combustion/dieselFoam/aachenBomb/0/epsilon

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     location    "0";
     object      epsilon;

tutorials/combustion/dieselFoam/aachenBomb/0/k

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     location    "0";
     object      k;

tutorials/combustion/dieselFoam/aachenBomb/0/mut

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volScalarField;
     location    "0";
     object      mut;

tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "constant";
     object      RASProperties;

tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "constant";
     object      chemistryProperties;

tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "constant";
     object      combustionProperties;

tutorials/combustion/dieselFoam/aachenBomb/constant/g

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       uniformDimensionedVectorField;
     location    "constant";
     object      g;

tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       polyBoundaryMesh;
     location    "constant/polyMesh";
     object      boundary;

tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "constant";
     object      sprayProperties;

tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "constant";
     object      thermophysicalProperties;

tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "constant";
     object      turbulenceProperties;