diff --git a/.gitignore b/.gitignore
index 296f8d0367..8de178a605 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,8 +50,8 @@ doc/[Dd]oxygen/html
 doc/[Dd]oxygen/latex
 doc/[Dd]oxygen/man
 
-# Other HTML files e.g. ReleaseNotes-?.?.html
-*.html
+# generated files in the main directory (e.g. ReleaseNotes-?.?.html)
+/*.html
 
 # source packages - anywhere
 *.tar.bz2
diff --git a/Allwmake b/Allwmake
index ee6f075a0e..36d7658f19 100755
--- a/Allwmake
+++ b/Allwmake
@@ -1,13 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
-if [ "$PWD" != "$WM_PROJECT_DIR" ]
-then
-    echo "Error: Current directory in not \$WM_PROJECT_DIR"
-    echo "    The environment variable are not consistent with the installation."
+wmakeCheckPwd "$WM_PROJECT_DIR" || {
+    echo "Error: Current directory is not \$WM_PROJECT_DIR"
+    echo "    The environment variables are inconsistent with the installation."
     echo "    Check the OpenFOAM entries in your dot-files and source them."
     exit 1
-fi
+}
 
 # wmake is required for subsequent targets
 ( cd wmake/src && make )
diff --git a/applications/Allwmake b/applications/Allwmake
index 82a2ec0df4..48e66941d3 100755
--- a/applications/Allwmake
+++ b/applications/Allwmake
@@ -1,13 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
-if [ "$PWD" != "$WM_PROJECT_DIR/applications" ]
-then
-    echo "Error: Current directory in not \$WM_PROJECT_DIR/applications"
-    echo "    The environment variable are not consistent with the installation."
+wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
+    echo "Error: Current directory is not \$WM_PROJECT_DIR/applications"
+    echo "    The environment variables are inconsistent with the installation."
     echo "    Check the OpenFOAM entries in your dot-files and source them."
     exit 1
-fi
+}
 
 set -x
 
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
index 29a92e19f8..d8fd2dd5e3 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
@@ -52,7 +52,7 @@ Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
         )   << "Unknown PDRDragModel type "
             << PDRDragModelTypeName << endl << endl
             << "Valid  PDRDragModels are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
index 43515c6bae..f0bc471c91 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
         )   << "Unknown XiEqModel type "
             << XiEqModelTypeName << endl << endl
             << "Valid  XiEqModels are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
index 780bc8418d..81f5cca253 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
         )   << "Unknown XiGModel type "
             << XiGModelTypeName << endl << endl
             << "Valid  XiGModels are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
index fd1e25de9b..2dc8dac138 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
@@ -54,7 +54,7 @@ Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
         )   << "Unknown XiModel type "
             << XiModelTypeName << endl << endl
             << "Valid  XiModels are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C
index 5bec567310..a2940ef12b 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallMixedTemperatureCoupled/solidWallMixedTemperatureCoupledFvPatchScalarField.C
@@ -208,6 +208,9 @@ void Foam::solidWallMixedTemperatureCoupledFvPatchScalarField::updateCoeffs()
         patch().patch()
     );
     const polyMesh& nbrMesh = mpp.sampleMesh();
+    // Force recalculation of mapping and schedule
+    const mapDistribute& distMap = mpp.map();
+    (void)distMap.schedule();
 
     tmp<scalarField> intFld = patchInternalField();
 
@@ -217,7 +220,6 @@ void Foam::solidWallMixedTemperatureCoupledFvPatchScalarField::updateCoeffs()
         // to be updated the first time round the iteration (i.e. when
         // switching regions) but unfortunately we don't have this information.
 
-        const mapDistribute& distMap = mpp.map();
         const fvPatch& nbrPatch = refCast<const fvMesh>
         (
             nbrMesh
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index 2ee69c120e..62a8db992b 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -26,8 +26,8 @@ Application
     boundaryFoam
 
 Description
-    Steady-state solver for 1D turbulent flow, typically to generate boundary
-    layer conditions at an inlet, for use in a simulation.
+    Steady-state solver for incompressible, 1D turbulent flow, typically to
+    generate boundary layer conditions at an inlet, for use in a simulation.
 
     Boundary layer code to calculate the U, k and epsilon distributions.
     Used to create inlet boundary conditions for experimental comparisons
@@ -42,7 +42,6 @@ Description
 #include "wallFvPatch.H"
 #include "makeGraph.H"
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
@@ -52,6 +51,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
+    #include "interrogateWallPatches.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -74,66 +74,24 @@ int main(int argc, char *argv[])
         UEqn.solve();
 
 
-        // Correct driving force for a constant mass flow rate
-
+        // Correct driving force for a constant volume flow rate
         dimensionedVector UbarStar = flowMask & U.weightedAverage(mesh.V());
 
         U += (Ubar - UbarStar);
         gradP += (Ubar - UbarStar)/(1.0/UEqn.A())().weightedAverage(mesh.V());
 
-        label id = y.size() - 1;
-
-        scalar wallShearStress =
-            flowDirection & turbulence->R()()[id] & wallNormal;
-
-        scalar yplusWall
-//            = ::sqrt(mag(wallShearStress))*y[id]/laminarTransport.nu()()[id];
-            = ::sqrt(mag(wallShearStress))*y[id]/turbulence->nuEff()()[id];
-
-        Info<< "Uncorrected Ubar = " << (flowDirection & UbarStar.value())<< tab
-            << "pressure gradient = " << (flowDirection & gradP.value()) << tab
-            << "min y+ = " << yplusWall << endl;
-
 
         turbulence->correct();
 
+        Info<< "Uncorrected Ubar = " << (flowDirection & UbarStar.value())
+            << ", pressure gradient = " << (flowDirection & gradP.value())
+            << endl;
+
+        #include "evaluateNearWall.H"
 
         if (runTime.outputTime())
         {
-            volSymmTensorField R
-            (
-                IOobject
-                (
-                    "R",
-                    runTime.timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                turbulence->R()
-            );
-
-            runTime.write();
-
-            const word& gFormat = runTime.graphFormat();
-
-            makeGraph(y, flowDirection & U, "Uf", gFormat);
-
-            makeGraph(y, laminarTransport.nu(), gFormat);
-
-            makeGraph(y, turbulence->k(), gFormat);
-            makeGraph(y, turbulence->epsilon(), gFormat);
-
-            //makeGraph(y, flowDirection & R & flowDirection, "Rff", gFormat);
-            //makeGraph(y, wallNormal & R & wallNormal, "Rww", gFormat);
-            //makeGraph(y, flowDirection & R & wallNormal, "Rfw", gFormat);
-
-            //makeGraph(y, sqrt(R.component(tensor::XX)), "u", gFormat);
-            //makeGraph(y, sqrt(R.component(tensor::YY)), "v", gFormat);
-            //makeGraph(y, sqrt(R.component(tensor::ZZ)), "w", gFormat);
-            makeGraph(y, R.component(tensor::XY), "uv", gFormat);
-
-            makeGraph(y, mag(fvc::grad(U)), "gammaDot", gFormat);
+            #include "makeGraphs.H"
         }
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H
index b7b8b32229..e99a990013 100644
--- a/applications/solvers/incompressible/boundaryFoam/createFields.H
+++ b/applications/solvers/incompressible/boundaryFoam/createFields.H
@@ -49,74 +49,14 @@
         )
     );
 
-    dimensionedVector Ubar
-    (
-        transportProperties.lookup("Ubar")
-    );
+    dimensionedVector Ubar(transportProperties.lookup("Ubar"));
 
     vector flowDirection = (Ubar/mag(Ubar)).value();
     tensor flowMask = sqr(flowDirection);
 
-
-    // Search for wall patches faces and store normals
-
-    scalar nWallFaces(0);
-    vector wallNormal(vector::zero);
-
-    const fvPatchList& patches = mesh.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& currPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(currPatch))
-        {
-            forAll(currPatch, facei)
-            {
-                nWallFaces++;
-
-                if (nWallFaces == 1)
-                {
-                    wallNormal =
-                      - mesh.Sf().boundaryField()[patchi][facei]
-                        /mesh.magSf().boundaryField()[patchi][facei];
-                }
-                else if (nWallFaces == 2)
-                {
-                    vector wallNormal2 =
-                        mesh.Sf().boundaryField()[patchi][facei]
-                        /mesh.magSf().boundaryField()[patchi][facei];
-
-                    //- Check that wall faces are parallel
-                    if
-                    (
-                        mag(wallNormal & wallNormal2) > 1.01
-                      ||mag(wallNormal & wallNormal2) < 0.99
-                    )
-                    {
-                        Info<< "boundaryFoam: wall faces are not parallel"
-                            << endl
-                            << abort(FatalError);
-                    }
-                }
-                else
-                {
-                    Info<< "boundaryFoam: number of wall faces > 2"
-                        << endl
-                        << abort(FatalError);
-                }
-            }
-        }
-    }
-
-
-    //- create position array for graph generation
-    scalarField y = wallNormal & mesh.C().internalField();
-
-
     dimensionedVector gradP
     (
         "gradP",
         dimensionSet(0, 1, -2, 0, 0),
-        vector(0, 0, 0)
+        vector::zero
     );
diff --git a/applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H b/applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H
new file mode 100644
index 0000000000..8844f21e6e
--- /dev/null
+++ b/applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H
@@ -0,0 +1,34 @@
+{
+    // Evaluate near-wall behaviour
+
+    scalar nu = turbulence->nu().boundaryField()[patchId][faceId];
+    scalar nut = turbulence->nut()().boundaryField()[patchId][faceId];
+    symmTensor R = turbulence->devReff()().boundaryField()[patchId][faceId];
+    scalar epsilon = turbulence->epsilon()()[cellId];
+//    scalar omega = turbulence->omega()()[cellId];
+    scalar k = turbulence->k()()[cellId];
+    scalar magUp = mag(U[cellId] - U.boundaryField()[patchId][faceId]);
+
+    scalar tauw = flowDirection & R & wallNormal;
+
+    scalar uTau = ::sqrt(mag(tauw));
+
+    scalar yPlus = uTau*y[cellId]/(nu + ROOTVSMALL);
+
+    scalar uPlus = magUp/(uTau + ROOTVSMALL);
+
+    scalar nutPlus = nut/nu;
+
+    scalar kPlus = k/(sqr(uTau) + ROOTVSMALL);
+
+    scalar epsilonPlus = epsilon*nu/(pow4(uTau) + ROOTVSMALL);
+
+//    scalar omegaPlus = omega*nu/(sqr(uTau) + ROOTVSMALL);
+
+    scalar Rey = magUp*y[cellId]/nu;
+
+    Info<< "Rey = " << Rey << ", uTau = " << uTau << ", nut+ = " << nutPlus
+        << ", y+ = " << yPlus << ", u+ = " << uPlus
+        << ", k+ = " << kPlus << ", epsilon+ = " << epsilonPlus
+        << endl;
+}
\ No newline at end of file
diff --git a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
new file mode 100644
index 0000000000..27ddd24544
--- /dev/null
+++ b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
@@ -0,0 +1,74 @@
+// Search for wall patches faces and store normals
+
+label faceId(-1);
+label patchId(-1);
+label nWallFaces(0);
+vector wallNormal(vector::zero);
+
+const fvPatchList& patches = mesh.boundary();
+
+forAll(patches, patchi)
+{
+    const fvPatch& currPatch = patches[patchi];
+
+    if (isType<wallFvPatch>(currPatch))
+    {
+        const vectorField nf = currPatch.nf();
+
+        forAll(nf, facei)
+        {
+            nWallFaces++;
+
+            if (nWallFaces == 1)
+            {
+                wallNormal = -nf[facei];
+                faceId = facei;
+                patchId = patchi;
+            }
+            else if (nWallFaces == 2)
+            {
+                const vector wallNormal2 = -nf[facei];
+
+                //- Check that wall faces are parallel
+                if
+                (
+                    mag(wallNormal & wallNormal2) > 1.01
+                 || mag(wallNormal & wallNormal2) < 0.99
+                )
+                {
+                    FatalErrorIn(args.executable())
+                        << "wall faces are not parallel for patches "
+                        << patches[patchId].name() << " and "
+                        << currPatch.name() << nl
+                        << exit(FatalError);
+                }
+            }
+            else
+            {
+                FatalErrorIn(args.executable()) << "number of wall faces > 2"
+                    << nl << exit(FatalError);
+            }
+        }
+    }
+}
+
+if (nWallFaces == 0)
+{
+    FatalErrorIn(args.executable()) << "No wall patches identified"
+        << exit(FatalError);
+}
+else
+{
+    Info<< "Generating wall data for patch: " << patches[patchId].name() << endl;
+}
+
+// store local id of near-walll cell to process
+label cellId = patches[patchId].faceCells()[faceId];
+
+// create position array for graph generation
+scalarField y =
+    wallNormal
+  & (mesh.C().internalField() - mesh.C().boundaryField()[patchId][faceId]);
+
+Info<< "    Height to first cell centre y0 = " << y[cellId] << endl;
+
diff --git a/applications/solvers/incompressible/boundaryFoam/makeGraphs.H b/applications/solvers/incompressible/boundaryFoam/makeGraphs.H
new file mode 100644
index 0000000000..7367dc7c7d
--- /dev/null
+++ b/applications/solvers/incompressible/boundaryFoam/makeGraphs.H
@@ -0,0 +1,33 @@
+volSymmTensorField R
+(
+    IOobject
+    (
+        "R",
+        runTime.timeName(),
+        mesh,
+        IOobject::NO_READ,
+        IOobject::AUTO_WRITE
+    ),
+    turbulence->R()
+);
+
+runTime.write();
+
+const word& gFormat = runTime.graphFormat();
+
+makeGraph(y, flowDirection & U, "Uf", gFormat);
+
+makeGraph(y, turbulence->nu(), gFormat);
+makeGraph(y, turbulence->k(), gFormat);
+makeGraph(y, turbulence->epsilon(), gFormat);
+
+makeGraph(y, flowDirection & R & flowDirection, "Rff", gFormat);
+makeGraph(y, wallNormal & R & wallNormal, "Rww", gFormat);
+makeGraph(y, flowDirection & R & wallNormal, "Rfw", gFormat);
+
+makeGraph(y, sqrt(mag(R.component(tensor::XX))), "u", gFormat);
+makeGraph(y, sqrt(mag(R.component(tensor::YY))), "v", gFormat);
+makeGraph(y, sqrt(mag(R.component(tensor::ZZ))), "w", gFormat);
+makeGraph(y, R.component(tensor::XY), "uv", gFormat);
+
+makeGraph(y, mag(fvc::grad(U)), "gammaDot", gFormat);
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/Make/options b/applications/solvers/incompressible/pimpleDyMFoam/Make/options
index e14eec2585..40023adad7 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleDyMFoam/Make/options
@@ -9,6 +9,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -ldynamicFvMesh \
+    -ltopoChangerFvMesh \
     -ldynamicMesh \
     -lmeshTools \
     -lincompressibleTransportModels \
diff --git a/applications/solvers/incompressible/simpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/UEqn.H
index 9f9d9f6dd4..eb40b7665b 100644
--- a/applications/solvers/incompressible/simpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/UEqn.H
@@ -14,4 +14,3 @@
     ).initialResidual();
 
     maxResidual = max(eqnResidual, maxResidual);
-
diff --git a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
index f9794a914f..1ae6219fd6 100644
--- a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
+++ b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
@@ -82,7 +82,7 @@
         (
             "kappa",
             wallFunctionDict,
-            0.4187
+            0.41
         )
     );
 
@@ -92,7 +92,7 @@
         (
             "E",
             wallFunctionDict,
-            9.0
+            9.8
         )
     );
 
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options
index af146aaa38..75094c8b16 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options
@@ -16,5 +16,6 @@ EXE_LIBS = \
     -lfiniteVolume \
     -ldynamicMesh \
     -lmeshTools \
-    -ldynamicFvMesh
+    -ldynamicFvMesh \
+    -ltopoChangerFvMesh
 
diff --git a/applications/solvers/multiphase/interDyMFoam/Make/options b/applications/solvers/multiphase/interDyMFoam/Make/options
index b9aa770576..6bbea18fd6 100644
--- a/applications/solvers/multiphase/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interDyMFoam/Make/options
@@ -17,4 +17,5 @@ EXE_LIBS = \
     -lfiniteVolume \
     -ldynamicMesh \
     -lmeshTools \
-    -ldynamicFvMesh
+    -ldynamicFvMesh \
+    -ltopoChangerFvMesh
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
index 3def1c64fc..227f76c4c7 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
@@ -70,7 +70,7 @@ Foam::phaseChangeTwoPhaseMixture::New
         )   << "Unknown phaseChangeTwoPhaseMixture type "
             << phaseChangeTwoPhaseMixtureTypeName << endl << endl
             << "Valid  phaseChangeTwoPhaseMixtures are : " << endl
-            << componentsConstructorTablePtr_->toc()
+            << componentsConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H
index 9f0ca00596..a085aebb37 100644
--- a/applications/solvers/multiphase/settlingFoam/createFields.H
+++ b/applications/solvers/multiphase/settlingFoam/createFields.H
@@ -56,20 +56,11 @@
     );
 
 
-    dimensionedScalar rhoc
-    (
-        transportProperties.lookup("rhoc")
-    );
+    dimensionedScalar rhoc(transportProperties.lookup("rhoc"));
 
-    dimensionedScalar rhod
-    (
-        transportProperties.lookup("rhod")
-    );
+    dimensionedScalar rhod(transportProperties.lookup("rhod"));
 
-    dimensionedScalar muc
-    (
-        transportProperties.lookup("muc")
-    );
+    dimensionedScalar muc(transportProperties.lookup("muc"));
 
     dimensionedScalar plasticViscosityCoeff
     (
@@ -96,10 +87,7 @@
         transportProperties.lookup("yieldStressOffset")
     );
 
-    Switch BinghamPlastic
-    (
-        transportProperties.lookup("BinghamPlastic")
-    );
+    Switch BinghamPlastic(transportProperties.lookup("BinghamPlastic"));
 
     volScalarField rho
     (
@@ -147,8 +135,8 @@
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        muc +
-        plasticViscosity
+        muc
+      + plasticViscosity
         (
             plasticViscosityCoeff,
             plasticViscosityExponent,
@@ -176,10 +164,7 @@
 
     Info<< "Selecting Drift-Flux model " << endl;
 
-    word VdjModel
-    (
-        transportProperties.lookup("VdjModel")
-    );
+    word VdjModel(transportProperties.lookup("VdjModel"));
 
     Info<< tab << VdjModel << " selected\n" << endl;
 
@@ -188,26 +173,13 @@
         transportProperties.subDict(VdjModel + "Coeffs")
     );
 
-    dimensionedVector V0
-    (
-        VdjModelCoeffs.lookup("V0")
-    );
+    dimensionedVector V0(VdjModelCoeffs.lookup("V0"));
 
-    dimensionedScalar a
-    (
-        VdjModelCoeffs.lookup("a")
-    );
+    dimensionedScalar a(VdjModelCoeffs.lookup("a"));
 
-    dimensionedScalar a1
-    (
-        VdjModelCoeffs.lookup("a1")
-    );
-
-    dimensionedScalar alphaMin
-    (
-        VdjModelCoeffs.lookup("alphaMin")
-    );
+    dimensionedScalar a1(VdjModelCoeffs.lookup("a1"));
 
+    dimensionedScalar alphaMin(VdjModelCoeffs.lookup("alphaMin"));
 
 
     IOdictionary RASProperties
@@ -223,15 +195,9 @@
     );
 
 
-    Switch turbulence
-    (
-        RASProperties.lookup("turbulence")
-    );
+    Switch turbulence(RASProperties.lookup("turbulence"));
 
-    dictionary kEpsilonDict
-    (
-        RASProperties.subDictPtr("kEpsilonCoeffs")
-    );
+    dictionary kEpsilonDict(RASProperties.subDictPtr("kEpsilonCoeffs"));
 
     dimensionedScalar Cmu
     (
@@ -273,30 +239,27 @@
         )
     );
 
-    dimensionedScalar alphak
+    dimensionedScalar sigmak
     (
         dimensionedScalar::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmak",
             kEpsilonDict,
             1.0
         )
     );
 
-    dimensionedScalar alphaEps
+    dimensionedScalar sigmaEps
     (
         dimensionedScalar::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             kEpsilonDict,
-            0.76923
+            1.3
         )
     );
 
-    dictionary wallFunctionDict
-    (
-        RASProperties.subDictPtr("wallFunctionCoeffs")
-    );
+    dictionary wallFunctionDict(RASProperties.subDictPtr("wallFunctionCoeffs"));
 
     dimensionedScalar kappa
     (
@@ -304,7 +267,7 @@
         (
             "kappa",
             wallFunctionDict,
-            0.4187
+            0.41
         )
     );
 
@@ -314,7 +277,7 @@
         (
             "E",
             wallFunctionDict,
-            9.0
+            9.8
         )
     );
 
diff --git a/applications/solvers/multiphase/settlingFoam/kEpsilon.H b/applications/solvers/multiphase/settlingFoam/kEpsilon.H
index 742fcde708..522a9afac7 100644
--- a/applications/solvers/multiphase/settlingFoam/kEpsilon.H
+++ b/applications/solvers/multiphase/settlingFoam/kEpsilon.H
@@ -1,4 +1,4 @@
-if(turbulence)
+if (turbulence)
 {
     if (mesh.changing())
     {
@@ -15,9 +15,9 @@ if(turbulence)
     tgradU.clear();
 
     volScalarField Gcoef =
-        alphak*Cmu*k*(g & fvc::grad(rho))/(epsilon + epsilon0);
+        Cmu*k/sigmak*(g & fvc::grad(rho))/(epsilon + epsilon0);
 
-#   include "wallFunctions.H"
+    #include "wallFunctions.H"
 
     // Dissipation equation
     fvScalarMatrix epsEqn
@@ -26,7 +26,7 @@ if(turbulence)
       + fvm::div(phi, epsilon)
       - fvm::laplacian
         (
-            alphaEps*mut + mul, epsilon,
+            mut/sigmaEps + mul, epsilon,
             "laplacian(DepsilonEff,epsilon)"
         )
      ==
@@ -35,7 +35,7 @@ if(turbulence)
       - fvm::Sp(C2*rho*epsilon/k, epsilon)
     );
 
-#   include "wallDissipation.H"
+    #include "wallDissipation.H"
 
     epsEqn.relax();
     epsEqn.solve();
@@ -51,7 +51,7 @@ if(turbulence)
       + fvm::div(phi, k)
       - fvm::laplacian
         (
-            alphak*mut + mul, k,
+            mut/sigmak + mul, k,
             "laplacian(DkEff,k)"
         )
      ==
@@ -66,7 +66,7 @@ if(turbulence)
     //- Re-calculate viscosity
     mut = rho*Cmu*sqr(k)/(epsilon + epsilon0);
 
-#   include "wallViscosity.H"
+    #include "wallViscosity.H"
 }
 
 mu = mut + mul;
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
index 18b915b16b..c0daa0e7ca 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
@@ -12,6 +12,7 @@
       - fvm::laplacian(muEff, U)
       - (fvc::grad(U) & fvc::grad(muEff))
     //- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
+    //- fvc::div(rho*turbulence->nuEff()*dev(fvc::grad(U)().T()))
     );
 
     if (oCorr == nOuterCorr-1)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index 68bb43a385..582fa4cdd3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -57,7 +57,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
                 << dragModelType
                 << ", constructor not in hash table" << endl << endl
                 << "    Valid dragModel types are : " << endl;
-        Info << dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info << dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return cstrIter()(interfaceDict, alpha, phasea, phaseb);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
index 0ea5d053b9..e5d27350b3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::conductivityModel> Foam::conductivityModel::New
             << conductivityModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid conductivityModelType types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<conductivityModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
index 96315e8c20..fed001e0c0 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::frictionalStressModel> Foam::frictionalStressModel::New
             << frictionalStressModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid frictionalStressModelType types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<frictionalStressModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
index 0df3d38613..cda9814b46 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::granularPressureModel> Foam::granularPressureModel::New
             << granularPressureModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid granularPressureModelType types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<granularPressureModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
index 9e107809bf..fc6b2ed5d9 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::radialModel> Foam::radialModel::New
             << radialModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid radialModelType types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<radialModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
index 508673a5d3..5de17ec189 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
@@ -50,7 +50,7 @@ Foam::kineticTheoryModels::viscosityModel::New
             << viscosityModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid viscosityModelType types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<viscosityModel>(cstrIter()(dict));
diff --git a/applications/test/Gstream/GsTest.C b/applications/test/Gstream/GsTest.C
deleted file mode 100644
index 61e3581ae5..0000000000
--- a/applications/test/Gstream/GsTest.C
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "Xstream.H"
-#include "GLstream.H"
-#include "PSstream.H"
-#include "shapes2D.H"
-#include "IStringStream.H"
-
-using namespace Foam;
-
-int main()
-{
-    colour mauve("mauve", 1, 0, 1);
-
-    lineStyle solid("Solid", 2.0, 2.0, IStringStream("1(1.0)")());
-    lineStyle broken("Broken", 2.0, 10.0, IStringStream("4(1 1 4 1)")());
-
-
-    //Xstream wind
-    GLstream wind
-    //PSstream wind
-    (
-        "GsTest",
-        primary("Black"),
-        primary("White"),
-        0.5, 0.5, 0.5, 0.5, 500, 500
-    );
-
-    do
-    {
-        wind << rectangle2D(point2D(0.0, 0.0), point2D(100.0, 100.0));
-
-        wind.setColour(mauve);
-        wind.setLineStyle(solid);
-
-        wind << line2D(point2D(0.0, 0.0), point2D(0.0, 200.0));
-        wind << line2D(point2D(0.0, 200.0), point2D(200.0, 200.0));
-
-        //wind.setLineStyle(broken);
-
-        wind << line2D(point2D(200.0, 200.0), point2D(200.0, 0.0));
-        wind << line2D(point2D(200.0, 0.0), point2D(0.0, 0.0));
-
-        wind << string2D(point2D(200.0, 0.0), "Hi there");
-
-    } while (wind.waitForEvent());
-
-    return 0;
-}
diff --git a/applications/test/Gstream/Make/files b/applications/test/Gstream/Make/files
deleted file mode 100644
index 7bb7f5cb43..0000000000
--- a/applications/test/Gstream/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-GsTest.C
-
-EXE = $(FOAM_USER_APPBIN)/GsTest
diff --git a/applications/test/Gstream/Make/options b/applications/test/Gstream/Make/options
deleted file mode 100644
index 25079c86f9..0000000000
--- a/applications/test/Gstream/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-EXE_INC = -I$(LIB_SRC)/Gstream/lnInclude
-EXE_LIBS = -lGstream -lGL $(XLIBS)
diff --git a/applications/test/HashTable/hashTableTest.C b/applications/test/HashTable/hashTableTest.C
index 25338a2bb7..7e03a36f7d 100644
--- a/applications/test/HashTable/hashTableTest.C
+++ b/applications/test/HashTable/hashTableTest.C
@@ -56,6 +56,7 @@ int main()
     table1.erase("abs");
 
     Info<< "\ntable1 toc: " << table1.toc() << endl;
+    Info<< "\ntable1 sortedToc: " << table1.sortedToc() << endl;
     table1.printInfo(Info)
         << "table1 [" << table1.size() << "] " << endl;
     forAllIter(HASHTABLE_CLASS<double>, table1, iter)
diff --git a/applications/test/IndirectList/IndirectListTest.C b/applications/test/IndirectList/IndirectListTest.C
index 242ff7dbce..365c58a383 100644
--- a/applications/test/IndirectList/IndirectListTest.C
+++ b/applications/test/IndirectList/IndirectListTest.C
@@ -43,6 +43,10 @@ int main(int argc, char *argv[])
         completeList[i] = 0.1*i;
     }
 
+    Info<< "raw : " << completeList << nl
+        << endl;
+
+
     List<label> addresses(5);
     addresses[0] = 1;
     addresses[1] = 0;
@@ -52,14 +56,23 @@ int main(int argc, char *argv[])
 
     IndirectList<double> idl(completeList, addresses);
 
-    forAll(idl, i)
-    {
-        Info<< idl[i] << token::SPACE;
-    }
+    Info<< "addr: " << idl.addressing() << nl
+        << "list: " << idl() << nl
+        << endl;
 
-    Info<< endl;
+    addresses[4] = 1;
+    addresses[3] = 0;
+    addresses[2] = 7;
+    addresses[1] = 8;
+    addresses[0] = 5;
 
-    Info << "\nEnd\n" << endl;
+    idl.resetAddressing(addresses.xfer());
+
+    Info<< "addr: " << idl.addressing() << nl
+        << "list: " << idl() << nl
+        << endl;
+
+    Info << "End\n" << endl;
 
     return 0;
 }
diff --git a/applications/test/ensightFoamReader/Make/files b/applications/test/ensightFoamReader/Make/files
new file mode 100644
index 0000000000..c8089bfc49
--- /dev/null
+++ b/applications/test/ensightFoamReader/Make/files
@@ -0,0 +1,3 @@
+udr_checker.c
+
+EXE = $(FOAM_USER_APPBIN)/ensightFoamReader-udr_checker
diff --git a/applications/test/ensightFoamReader/Make/options b/applications/test/ensightFoamReader/Make/options
new file mode 100644
index 0000000000..750aeb0d14
--- /dev/null
+++ b/applications/test/ensightFoamReader/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -DUSERD_API_203
+
+EXE_LIBS = \
+    -luserd-foam
diff --git a/applications/test/ensightFoamReader/README b/applications/test/ensightFoamReader/README
new file mode 100644
index 0000000000..f12e6fd40f
--- /dev/null
+++ b/applications/test/ensightFoamReader/README
@@ -0,0 +1,116 @@
+udr_checker
+-----------
+
+udr_checker.c is a routine that can be used to debug EnSight User-defined
+readers.   It exists because of the difficulty of debugging dynamic shared
+libraries when you don't have the source for the calling program (EnSight).
+
+If udr_checker.c is compiled and linked with your reader source code (including
+access to any libraries needed, and the global_extern.h file), it will exercise
+most options of you reader, giving feedback as it goes.  The resulting
+executable can be debugged using your favorite debugger.  And if you have
+memory/bounds checking software (such as purify), you can (and should) run it
+with this executable to make sure that you are not overwriting things.  Readers
+that bash memory will cause problems when run with EnSight!
+
+You will note that the Makefile provided with the readers in the EnSight
+distribution have a "checker" object.  If you do a "make checker" instead of
+just a "make", the "checker"executable will be produced.   You may need to
+modify these makefiles slightly if the locations of your reader files are
+different than the normal.
+
+
+--------------------------------------
+Once the "checker" executable exists, you can run the checker program by simply
+invoking it:
+
+> checker
+
+And you will be prompted for the type of information that you provide in the
+EnSight Data Reader dialog, namely:
+
+The path
+filename_1
+[filename_2]           Only if your reader uses two fields
+swapbytes flag
+<toggle flags>         Only if your reader implements extra GUI
+<pulldown flags>        one flag value per line
+<field contents>        one field string per line
+
+There are certain command line options that you can use to control some aspects
+of the checker program.  One of the more useful is the ability to provide the
+input just described in a file.  This is done in this fashion:
+
+> checker -p <playfile>
+
+And <playfile> would be a simple ascii file with 3 [0r 4] lines:
+line 1:         the path
+line 2:         filename_1
+line 3:        [filename_2]   (if two_fields is TRUE)
+line 3 or 4:    0 or 1, for swapbytes  (0 is FALSE, 1 is TRUE)
+remaining lines 0 or 1 for toggle disable enabled
+                       one line for each toggle
+                0 - num_pulldown_values for pulldown choice
+                       one line for each pulldown
+                strings 
+                       one line for each field
+
+example playfile for an EnSight Gold reader casefile (entitled cube.play)
+could look something like the following:  (Note: two_fields is FALSE)
+-------------------
+
+/usr/local/bin/data/ens
+cube.case
+0
+
+
+And you would invoke checker as:
+
+> checker -p check.play
+
+Another example playfile 
+with swapbytes 0, 
+two enabled toggles, 
+three pulldowns with the value 0 chosen 
+and a single field "sample field value"
+
+could look something like the following::
+----------------------
+
+/mydirectory/subdir/
+myfile
+0
+1
+1
+0
+0
+0
+sample field value
+
+
+Other command line arguments are:
+---------------------------------
+-server_number       For checking server number routines.  If you use this
+                     option, you will be prompted for the total number of
+                     servers and the current server number.  These will then be
+                     used in the calls to the server number routines.
+
+-gts #               For specifying the geometry timestep to test.  The default
+                     is step 0.
+                     The # is the (zero based) time step to read for geometry.
+
+-vts #               For specifying the variable timestep to test.  The default
+                     is step 0.
+                     The # is the (zero based) time step to read for variables.
+
+
+
+Testing optional routines using #defines
+-----------------------------------------
+For optional routines, such as the extra_gui, or var_extract_gui routines, you
+must uncomment the proper #define in udr_checker.c
+
+Currently the ones available are:
+
+#define _EGS          for extra gui routines
+#define _VES          for var extract gui routines
diff --git a/applications/test/ensightFoamReader/ensightFoamReaderTest b/applications/test/ensightFoamReader/ensightFoamReaderTest
new file mode 100755
index 0000000000..5dafa8dfaf
--- /dev/null
+++ b/applications/test/ensightFoamReader/ensightFoamReaderTest
@@ -0,0 +1,92 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 1991-2009 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 2 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, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     ensightFoamReaderTest
+#
+# Description
+#     start ensightFoamReader-udr_checker
+#
+#------------------------------------------------------------------------------
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+
+usage: ${0##*/} [OPTION]
+options:
+  -case   dir    specify alternative case directory
+
+* start ensightFoamReader-udr_checker
+
+USAGE
+    exit 1
+}
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -case)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        cd "$2" 2>/dev/null || usage "directory does not exist:  '$2'"
+        shift 2
+        ;;
+    *)
+        usage "unknown option/argument: '$*'"
+        ;;
+    esac
+done
+
+
+# check existence of essential files
+for check in system/controlDict system/fvSchemes system/fvSolution
+do
+    [ -s "$check" ] || usage "file does not exist:  '$check'"
+done
+
+
+# export values that might be needed
+export FOAM_CASE=$PWD
+export FOAM_CASENAME=${PWD##*/}
+
+pathName=${PWD%/*}
+
+playFile=/tmp/ensightFoamReader.$$
+trap "rm -f $playFile 2>/dev/null; exit 0" EXIT TERM INT
+
+cat << PLAY_FILE > $playFile
+$pathName
+$FOAM_CASENAME
+0
+PLAY_FILE
+
+echo "ensightFoamReader-udr_checker -p $playFile"
+
+ensightFoamReader-udr_checker -p $playFile
+
+#------------------------------------------------------------------------------
diff --git a/applications/test/ensightFoamReader/global_extern.h b/applications/test/ensightFoamReader/global_extern.h
new file mode 120000
index 0000000000..09b4ffb70c
--- /dev/null
+++ b/applications/test/ensightFoamReader/global_extern.h
@@ -0,0 +1 @@
+../../utilities/postProcessing/graphics/ensightFoamReader/global_extern.h
\ No newline at end of file
diff --git a/applications/test/ensightFoamReader/global_extern_proto.h b/applications/test/ensightFoamReader/global_extern_proto.h
new file mode 120000
index 0000000000..7c23ba48d9
--- /dev/null
+++ b/applications/test/ensightFoamReader/global_extern_proto.h
@@ -0,0 +1 @@
+../../utilities/postProcessing/graphics/ensightFoamReader/global_extern_proto.h
\ No newline at end of file
diff --git a/applications/test/ensightFoamReader/udr_checker-80.c b/applications/test/ensightFoamReader/udr_checker-80.c
new file mode 100644
index 0000000000..0cbbceba18
--- /dev/null
+++ b/applications/test/ensightFoamReader/udr_checker-80.c
@@ -0,0 +1,5396 @@
+/*----------------------------------
+ *     User Defined Reader - checker
+ *----------------------------------*/
+
+/********************************************************************
+ *
+ *      ****************************************
+ *       Copyright 2004 Computational Engineering International, Inc.
+ *       All Rights Reserved.
+ *
+ *              Restricted Rights Legend
+ *
+ *       Use, duplication, or disclosure of this
+ *       software and its documentation by the
+ *       Government is subject to restrictions as
+ *       set forth in subdivision [(b)(3)(ii)] of
+ *       the Rights in Technical Data and Computer
+ *       Software clause at 52.227-7013.
+ *******************************************************************/
+
+/*----------------------------------------------------------------------
+ * MAJOR ROUTINES ACCESS:     (VERSION 2.00)    Gold_Userd   API
+ *
+ *        Get the name of the reader
+ *        ==========================
+ *        USERD_get_name_of_reader
+ *        USERD_get_extra_gui_numbers    (optional)
+ *        USERD_get_extra_gui_defaults   (optional)
+ *
+ *        Get the reader version
+ *        ======================
+ *        USERD_get_reader_version
+ *
+ *        Set the filenames, gather timeset and time info
+ *        ===============================================
+ *        USERD_set_extra_gui_data       (optional)
+ *        USERD_set_server_number
+ *        USERD_set_filenames
+ *        USERD_get_number_of_timesets
+ *        USERD_get_geom_timeset_number
+ *
+ *        for each timeset:
+ *          USERD_get_timeset_description
+ *          USERD_get_num_of_time_steps
+ *          USERD_get_sol_times
+ *
+ *        USERD_set_time_set_and_step
+ *
+ *
+ *        Gather variable and time info
+ *        =============================
+ *        USERD_get_number_of_variables
+ *        USERD_get_gold_variable_info
+ *
+ *
+ *        Get initial part building info
+ *        ==============================
+ *        USERD_set_time_set_and_step
+ *        USERD_get_changing_geometry_status
+ *        USERD_get_node_label_status
+ *        USERD_get_element_label_status
+ *        USERD_get_number_of_files_in_dataset
+ *        USERD_get_dataset_query_file_info
+ *        USERD_get_descrip_lines                 (geometry)
+ *        USERD_get_number_of_model_parts
+ *        USERD_get_gold_part_build_info
+ *        USERD_get_ghosts_in_model_flag
+ *        USERD_get_maxsize_info
+ *        USERD_get_ghosts_in_block_flag          (if any ghost cells in model)
+ *        USERD_get_model_extents    **OR**
+ *             USERD_get_part_coords  **AND/OR**
+ *             USERD_get_block_coords_by_component
+ *
+ *
+ *
+ *         Part Builder
+ *         ============                                                 
+ *
+ *         both unstructured and structured
+ *         --------------------------------
+ *         USERD_set_time_set_and_step
+ *
+ *         if unstructured
+ *         ---------------
+ *         USERD_get_part_element_ids_by_type
+ *         USERD_get_part_elements_by_type
+ *
+ *         if any nsided elements:
+ *           USERD_get_nsided_conn
+ *
+ *         if any nfaced elements:
+ *           USERD_get_nfaced_nodes_per_face
+ *           USERD_get_nfaced_conn
+ *
+ *         USERD_get_part_coords
+ *         USERD_get_part_node_ids
+ *
+ *         else if structured
+ *         ------------------
+ *         USERD_get_block_iblanking
+ *         USERD_get_block_coords_by_component
+ *         USERD_get_block_ghost_flags
+ *         USERD_get_part_node_ids              (If node ids given)
+ *         USERD_get_part_element_ids_by_type   (If element ids given)
+ *
+ *         both again 
+ *         ----------
+ *         USERD_get_border_availability        (If border representation
+ *         USERD_get_border_elements_by_type     is selected)
+ *
+ *         USERD_stop_part_building
+ *
+ *
+ *         Changing geometry
+ *         =================
+ *
+ *         changing coords only
+ *         --------------------
+ *         USERD_set_time_set_and_step
+ *         USERD_get_descrip_lines
+ *         USERD_get_part_coords
+ *         USERD_get_block_coords_by_component
+ *
+ *         changing connectivity
+ *         ---------------------
+ *         USERD_set_time_set_and_step
+ *         USERD_get_descrip_lines
+ *         USERD_get_number_of_model_parts
+ *         USERD_get_gold_part_build_info
+ *         USERD_get_ghosts_in_model_flag
+ *         USERD_get_ghosts_in_block_flag       (If any ghost cells in model)
+ *         USERD_get_model_extents     **OR**
+ *             USERD_get_part_coords  **AND/OR**
+ *             USERD_get_block_coords_by_component
+ *         USERD_get_part_element_ids_by_type
+ *         USERD_get_part_elements_by_type
+ *         USERD_get_part_coords
+ *         USERD_get_part_node_ids
+ *         USERD_get_block_iblanking
+ *         USERD_get_block_coords_by_component
+ *         USERD_get_block_ghost_flags          (If ghost cells in part)
+ *         USERD_get_part_node_ids              (If node ids given)
+ *         USERD_get_part_element_ids_by_type   (If element ids given)
+ *
+ *         USERD_get_border_availability        (If border representation
+ *         USERD_get_border_elements_by_type     is selected) 
+ *
+ *
+ *         Loading Variables
+ *         ==================
+ *
+ *         constants
+ *         ---------
+ *         USERD_set_time_set_and_step
+ *         USERD_get_constant_val
+ *
+ *         scalars/vectors/tensors
+ *         -----------------------
+ *         USERD_get_description_lines
+ *         USERD_set_time_set_and_step
+ *         USERD_get_var_by_component
+ *
+ *
+ *         Node or Element queries over time
+ *         =================================
+ *         USERD_get_var_value_at_specific
+ *
+ *
+ *  At 2.03, added:
+ *  ---------------
+ *
+ *         Materials
+ *         =========
+ *         USERD_get_number_of_material_sets
+ *         USERD_get_matf_set_info
+ *
+ *         If any material sets in the model (calls once per material set)
+ *           USERD_get_number_of_materials
+ *           USERD_get_matf_var_info
+ *
+ *         For each element type of each part containing material ids
+ *           USERD_size_matf_data
+ *           USERD_load_matf_data
+ *
+ *
+ *  At 2.04, added:
+ *  ---------------
+ *          USERD_get_uns_failed_params  - Sets params used in element failure
+ *
+ *
+ *----------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------
+ * MAJOR ROUTINES ACCESS:       (Version 1.00)  original API
+ *
+ *        Get the name of the reader
+ *        ==========================
+ *        USERD_get_name_of_reader
+ *        USERD_get_extra_gui_numbers     (optional #define _EGS)
+ *        USERD_get_extra_gui_defaults    (optional #define _EGS)
+ *
+ *        Set the filenames
+ *        =================
+ *        USERD_set_extra_gui_data        (optional #define _EGS)  
+ *        USERD_set_filenames
+ *        USERD_get_number_of_time_steps
+ *        USERD_get_solution_times
+ *        USERD_set_time_step
+ *
+ *
+ *        Gather variable and time info
+ *        =============================
+ *        USERD_get_number_of_variables
+ *        USERD_get_variable_info
+ *
+ *
+ *        Get initial part building info
+ *        ==============================
+ *        USERD_set_time_step
+ *        USERD_get_changing_geometry_status
+ *        USERD_get_node_label_status
+ *        USERD_get_element_label_status
+ *        USERD_get_number_of_files_in_dataset
+ *        USERD_get_dataset_query_file_info
+ *        USERD_get_description_lines                     (geometry)
+ *        USERD_get_number_of_model_parts
+ *        USERD_get_part_build_info
+ *        USERD_get_number_global_nodes
+ *        USERD_get_global_coords
+ *        USERD_get_block_coords_by_component
+ *
+ *        Failure Info
+ *        ============
+ *        USERD_get_uns_failed_params
+ *
+ *
+ *        Part Builder
+ *        ============
+ *        USERD_set_time_step
+ *        USERD_get_global_coords
+ *        USERD_get_global_node_ids
+ *        USERD_get_element_connectivities_for_part
+ *        USERD_get_element_ids_for_part
+ *        USERD_get_block_iblanking
+ *        USERD_get_block_coords_by_component
+ *
+ *        USERD_stop_part_building
+ *
+ *
+ *        Changing geometry
+ *        =================
+ *
+ *        changing coords only
+ *        --------------------
+ *        USERD_set_time_step
+ *        USERD_get_global_coords
+ *        USERD_get_block_coords_by_component
+ *
+ *        changing connectivity
+ *        ---------------------
+ *        USERD_set_time_step
+ *        USERD_get_number_of_model_parts
+ *        USERD_get_part_build_info
+ *        USERD_get_number_global_nodes
+ *        USERD_get_global_coords
+ *        USERD_get_global_node_ids
+ *        USERD_get_element_connectivities_for_part
+ *        USERD_get_element_ids_for_part
+ *        USERD_get_block_iblanking
+ *        USERD_get_block_coords_by_component
+ *
+ *        Loading Variables
+ *        =================
+ *
+ *        constants:
+ *        ----------
+ *        USERD_set_time_step
+ *        USERD_get_constant_value
+ *
+ *        scalars:
+ *        --------
+ *        USERD_get_description_lines
+ *        USERD_set_time_step
+ *        USERD_get_scalar_values
+ *        USERD_get_block_scalar_values
+ *
+ *        vectors:
+ *        --------
+ *        USERD_get_description_lines
+ *        USERD_set_time_step
+ *        USERD_get_vector_values
+ *        USERD_get_block_vector_values_by_component
+ *
+ *
+ *        Node or Element queries over time
+ *        =================================
+ *        USERD_get_variable_value_at_specific
+ *
+ *----------------------------------------------------------------------*/
+#include <stdio.h>
+#include <stdlib.h>
+#ifndef WIN32
+#include <unistd.h>
+#endif
+#include <string.h>
+#include <ctype.h>
+#include <sys/types.h>
+#ifndef CONVEX
+#include <malloc.h>
+#endif
+#include <math.h>
+
+#include "global_extern.h"
+
+/* -----------------------------------------------
+ *  If you wish to test out the Extra GUI stuff
+ *     you need to uncomment this section
+ *
+ *   #define _EGS
+ *
+ * ----------------------------------------------- */
+
+#if (!defined USERD_API_100)
+#define GT_USERD_API_100
+#endif
+
+#if (!defined USERD_API_100 && !defined USERD_API_200)
+#define GT_USERD_API_200
+#endif
+
+#if (!defined USERD_API_100 && !defined USERD_API_200 && !defined USERD_API_201 && !defined USERD_API_202)
+#define GT_USERD_API_202
+#endif
+
+#if (!defined USERD_API_100 && !defined USERD_API_200 && !defined USERD_API_201 && !defined USERD_API_202 && !defined USERD_API_203)
+#define GT_USERD_API_203
+#endif
+
+
+#define EOS '\0'
+
+typedef struct {
+  int  id;                /* part_id                                      */
+  char desc[Z_BUFL];      /* description given in the file                */
+  int  type;              /* Z_UNSTRUCTURED, Z_STRUCTURED, Z_IBLANKED     */
+  int  ne[Z_MAXTYPE];     /* Number of elements per type (Z_UNSTRUCTURED) */
+                          /* or ne[0] = I dimension (Z_STRUCTURED)        */
+                          /*    ne[1] = J dimension                       */
+                          /*    ne[2] = K dimension                       */
+  int  nn;                /* Num of unstructured nodes (All_Local only)   */
+  int  ghosts;            /* TRUE if ghost cells, FALSE otherwise         */
+}BUILDINFO;
+
+typedef struct {
+  char  description[Z_BUFL];  /* description */ 
+  char  filename[Z_BUFL];     /* real filename */
+  char  ifilename[Z_BUFL];    /* imaginary filename */
+  int   type;
+  int   classify;
+  int   complex;
+  float freq;
+  int   contran;
+  int   timeset;
+}VARINFO;
+
+
+typedef struct {
+  char name[12];          /* Z_POINT, Z_G_POINT, Z_BAR02, ... */
+  int  con_len;           /* Number of nodes per element      */
+}EINFO;
+
+
+/* Global variables
+ *-----------------*/
+int Geom_status;
+int Node_labels;
+int Element_labels;
+int Ghosts_in_model;
+int Num_parts;
+int Num_vars;
+int Num_materials_sets;
+BUILDINFO *Pbuild;
+VARINFO *Varinfo;
+char Version_number[Z_MAX_USERD_NAME];
+int Num_time_sets;
+int Num_time_steps;
+
+/* ------------------
+ * Extra GUI stuff
+ * ------------------ */
+int Num_toggles = 0;
+int Num_pulldowns = 0;
+int Num_fields = 0;
+char **Toggle_title;
+int *Toggle_default_status;
+char **Pulldown_title;
+int *Pulldown_number_in_list;
+int *Pulldown_default_selection;
+char ***Pulldown_item_strings;
+char **Field_title;
+char **Field_user_string;
+int *Toggle_choice; /* user choice */
+int *Pulldown_choice; /* user choice */
+
+/* ---------------------------
+ * Failed elements (API 2.04)
+ * --------------------------- */
+int Any_uns_failed_model_elems = FALSE;
+
+
+#if (defined USERD_API_100 || defined USERD_API_200)
+EINFO Elem_info[Z_MAXTYPE] = {"Z_POINT",1,
+                              "Z_BAR02",2,
+                              "Z_BAR03",3,
+                              "Z_TRI03",3,
+                              "Z_TRI06",6,
+                              "Z_QUA04",4,
+                              "Z_QUA08",8,
+                              "Z_TET04",4,
+                              "Z_TET10",10,
+                              "Z_PYR05",5,
+                              "Z_PYR13",13,
+                              "Z_PEN06",6,
+                              "Z_PEN15",15,
+                              "Z_HEX08",8,
+                              "Z_HEX20",20};
+#elif defined USERD_API_201
+EINFO Elem_info[Z_MAXTYPE] = {"Z_POINT",  1,
+                              "Z_G_POINT",1,
+                              "Z_BAR02",  2,
+                              "Z_G_BAR02",2,
+                              "Z_BAR03",  3,
+                              "Z_G_BAR03",3,
+                              "Z_TRI03",  3,
+                              "Z_G_TRI03",3,
+                              "Z_TRI06",  6,
+                              "Z_G_TRI06",6,
+                              "Z_QUA04",  4,
+                              "Z_G_QUA04",4,
+                              "Z_QUA08",  8,
+                              "Z_G_QUA08",8,
+                              "Z_TET04",  4,
+                              "Z_G_TET04",4,
+                              "Z_TET10",  10,
+                              "Z_G_TET10",10,
+                              "Z_PYR05",  5,
+                              "Z_G_PYR05",5,
+                              "Z_PYR13",  13,
+                              "Z_G_PYR13",13,
+                              "Z_PEN06",  6,
+                              "Z_G_PEN06",6,
+                              "Z_PEN15",  15,
+                              "Z_G_PEN15",15,
+                              "Z_HEX08",  8,
+                              "Z_G_HEX08",8,
+                              "Z_HEX20",  20,
+                              "Z_G_HEX20",20};
+#else
+EINFO Elem_info[Z_MAXTYPE] = {"Z_POINT",  1,
+                              "Z_G_POINT",1,
+                              "Z_BAR02",  2,
+                              "Z_G_BAR02",2,
+                              "Z_BAR03",  3,
+                              "Z_G_BAR03",3,
+                              "Z_TRI03",  3,
+                              "Z_G_TRI03",3,
+                              "Z_TRI06",  6,
+                              "Z_G_TRI06",6,
+                              "Z_QUA04",  4,
+                              "Z_G_QUA04",4,
+                              "Z_QUA08",  8,
+                              "Z_G_QUA08",8,
+                              "Z_TET04",  4,
+                              "Z_G_TET04",4,
+                              "Z_TET10",  10,
+                              "Z_G_TET10",10,
+                              "Z_PYR05",  5,
+                              "Z_G_PYR05",5,
+                              "Z_PYR13",  13,
+                              "Z_G_PYR13",13,
+                              "Z_PEN06",  6,
+                              "Z_G_PEN06",6,
+                              "Z_PEN15",  15,
+                              "Z_G_PEN15",15,
+                              "Z_HEX08",  8,
+                              "Z_G_HEX08",8,
+                              "Z_HEX20",  20,
+                              "Z_G_HEX20",20,
+                              "Z_NSIDED",  1,   /* Not yet implemented */
+                              "Z_G_NSIDED",1,   /* Not yet implemented */
+                              "Z_NFACED",  1,   /* Not yet implemented */
+                              "Z_G_NFACED",1};  /* Not yet implemented */
+#endif
+
+
+/* Prototypes
+ *-----------*/
+static int load_fail_defaults(void); 
+static int prelim_info(int *two_fields, int *any_extra_gui);
+static int get_input(int set_server_number,
+                     int use_playfile,
+                     char playfile[Z_MAXFILENP],
+                     int two_fields,
+		     int any_extra_gui,
+                     int *swapbytes);
+static int time_info( void );
+static int part_build_info(int geom_time_step);
+static int variable_info( void );
+
+#if (defined GT_USERD_API_100)
+static int gold_part_builder(int geom_time_step);
+static int gold_var_loader(int var_time_step);
+#else
+static int part_builder(int geom_time_step);
+static int var_loader(int var_time_step);
+#endif
+
+#if (defined GT_USERD_API_100)
+static int materials_info( void );
+static int gold_materials_loader(int geom_time_step);
+#endif
+
+static int entity_querys(int var_time_step);
+static int exercise_bkup( void );
+static void usage( void );
+
+
+/*=============
+ * Main Routine
+ *=============*/
+#ifdef WIN32
+int main(int argc, char *argv[])
+#else
+int main(int argc, char *argv[])
+#endif
+{
+  /* Command line option variables
+   *------------------------------*/
+  int set_server_number = FALSE;
+  int use_playfile = FALSE;
+  char playfile[Z_MAXFILENP];
+  FILE *fplay;
+  int geom_time_step = 0;
+  int var_time_step = 0;
+
+  /* Other local variables
+   *----------------------*/
+  int i, j;
+  int err;
+  int two_fields;
+  int any_extra_gui = FALSE;
+  int swapbytes;
+  int indx;
+
+  /*----------------------------
+   * Command argument processing
+   *----------------------------*/
+  fprintf(stderr,"\n");
+  fprintf(stderr,"\n");
+  fprintf(stderr,"********************************************\n");
+  fprintf(stderr,"*  EnSight User Defined Reader Debug Tool  *\n");
+  fprintf(stderr,"********************************************\n");
+  fprintf(stderr,"\n");
+
+  indx = 1;
+  while(indx < argc) {
+
+    if(!strcmp("-h",argv[indx])) {
+      usage();
+    }
+    else if(!strcmp("-help",argv[indx])) {
+      usage();
+    }
+
+    /* if you want to test the server number routines
+     *
+     * Use:
+     * > checker -server_number
+     *
+     * You will then be prompted for the current and total
+     * number of servers
+     *-----------------------------------------------*/
+    else if(!strcmp("-server_number",argv[indx])) {
+      set_server_number = TRUE;
+    }
+
+
+    /* if you want to use a "playfile" instead of being prompted
+     * for the data loader information
+     *
+     * Use:
+     * > checker -p <playfile>
+     *
+     * This playfile should have 3 [or 4] lines:
+     * line 1:   the path
+     * line 2:   filename_1
+     * line 3:   [filename_2]   (if two_fields is TRUE)
+     * line 4:   0 or 1, for swapytes (0 is FALSE, 1 is TRUE)
+     *
+     * example (two_fields is FALSE, so only 3 lines):
+     *
+     *  /usr/scratch/stealth/bjn/dat/sp_gold/binary
+     *  simple.case
+     *  1
+     *
+     *------------------------------------------------------*/
+    else if(!strcmp("-p",argv[indx])) {
+      indx++;
+      if((indx < argc) && (argv[indx][0] != '-')) {
+        use_playfile = TRUE;
+        memset(playfile,EOS,Z_MAXFILENP);
+        strcpy(playfile,argv[indx]);
+      }
+      else {
+        usage();
+      }
+    }
+
+    /* if you want to specify the geometry timestep to test (default is step 0)
+     *
+     * Use:
+     * > checker -gts #
+     *
+     * Where # is the step number (zero based)
+     *-------------------------------------------------------------------------*/
+    else if(!strcmp("-gts",argv[indx])) {
+      indx++;
+      if((indx < argc) && (argv[indx][0] != '-')) {
+        geom_time_step = atoi(argv[indx]);
+      }
+      else {
+        usage();
+      }
+    }
+
+    /* if you want to specify the variable timestep to test (default is step 0)
+     * (will use this step for the appropriate timeset of each variable)
+     *
+     * Use:
+     * > checker -vts #
+     *
+     * Where # is the step number (zero based)
+     *-------------------------------------------------------------------------*/
+    else if(!strcmp("-vts",argv[indx])) {
+      indx++;
+      if((indx < argc) && (argv[indx][0] != '-')) {
+        var_time_step = atoi(argv[indx]);
+      }
+      else {
+        usage();
+      }
+    }
+    else {
+      usage();
+    }
+
+    indx++;
+  }
+
+
+  /*-------------------------------------------------------------
+   *
+   * Now start exercising EnSight
+   *
+   *--------------------------------------------------------------*/
+
+  /*-----------------
+   * Preliminary info
+   *-----------------*/
+  err = prelim_info(&two_fields,&any_extra_gui);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping because of error in prelim_info\n");
+    exit(1);
+  }
+
+
+  /*------------------
+   * User input needed
+   *------------------*/
+  err = get_input(set_server_number,
+                  use_playfile,
+                  playfile,
+                  two_fields,
+		  any_extra_gui,
+                  &swapbytes);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping because of error in get_input\n");
+    exit(1);
+  }
+  
+
+  /*----------
+   * Time info
+   *----------*/
+  err = time_info();
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping because of error in time_info\n");
+    exit(1);
+  }
+
+
+  /*----------------
+   * Part build info
+   *----------------*/
+  err = part_build_info(geom_time_step);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping because of error in part_build_info\n");
+    exit(1);
+  }
+
+
+  /*------------------
+   * Get Variable Info
+   *------------------*/
+  err = variable_info();
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping because of error in variable_info\n");
+    exit(1);
+  }
+
+
+#if (defined GT_USERD_API_202)
+  /*-------------------
+   * Get Materials Info
+   *-------------------*/
+  err = materials_info();
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping because of error in materials_info\n");
+    exit(1);
+  }
+#endif
+
+#if (defined GT_USERD_API_203)
+  if (Z_ERR == load_fail_defaults()) {
+    fprintf(stderr,"Stopping due to error in failed element flag routine\n");
+    exit(1);
+  }
+#endif
+
+  /*------------------------
+   * Act like building parts
+   *------------------------*/
+  if(Num_parts > 0) {
+
+#if (defined GT_USERD_API_100)
+    err = gold_part_builder(geom_time_step);
+#else
+    err = part_builder(geom_time_step);
+#endif
+    if(err == Z_ERR) {
+      fprintf(stderr,"Stopping because of error in part_builder\n");
+      exit(1);
+    }
+    else {
+      USERD_stop_part_building();
+    }
+  }
+
+
+  /*---------------------------
+   * Act like loading variables
+   *---------------------------*/
+  if(Num_vars > 0) {
+
+#if (defined GT_USERD_API_100)
+    err = gold_var_loader(var_time_step);
+#else
+    err = var_loader(var_time_step);
+#endif
+    if(err == Z_ERR) {
+      fprintf(stderr,"Stopping because of error in var_loader\n");
+      exit(1);
+    }
+  }
+
+#if (defined GT_USERD_API_202)
+  /*---------------------------
+   * Act like loading materials
+   *---------------------------*/
+  if(Num_materials_sets > 0) {
+    err = gold_materials_loader(geom_time_step);
+    if(err == Z_ERR) {
+      fprintf(stderr,"Stopping because of error in materials_loader\n");
+      exit(1);
+    }
+  }
+#endif
+
+
+
+  /*----------------------------------------------------
+   * See if can do node and/or element queries over time
+   *----------------------------------------------------*/
+  if(Num_parts > 0 &&
+     Num_vars > 0) {
+    err = entity_querys(var_time_step);
+    if(err == Z_ERR) {
+      fprintf(stderr,"Stopping because of error in entity_querys\n");
+      exit(1);
+    }
+  }
+
+  /*----------------------------------------
+   * Call the bkup file once in save mode,
+   * then again in restore mode - so someone
+   * could debug if desired
+   *----------------------------------------*/
+  err = exercise_bkup();
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping due to error in saving and/or restoring archive\n");
+    exit(1);
+  }
+
+  /*-------------
+   * Exit Routine
+   *-------------*/
+  fprintf(stderr,"\n----------------- exiting ---------------\n");
+
+#if (defined GT_USERD_API_100)
+  USERD_exit_routine();
+#endif
+
+  fprintf(stderr,"\n\n");
+}
+
+/*--------------
+ * Usage routine
+ *--------------*/
+static void
+usage( void )
+{
+  fprintf(stderr,"------------------------------------------------------------\n");
+  fprintf(stderr,"USAGE: checker [-p pfile] [-server_number] [-gts #] [-vts #]\n");
+  fprintf(stderr,"------------------------------------------------------------\n");
+  fprintf(stderr,"  -h, -help       Prints out this USAGE text.\n");
+  fprintf(stderr,"  -gts #          Specify the geometry times step to use.)\n");
+  fprintf(stderr,"  -p pfile        Plays the checker playfile (pfile).\n");
+  fprintf(stderr,"  -server_number  Cause servers numbers to be prompted for.\n");
+  fprintf(stderr,"  -vts #          Specify the variable times step to use.)\n");
+  fprintf(stderr,"\n");
+  exit(1);
+}
+
+
+
+
+/*------------
+ * prelim_info
+ *------------*/
+static int
+prelim_info(int *two_fields, int *any_extra_gui)
+{
+  int err;
+  char reader_name[Z_MAX_USERD_NAME];
+  char release_number[Z_MAX_USERD_NAME];
+  char description[Z_MAXFILENP];
+  int i,j;
+
+  *any_extra_gui = FALSE;
+
+  /* Get the reader name
+   *--------------------*/
+  err = USERD_get_name_of_reader(reader_name,two_fields);
+  if(err == Z_OK) {
+    fprintf(stderr," Name of reader: %s\n",reader_name);
+    if(*two_fields==1) {
+      fprintf(stderr," two_fields:     TRUE\n");
+    }
+    else if(*two_fields==0){
+      fprintf(stderr," two_fields:     FALSE\n");
+    }
+    else if(*two_fields < 0) {
+      fprintf(stderr," two_fields:     -1 (optional string) \n");
+    }
+  }
+  else {
+    fprintf(stderr,"Error: Could not get name of reader\n");
+    return(Z_ERR);
+  }
+
+  /* Get the Extra GUI stuff (optional) 
+   * ---------------------------------------------------------- */
+#ifdef _EGS
+
+  /* Get the Extra GUI numbers of toggles, pulldowns, & fields 
+   * ---------------------------------------------------------- */
+
+ USERD_get_extra_gui_numbers(      &Num_toggles,
+				  &Num_pulldowns,
+				  &Num_fields );
+
+ if ( Num_toggles > 0 || Num_pulldowns > 0 || Num_fields > 0 ) {
+
+
+   *any_extra_gui = TRUE;
+
+   if (Num_toggles>0) {
+     Toggle_title = (char **) calloc(Num_toggles,sizeof(char*));
+     if (Toggle_title == (char **)NULL) return(Z_ERR);
+     for (i=0; i<Num_toggles; i++) {
+       Toggle_title[i] = (char *) calloc(Z_LEN_GUI_TITLE_STR,sizeof(char));
+       if ( Toggle_title[i] == (char *)NULL ) return(Z_ERR);
+     }
+     Toggle_default_status = (int *) calloc(Num_toggles,sizeof(int));
+     Toggle_choice = (int *) calloc(Num_toggles,sizeof(int));
+   }
+
+   if (Num_pulldowns > 0) {
+     Pulldown_title = (char **) calloc( Num_pulldowns , sizeof(char*) );
+     if (Pulldown_title == (char **)NULL) return(Z_ERR);
+     
+     Pulldown_item_strings = (char ***) calloc( Num_pulldowns , sizeof(char**) );
+     if (Pulldown_item_strings == (char ***)NULL) return(Z_ERR);
+     
+     for (i=0; i<Num_pulldowns; i++) {
+       Pulldown_title[i] = (char *) calloc( Z_LEN_GUI_TITLE_STR , sizeof(char) );
+       if ( Pulldown_title[i] == (char *)NULL ) return(Z_ERR);
+       
+       Pulldown_item_strings[i] = (char **) calloc( Z_MAX_NUM_GUI_PULL_ITEMS , sizeof(char *) );
+       if (Pulldown_item_strings[i] == (char **)NULL) return(Z_ERR);
+       
+       for(j = 0; j < Z_MAX_NUM_GUI_PULL_ITEMS; j++) {
+	 Pulldown_item_strings[i][j] = (char *) calloc( Z_LEN_GUI_PULL_STR , sizeof(char) );
+	 if ( Pulldown_item_strings[i][j] == (char *)NULL ) return(Z_ERR);
+       }
+     }
+     Pulldown_number_in_list = (int *) calloc(Num_pulldowns,sizeof(int));
+     Pulldown_default_selection = (int *) calloc(Num_pulldowns,sizeof(int));
+     Pulldown_choice = (int *) calloc(Num_pulldowns,sizeof(int));
+   }
+   
+   if (Num_fields > 0) {
+     Field_title = (char **) calloc(Num_fields,sizeof(char*));
+     Field_user_string = (char **) calloc(Num_fields,sizeof(char*));
+     if (Field_title == (char **) NULL) return(Z_ERR);
+     for (i=0; i<Num_fields; i++) {
+       Field_title[i] = (char *) calloc(Z_LEN_GUI_TITLE_STR,sizeof(char));
+       if ( Field_title[i] == (char *)NULL) return(Z_ERR);
+       Field_user_string[i] = (char *) calloc(Z_LEN_GUI_FIELD_STR,sizeof(char));
+       if ( Field_user_string[i] == (char *)NULL) return(Z_ERR);
+     }
+   }
+   
+   
+   err = USERD_get_extra_gui_defaults(
+				    Toggle_title,                 /* [num_toggles][Z_LEN_GUI_TITLE_STR] */
+				    Toggle_default_status,        /* [num_toggles] */
+				    Pulldown_title,               /* [num_pulldowns][Z_LEN_GUI_TITLE_STR] */
+				    Pulldown_number_in_list,      /* [num_pulldowns] */
+				    Pulldown_default_selection,   /* [num_pulldowns] */
+				    Pulldown_item_strings,        /* [num_pulldowns][Z_MAX_NUM_GUI_PULL_ITEMS][Z_LEN_GUI_PULL_STR] */
+				    Field_title,                  /* [num_fields][Z_LEN_GUI_TITLE_STR] */
+				    Field_user_string              /* [num_fields][Z_LEN_GUI_FIELD_STR] */
+				    );
+   if (Z_ERR == err) return(Z_ERR);
+     
+   fprintf(stderr,"\n**********************************************\n");
+   fprintf(stderr,"****          Extra GUI Information        ***\n");
+   fprintf(stderr,"**********************************************\n\n");
+
+   fprintf(stderr,"\nTOGGLE INFO: %d active toggles\n",Num_toggles);
+   for (i=0; i<Num_toggles; i++) {
+     fprintf(stderr,"Toggle Title %d : %s\n",i,Toggle_title[i]);
+     fprintf(stderr,"Default status = %d \n",Toggle_default_status[i]);
+   }
+
+   fprintf(stderr,"\nPULLDOWN INFO: %d active pulldowns\n",Num_pulldowns);
+   for (i=0; i<Num_pulldowns; i++) {
+     fprintf(stderr,"Pulldown Title %d : %s\n", i , Pulldown_title[i] );
+     for (j=0; j<Z_MAX_NUM_GUI_PULL_ITEMS; j++) {
+       fprintf(stderr,"Pulldown_item %d : %s\n",j,Pulldown_item_strings[i][j]);
+       if (strlen(Pulldown_item_strings[i][j]) == 0) {
+	 Pulldown_number_in_list[i] = j;
+	 break;
+       }
+     }
+     fprintf(stderr,"Number of items in list: %d\n",Pulldown_number_in_list[i]);
+     fprintf(stderr,"Default selection: %d\n\n",Pulldown_default_selection[i]);
+   }
+   fprintf(stderr,"\n");
+   
+   fprintf(stderr,"\nFIELDINFO: %d active fields\n",Num_fields);
+   for (i=0; i<Num_fields; i++) {
+     fprintf(stderr,"Field Title %d : %s\n",i,Field_title[i]);
+     fprintf(stderr,"Field string %d: %s\n",i,Field_user_string[i]);
+   }
+   fprintf(stderr,"\n\n\n");
+ }
+ 
+#endif
+ 
+ 
+#if (defined GT_USERD_API_100)
+
+  /* Get the reader api used
+   *------------------------*/
+  err = USERD_get_reader_version(Version_number);
+  if(err == Z_OK) {
+    fprintf(stderr," API version:    %s\n",Version_number);
+  }
+  else {
+    fprintf(stderr,"Error: Could not get reader api version\n");
+    return(Z_ERR);
+  }
+
+  /* Get the reader release
+   *-----------------------*/
+  err = USERD_get_reader_release(release_number);
+  if(err == Z_OK) {
+    fprintf(stderr," Release:        %s\n",release_number);
+  }
+  else {
+    fprintf(stderr,"Error: Could not get reader release\n");
+    return(Z_ERR);
+  }
+#else
+  fprintf(stderr," API version:    1.00\n");
+#endif
+
+
+#if 0
+  /* Get the reader description
+   *---------------------------*/
+  err = USERD_get_reader_descrip(description);
+  if(err == Z_OK) {
+    fprintf(stderr," Description:\n\n");
+    fprintf(stderr,"%s\n\n",description);
+  }
+  else {
+    fprintf(stderr,"Error: Could not get reader description\n");
+    return(Z_ERR);
+  }
+#else
+  fprintf(stderr,"  Note: Not currently calling USERD_get_reader_descrip\n");
+  fprintf(stderr,"        because it is optional.\n");
+#endif
+
+  return(Z_OK);
+}
+
+
+/*----------
+ * get_input
+ *----------*/
+static int
+get_input(int set_server_number,
+          int use_playfile,
+          char playfile[Z_MAXFILENP],
+          int two_fields,
+	  int any_extra_gui,
+          int *swapbytes)
+{
+  FILE *fplay;
+
+  int i, j;
+  int err;
+  int tot_servers;
+  int cur_server;
+  char the_path[Z_MAXFILENP];
+  char file1[Z_MAXFILENP];
+  char file2[Z_MAXFILENP];
+  char filename_1[Z_MAXFILENP];
+  char filename_2[Z_MAXFILENP];
+
+
+  fprintf(stderr,"\n-------------- get_input ----------------\n");
+
+  /*-----------------------------------------------------
+   * Prompt for the two input values, as the client would
+   * And set this info for the reader
+   *-----------------------------------------------------*/
+
+#if (defined GT_USERD_API_100)
+
+  /* Set the server number - if command line option to do so
+   *--------------------------------------------------------*/
+  if(set_server_number) {
+    fprintf(stderr,"     Enter total number of servers: ");
+    scanf("%d",&tot_servers);
+
+    fprintf(stderr,"     Enter current server number: ");
+    scanf("%d",&cur_server);
+
+    fprintf(stderr," Setting %d of %d for server number\n",cur_server,tot_servers);
+    USERD_set_server_number(cur_server,tot_servers);
+  }
+#endif
+
+  /* Set the filenames
+   *------------------*/
+  memset(the_path,EOS,Z_MAXFILENP);
+  memset(file1,EOS,Z_MAXFILENP);
+  memset(file2,EOS,Z_MAXFILENP);
+  memset(filename_1,EOS,Z_MAXFILENP);
+  memset(filename_2,EOS,Z_MAXFILENP);
+
+
+  if(!use_playfile) {
+    fprintf(stderr,"     Enter the path: ");
+    scanf("%s",the_path);
+
+
+    fprintf(stderr,"     Enter filename_1: ");
+    scanf("%s",file1);
+
+    if(two_fields == TRUE) {
+      fprintf(stderr,"     Enter filename_2: ");
+      scanf("%s",file2);
+    }
+
+    fprintf(stderr,"     Enter Swapbytes (0 if FALSE, 1 if TRUE): ");
+    scanf("%d",swapbytes);
+
+    if (TRUE == any_extra_gui ) {
+      fprintf(stderr,"\n**********************************************\n");
+      fprintf(stderr,"****          Extra GUI INPUT                ***\n");
+      fprintf(stderr,"**********************************************\n\n");
+
+      fprintf(stderr, "\n      TOGGLE INPUT \n");
+      for (i=0; i<Num_toggles; i++) {
+	fprintf(stderr, "      Enter Toggle Value for '%s' (1=toggle on, 0=toggle off)\n",Toggle_title[i]);
+	scanf("%d",&Toggle_choice[i]);
+      }
+      fprintf(stderr, "\n      PULLDOWN INPUT \n");
+      for (i=0; i<Num_pulldowns; i++) {
+	fprintf(stderr, "\n      PULLDOWN # %d \n",i);	
+	for (j = 0; j<Pulldown_number_in_list[i]; j++) {
+	  fprintf(stderr, "              %d %s\n",j,Pulldown_item_strings[i][j]);
+	}
+	fprintf(stderr, "              Enter Pulldown Value for '%s' (0 to %d)\n",Pulldown_title[i],Pulldown_number_in_list[i]-1);
+	scanf("%d",&Pulldown_choice[i]);	
+      }
+      fprintf(stderr, "\n      FIELD INPUT \n");
+      for (i=0; i<Num_fields; i++) {
+	fprintf(stderr, "Enter string for field %d '%s'\n",i,Field_title[i]);
+	scanf("%s",Field_user_string[i]);
+      }
+
+    }                /* end if there is any extra gui stuff */
+  }                  /* end if not using playfile */
+  else {
+    fplay = fopen(playfile,"rb");
+    if(fplay == (FILE *)NULL) {
+      fprintf(stderr,"Error: Opening the playfile %s\n",playfile);
+      return(Z_ERR);
+    }
+    else {
+      fscanf(fplay,"%s",the_path);
+      fscanf(fplay,"%s",file1);
+      if(two_fields == TRUE) {
+        fscanf(fplay,"%s",file2);
+      }
+      fscanf(fplay,"%d",swapbytes);
+
+      /* ---------------------
+       * Extra GUI stuff
+       * --------------------- */
+      if (TRUE == any_extra_gui) {
+
+	for (i=0; i<Num_toggles; i++) {
+	  fscanf(fplay,"%d",&Toggle_choice[i]);
+	}
+	
+	for (i=0; i<Num_pulldowns; i++) {
+	  fscanf(fplay,"%d",&Pulldown_choice[i]);
+	}
+
+	for (i=0; i<Num_fields; i++) {
+	  fscanf(fplay,"%s",Field_user_string[i]);
+	}
+      }
+      fclose(fplay);
+    }
+  }
+
+#ifdef _EGS
+  /* -------------------------------------------
+   * set the user choices here and run the code
+   * ------------------------------------------- */
+  
+  /* set your choices here 
+     Toggle_choice[0..Num_toggles]
+     Pulldown_choice[0..Num_pulldowns]
+     Field_user_string[Num_fields][0..Numfields] 
+     amd then send your choices into this routine */
+
+  USERD_set_extra_gui_data( 
+		  Toggle_choice,            /* [num_toggle] */
+                  Pulldown_choice,          /* [num_pulldown] */
+                  Field_user_string  );    /* [num_fields][Z_LEN_GUI_FIELD_STR] */ 
+    
+  for (i=0; i<Num_toggles; i++) {
+    fprintf(stderr,"Toggle Title %d : %s\n",i,Toggle_title[i]);
+    fprintf(stderr,"User selection = %d \n",Toggle_choice[i]);
+  }
+  fprintf(stderr,"\n\n");
+  
+  for (i=0; i<Num_pulldowns; i++) {
+    fprintf(stderr,"Pulldown Title %d : %s\n", i , Pulldown_title[i] );
+    fprintf(stderr,"Pulldown selection is # %d : %s\n",Pulldown_choice[i],Pulldown_item_strings[i][Pulldown_choice[i]]);
+  }
+  
+  for (i=0; i<Num_fields; i++) {
+    fprintf(stderr,"Field Title %d : %s\n",i,Field_title[i]);
+    fprintf(stderr,"Field string %d: %s\n",i,Field_user_string[i]);
+    
+  }
+
+
+#endif  
+
+  if(strncmp(file1,"/",1)) {
+    strcpy(filename_1,the_path);
+    strcat(filename_1,"/");
+    strcat(filename_1,file1);
+  }
+  if(two_fields == TRUE) {
+    if(strncmp(file2,"/",1)) {
+      strcpy(filename_2,the_path);
+      strcat(filename_2,"/");
+      strcat(filename_2,file2);
+    }
+  }
+  if(*swapbytes == 0) {
+    *swapbytes = FALSE;
+  }
+  else {
+    *swapbytes = TRUE;
+  }
+
+  /* Feedback
+   *---------*/
+  fprintf(stderr," path: %s\n",the_path);
+  fprintf(stderr," filename_1: %s\n",filename_1);
+  fprintf(stderr," filename_2: %s\n",filename_2);
+  if(*swapbytes) {
+    fprintf(stderr," Swapbytes:    TRUE\n");
+  }
+  else {
+    fprintf(stderr," Swapbytes:    FALSE\n");
+  }
+
+  err = USERD_set_filenames(filename_1,filename_2,the_path,*swapbytes);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Error: Trouble setting the filenames\n");
+    return(Z_ERR);
+  }
+
+  return(Z_OK);
+}
+
+
+/*----------
+ * time_info
+ *----------*/
+static int
+time_info( void )
+{
+  int i;
+  int err;
+  int geom_time_set;
+  int ts;
+  float *sol_times;
+  char ts_desc[Z_BUFL];
+
+  fprintf(stderr,"\n-------------- time_info ----------------\n");
+
+#if (defined GT_USERD_API_100)
+
+  /* Get the number of timesets
+   *---------------------------*/
+  Num_time_sets = USERD_get_number_of_timesets();
+  fprintf(stderr," number of timesets: %d\n",Num_time_sets);
+  if(Num_time_sets == 0) {
+    fprintf(stderr," So, static geometry and variables\n");
+    return(Z_OK);
+  }
+
+  /* Get the timeset used for the geometry
+   *--------------------------------------*/
+  geom_time_set = USERD_get_geom_timeset_number();
+
+  fprintf(stderr," geom timeset number: %d\n",geom_time_set);
+  if(geom_time_set < 1 && Num_time_sets > 0) {
+    fprintf(stderr,"Error: timeset numbers must be 1 or greater\n");
+    fprintf(stderr,"       (unless Num_time_sets is zero also)\n");
+  }
+
+
+  /* For each timeset
+   *-----------------*/
+  for(ts=1; ts<=Num_time_sets; ++ts) {
+
+    fprintf(stderr," Timeset %d:\n",ts);
+
+    /* Get the timeset descriptions
+     *-----------------------------*/
+    err = USERD_get_timeset_description(ts,ts_desc);
+    if(err == Z_ERR) {
+      fprintf(stderr,"Error: getting timeset description\n");
+      return(Z_ERR);
+    }
+    else {
+      fprintf(stderr,"   description: %s\n",ts_desc);
+    }
+
+    /* Get the number of time steps
+     *-----------------------------*/
+    Num_time_steps = USERD_get_num_of_time_steps(ts);
+    fprintf(stderr,"   number of time steps: %d\n",Num_time_steps);
+    if(Num_time_steps < 1) {
+      fprintf(stderr," Error: Number of time steps returned: %d\n",Num_time_steps);
+      fprintf(stderr," (Must be >0 to be okay)\n");
+      return(Z_ERR);
+    }
+    
+
+    /* Get the solution times
+     *-----------------------*/
+    if(Num_time_steps > 0) {
+      sol_times = (float *) calloc(Num_time_steps,sizeof(float));
+      if(sol_times == (float *)NULL) {
+        fprintf(stderr,"Error: allocating for solution times\n");
+        return(Z_ERR);
+      }
+      else {
+        err = USERD_get_sol_times(ts,sol_times);
+        if(err == Z_ERR) {
+          fprintf(stderr,"Error: getting solution times\n");
+          return(Z_ERR);
+        }
+        else {
+          for(i=0; i<Num_time_steps; ++i) {
+            fprintf(stderr,"   At step %d, time = %f\n",i,sol_times[i]);
+          }
+        }
+      }
+      free(sol_times);
+    }
+  }
+
+#else
+
+
+  /* Get the number of time steps
+   *-----------------------------*/
+  Num_time_steps = USERD_get_number_of_time_steps();
+  fprintf(stderr," Nnumber of time steps: %d\n",Num_time_steps);
+  if(Num_time_steps < 1) {
+    fprintf(stderr," Error: Number of time steps returned: %d\n",Num_time_steps);
+    fprintf(stderr," (Must be >0 to be okay)\n");
+    return(Z_ERR);
+  }
+    
+  
+  /* Get the solution times
+   *-----------------------*/
+  if(Num_time_steps > 0) {
+    sol_times = (float *) calloc(Num_time_steps,sizeof(float));
+    if(sol_times == (float *)NULL) {
+      fprintf(stderr,"Error: allocating for solution times\n");
+      return(Z_ERR);
+    }
+    else {
+      err = USERD_get_solution_times(sol_times);
+      if(err == Z_ERR) {
+        fprintf(stderr,"Error: getting solution times\n");
+        return(Z_ERR);
+      }
+      else {
+        for(i=0; i<Num_time_steps; ++i) {
+          fprintf(stderr,"   At step %d, time = %f\n",i,sol_times[i]);
+        }
+      }
+    }
+    free(sol_times);
+  }
+
+#endif
+
+  return(Z_OK);
+}
+
+
+
+/*----------------
+ * part_build_info
+ *----------------*/
+static int
+part_build_info(int geom_time_step)
+{
+  int i, j;
+  int fn;
+  int err;
+  int num_dataset_files;
+  int geom_time_set;
+  Z_QFILES *qfiles;
+  char line1[Z_BUFL];
+  char line2[Z_BUFL];
+
+  int *part_ids;
+  int *part_types;
+  int *number_of_nodes;
+  int **num_elems;
+  int **ijk_dimensions;
+  int **iblanking_options;
+  char **part_descriptions;
+  
+  int ghosts_in_block;
+
+  int *max_num_nodes;
+  int **max_num_elems;
+  int **max_ijk_dimensions;
+  float extents[6];
+
+
+  fprintf(stderr,"\n------------ part_build_info ------------\n");
+
+#if (defined GT_USERD_API_100)
+
+  /* Get the timeset used for the geometry
+   *--------------------------------------*/
+  geom_time_set = USERD_get_geom_timeset_number();
+
+  /* Set the timeset and step - to first step
+   *-----------------------------------------*/
+
+  USERD_set_time_set_and_step(geom_time_set,geom_time_step);
+
+#else
+
+  /* Set the time step - to first step
+   *----------------------------------*/
+  USERD_set_time_step(geom_time_step);
+
+#endif
+
+  /* Get the changing geometry status
+   *---------------------------------*/
+  Geom_status = USERD_get_changing_geometry_status();
+  if(Geom_status == Z_STATIC) {
+    fprintf(stderr," Geom changing status: Z_STATIC\n");
+  }
+  else if(Geom_status == Z_CHANGE_COORDS) {
+    fprintf(stderr," Geom changing status: Z_CHANGE_COORDS\n");
+  }
+  else if(Geom_status == Z_CHANGE_CONN) {
+    fprintf(stderr," Geom changing status: Z_CHANGE_CONN\n");
+  }
+  else {
+    fprintf(stderr," Invalid Geom changing status!!\n");
+  }
+
+  
+  /* Get the node label status
+   *--------------------------*/
+  Node_labels = USERD_get_node_label_status();
+  if(Node_labels) {
+    fprintf(stderr," Node labels will be provided\n");
+  }
+  else {
+    fprintf(stderr," Node labels will NOT be provided\n");
+  }
+
+  /* Get the element label status
+   *-----------------------------*/
+  Element_labels = USERD_get_element_label_status();
+  if(Element_labels) {
+    fprintf(stderr," Element labels will be provided\n");
+  }
+  else {
+    fprintf(stderr," Element labels will NOT be provided\n");
+  }
+
+  fprintf(stderr,"\n");
+
+  /* Get the number of files in the dataset
+   *---------------------------------------*/
+  num_dataset_files = USERD_get_number_of_files_in_dataset();
+  fprintf(stderr," Number of files in dataset: %d\n",num_dataset_files);
+
+
+  /* Get the dataset query file info
+   *--------------------------------*/
+  if(num_dataset_files > 0) {
+
+    qfiles = (Z_QFILES *) calloc(num_dataset_files,sizeof(Z_QFILES));
+    if(qfiles == (Z_QFILES *)NULL) {
+      fprintf(stderr,"Error: allocating for dataset query files\n");
+      return(Z_ERR);
+    }
+    else {
+
+      for(i=0; i<num_dataset_files; ++i) {
+        qfiles[i].f_desc = (char **) calloc(10,sizeof(char *));
+        if(qfiles[i].f_desc == (char **)NULL) {
+          fprintf(stderr,"Error: allocating for dataset query descrip lines\n");
+          return(Z_ERR);
+        }
+        else {
+          for(j=0; j<10; ++j) {
+            qfiles[i].f_desc[j] = (char *) calloc(Z_MAXFILENP,sizeof(char));
+            if(qfiles[i].f_desc[j] == (char *)NULL) {
+              fprintf(stderr,"Error: allocating for dataset query descrip lines\n");
+              return(Z_ERR);
+            }
+          }
+        }
+      }
+
+      err = USERD_get_dataset_query_file_info(qfiles);
+      if(err == Z_OK) {
+        for(fn=0; fn<num_dataset_files; ++fn) {
+          fprintf(stderr," For dataset file %d:\n",fn);
+
+          fprintf(stderr,"   name:           %s\n",qfiles[fn].name);
+          fprintf(stderr,"   size:           %d\n",qfiles[fn].sizeb);
+          fprintf(stderr,"   time:           %s\n",qfiles[fn].timemod);
+          fprintf(stderr,"   num desc lines: %d\n",qfiles[fn].num_d_lines);
+          for(i=0; i<qfiles[fn].num_d_lines; ++i) {
+            fprintf(stderr,"    desc line %d: %s\n",i,qfiles[fn].f_desc[i]);
+          }
+        }
+      }
+      else {
+        fprintf(stderr,"Error: getting dataset query info\n");
+        return(Z_ERR);
+      }
+    }
+
+    /* Free allocated memory
+     *----------------------*/
+    for(i=0; i<num_dataset_files; ++i) {
+      for(j=0; j<10; ++j) {
+        free(qfiles[i].f_desc[j]);
+      }
+      free(qfiles[i].f_desc);
+    }
+    free(qfiles);
+  }
+
+  fprintf(stderr,"\n-----------------------------------------\n");
+
+#if (defined GT_USERD_API_100)
+
+  /* Get the geometry description lines
+   *-----------------------------------*/
+  err = USERD_get_descrip_lines(Z_GEOM,0,FALSE,line1,line2);
+  if(err == Z_OK) {
+    fprintf(stderr," Geom Desc line1: %s\n",line1);
+    fprintf(stderr," Geom Desc line2: %s\n",line2);
+  }
+  else {
+    fprintf(stderr,"Error: getting geom description lines\n");
+    return(Z_ERR);
+  }
+
+#else
+
+  /* Get the geometry description lines
+   *-----------------------------------*/
+  err = USERD_get_description_lines(Z_GEOM,0,line1,line2);
+  if(err == Z_OK) {
+    fprintf(stderr," Geom Desc line1: %s\n",line1);
+    fprintf(stderr," Geom Desc line2: %s\n",line2);
+  }
+  else {
+    fprintf(stderr,"Error: getting geom description lines\n");
+    return(Z_ERR);
+  }
+
+#endif
+
+  /* Get the number of model parts
+   *------------------------------*/
+  Num_parts = USERD_get_number_of_model_parts();
+  if(Num_parts > 0) {
+    fprintf(stderr," Number of parts: %d\n",Num_parts);
+  }
+  else {
+    fprintf(stderr," Problems getting number of parts\n");
+    return(Z_ERR);
+  }
+
+  
+
+  /* Get the gold part build info
+   *-----------------------------*/
+  Pbuild = (BUILDINFO *) calloc(Num_parts,sizeof(BUILDINFO));
+  if(Pbuild == (BUILDINFO *)NULL) {
+    fprintf(stderr," Problems allocating for Pbuild structure\n");
+    return(Z_ERR);
+  }
+
+
+  part_ids = (int *) calloc(Num_parts,sizeof(int));
+  if(part_ids == (int *)NULL) {
+    fprintf(stderr," Problems allocating for part ids\n");
+    return(Z_ERR);
+  }
+
+  part_types = (int *) calloc(Num_parts,sizeof(int));
+  if(part_types == (int *)NULL) {
+    fprintf(stderr," Problems allocating for part types\n");
+    return(Z_ERR);
+  }
+
+  part_descriptions = (char **) calloc(Num_parts,sizeof(char *));
+  if(part_descriptions == (char **)NULL) {
+    fprintf(stderr," Problems allocating for part descriptions\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_parts; ++i) {
+      part_descriptions[i] = (char *) calloc(Z_BUFL,sizeof(char));
+      if(part_descriptions[i] == (char *)NULL) {
+        fprintf(stderr," Problems allocating for part descriptions\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  number_of_nodes = (int *) calloc(Num_parts,sizeof(int));
+  if(number_of_nodes == (int *)NULL) {
+    fprintf(stderr," Problems allocating for part number of nodes\n");
+    return(Z_ERR);
+  }
+
+  num_elems = (int **) calloc(Num_parts,sizeof(int *));
+  if(num_elems == (int **)NULL) {
+    fprintf(stderr," Problems allocating for part number of elements\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_parts; ++i) {
+      num_elems[i] = (int *) calloc(Z_MAXTYPE,sizeof(int));
+      if(num_elems[i] == (int *)NULL) {
+        fprintf(stderr," Problems allocating for part number of elements\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  ijk_dimensions = (int **) calloc(Num_parts,sizeof(int *));
+  if(ijk_dimensions == (int **)NULL) {
+    fprintf(stderr," Problems allocating for part ijk dimensions\n");
+    return(Z_ERR);
+  }
+  else {
+
+#if (defined GT_USERD_API_202)
+    for(i=0; i<Num_parts; ++i) {
+      ijk_dimensions[i] = (int *) calloc(9,sizeof(int));
+      if(ijk_dimensions[i] == (int *)NULL) {
+        fprintf(stderr," Problems allocating for part ijk dimensions\n");
+        return(Z_ERR);
+      }
+      else {
+        for(j=0; j<9; ++j) {
+          ijk_dimensions[i][j] = -1;
+        }
+      }
+    }
+#else
+    for(i=0; i<Num_parts; ++i) {
+      ijk_dimensions[i] = (int *) calloc(3,sizeof(int));
+      if(ijk_dimensions[i] == (int *)NULL) {
+        fprintf(stderr," Problems allocating for part ijk dimensions\n");
+        return(Z_ERR);
+      }
+    }
+#endif
+  }
+
+  iblanking_options = (int **) calloc(Num_parts,sizeof(int *));
+  if(iblanking_options == (int **)NULL) {
+    fprintf(stderr," Problems allocating for part iblanking options\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_parts; ++i) {
+      iblanking_options[i] = (int *) calloc(6,sizeof(int));
+      if(iblanking_options[i] == (int *)NULL) {
+        fprintf(stderr," Problems allocating for part iblanking options\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+
+#if (defined GT_USERD_API_100)
+
+  err = USERD_get_gold_part_build_info(part_ids,
+                                       part_types,
+                                       part_descriptions,
+                                       number_of_nodes,
+                                       num_elems,
+                                       ijk_dimensions,
+                                       iblanking_options);
+#else
+
+  err = USERD_get_part_build_info(part_ids,
+                                  part_types,
+                                  part_descriptions,
+                                  num_elems,
+                                  ijk_dimensions,
+                                  iblanking_options);
+
+#endif
+
+  if(err == Z_ERR) {
+    fprintf(stderr," Problems getting part build info\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_parts; ++i) {
+      fprintf(stderr," For part %d:\n",i+1);
+
+      fprintf(stderr,"   part id:   %d\n",part_ids[i]);
+      Pbuild[i].id = part_ids[i];
+
+      if(part_types[i] == Z_UNSTRUCTURED) {
+        fprintf(stderr,"   part type: Z_UNSTRUCTURED\n");
+      }
+      else if(part_types[i] == Z_STRUCTURED) {
+        fprintf(stderr,"   part type: Z_STRUCTURED\n");
+      }
+      else if(part_types[i] == Z_IBLANKED) {
+        fprintf(stderr,"   part type: Z_IBLANKED\n");
+      }
+      else {
+        fprintf(stderr,"   Invalid part type\n");
+        return(Z_ERR);
+      }
+      Pbuild[i].type = part_types[i];
+
+      fprintf(stderr,"   part desc:   %s\n",part_descriptions[i]);
+      strncpy(Pbuild[i].desc,part_descriptions[i],Z_BUFL);
+
+#if (defined GT_USERD_API_100)
+      fprintf(stderr,"   number of nodes :   %d\n",number_of_nodes[i]);
+      Pbuild[i].nn = number_of_nodes[i];
+#else
+      Pbuild[i].nn = USERD_get_number_of_global_nodes();
+#endif
+
+      for(j=0; j<Z_MAXTYPE; ++j) {
+        if(num_elems[i][j] > 0) {
+          fprintf(stderr,"   # %s elements:   %d\n",
+                  Elem_info[j].name,num_elems[i][j]);
+          Pbuild[i].ne[j] = num_elems[i][j];
+        }
+      }
+
+      if(part_types[i] != Z_UNSTRUCTURED) {
+
+        /* For this checker, we will place the following in the
+         * Pbuild[].ne[] structure:
+         *
+         *   Note this is can be used for block size whether ranges or not
+         *   -------------------------------------------------------------
+         *   Pbuild[].ne[0] = i dim of current block (to the range selected)
+         *   Pbuild[].ne[1] = j dim of current block (to the range selected)
+         *   Pbuild[].ne[2] = k dim of current block (to the range selected)
+         *
+         *   Thus if ranges:
+         *   ---------------
+         *   Pbuild[].ne[3] = i min range          (-1 indicates no ranges)
+         *   Pbuild[].ne[4] = i max range
+         *   Pbuild[].ne[5] = i min range
+         *   Pbuild[].ne[6] = i max range
+         *   Pbuild[].ne[7] = i min range
+         *   Pbuild[].ne[8] = i max range
+         *
+         *   Pbuild[].ne[9]  = i dim of total block (if ranges)
+         *   Pbuild[].ne[10] = j dim of total block (if ranges)
+         *   Pbuild[].ne[11] = k dim of total block (if ranges)
+         *
+         *   What comes back from the api is:
+         *   --------------------------------
+         *   before 2.03 (no ranges)
+         *   -----------------------
+         *   ijk_dimensions[][0] = i dim of block
+         *   ijk_dimensions[][1] = j dim of block
+         *   ijk_dimensions[][2] = k dim of block
+         *
+         *   at 2.03 (if no ranges)
+         *   -------
+         *   ijk_dimensions[][0] = i dim of block
+         *   ijk_dimensions[][1] = j dim of block
+         *   ijk_dimensions[][2] = k dim of block
+         *   ijk_dimensions[][3] = -1
+         *
+         *   at 2.03 (if ranges)
+         *   -------
+         *   ijk_dimensions[][0] = i dim of total block
+         *   ijk_dimensions[][1] = j dim of total block
+         *   ijk_dimensions[][2] = k dim of total block
+         *   ijk_dimensions[][3] = i min range
+         *   ijk_dimensions[][4] = i max range
+         *   ijk_dimensions[][5] = j min range
+         *   ijk_dimensions[][6] = j max range
+         *   ijk_dimensions[][7] = k min range
+         *   ijk_dimensions[][8] = k max range
+         *--------------------------------------------------------------*/
+
+#if (defined GT_USERD_API_202)
+        if(ijk_dimensions[i][3] == -1) {
+          fprintf(stderr,"   ijk_dimensions: %d %d %d\n",
+                  ijk_dimensions[i][0],
+                  ijk_dimensions[i][1],
+                  ijk_dimensions[i][2]);
+          Pbuild[i].ne[0] = ijk_dimensions[i][0];
+          Pbuild[i].ne[1] = ijk_dimensions[i][1];
+          Pbuild[i].ne[2] = ijk_dimensions[i][2];
+          Pbuild[i].ne[3] = ijk_dimensions[i][3];
+        }
+        else {
+
+          /* If empty part
+           *--------------*/
+          if(ijk_dimensions[i][0] == 0 &&
+             ijk_dimensions[i][1] == 0 &&
+             ijk_dimensions[i][2] == 0) {
+            fprintf(stderr,"   ijk_dimensions: %d %d %d\n",
+                    ijk_dimensions[i][0],
+                    ijk_dimensions[i][1],
+                    ijk_dimensions[i][2]);
+            Pbuild[i].ne[0] = ijk_dimensions[i][0];
+            Pbuild[i].ne[1] = ijk_dimensions[i][1];
+            Pbuild[i].ne[2] = ijk_dimensions[i][2];
+            Pbuild[i].ne[3] = -1;
+          }
+
+          /* range part
+           *-----------*/
+          else {
+            Pbuild[i].ne[0] = ijk_dimensions[i][4] - ijk_dimensions[i][3] + 1;
+            Pbuild[i].ne[1] = ijk_dimensions[i][6] - ijk_dimensions[i][5] + 1;
+            Pbuild[i].ne[2] = ijk_dimensions[i][8] - ijk_dimensions[i][7] + 1;
+
+            Pbuild[i].ne[3] = ijk_dimensions[i][3];
+            Pbuild[i].ne[4] = ijk_dimensions[i][4];
+            Pbuild[i].ne[5] = ijk_dimensions[i][5];
+            Pbuild[i].ne[6] = ijk_dimensions[i][6];
+            Pbuild[i].ne[7] = ijk_dimensions[i][7];
+            Pbuild[i].ne[8] = ijk_dimensions[i][8];
+
+            Pbuild[i].ne[9] = ijk_dimensions[i][0];
+            Pbuild[i].ne[10] = ijk_dimensions[i][1];
+            Pbuild[i].ne[11] = ijk_dimensions[i][2];
+
+            fprintf(stderr,"   Part has ranges:\n");
+            fprintf(stderr,"   ijk dimensions of total block: %d %d %d\n",
+                    Pbuild[i].ne[9],
+                    Pbuild[i].ne[10],
+                    Pbuild[i].ne[11]);
+            fprintf(stderr,"     i range: %d  to  %d\n",
+                    Pbuild[i].ne[3],
+                    Pbuild[i].ne[4]);
+            fprintf(stderr,"     j range: %d  to  %d\n",
+                    Pbuild[i].ne[5],
+                    Pbuild[i].ne[6]);
+            fprintf(stderr,"     k range: %d  to  %d\n",
+                    Pbuild[i].ne[7],
+                    Pbuild[i].ne[8]);
+            fprintf(stderr,"   ijk dimensions of range portion: %d %d %d\n",
+                    Pbuild[i].ne[0],
+                    Pbuild[i].ne[1],
+                    Pbuild[i].ne[2]);
+          }
+        }
+#else
+        fprintf(stderr,"   ijk_dimensions: %d %d %d\n",
+                ijk_dimensions[i][0],
+                ijk_dimensions[i][1],
+                ijk_dimensions[i][2]);
+        Pbuild[i].ne[0] = ijk_dimensions[i][0];
+        Pbuild[i].ne[1] = ijk_dimensions[i][1];
+        Pbuild[i].ne[2] = ijk_dimensions[i][2];
+        Pbuild[i].ne[3] = -1;
+#endif
+        if(part_types[i] == Z_IBLANKED) {
+          fprintf(stderr,"   Ibanking options on:\n");
+          if(iblanking_options[i][Z_EXT]) {
+            fprintf(stderr,"     Z_EXT\n");
+          }
+          if(iblanking_options[i][Z_INT]) {
+            fprintf(stderr,"     Z_INT\n");
+          }
+          if(iblanking_options[i][Z_BND]) {
+            fprintf(stderr,"     Z_BND\n");
+          }
+          if(iblanking_options[i][Z_INTBND]) {
+            fprintf(stderr,"     Z_INTBND\n");
+          }
+          if(iblanking_options[i][Z_SYM]) {
+            fprintf(stderr,"     Z_SYM\n");
+          }
+        }
+      }
+    }
+  }
+
+
+#if (defined GT_USERD_API_200)
+
+  /* Get ghosts in model flag
+   *-------------------------*/
+  Ghosts_in_model = USERD_get_ghosts_in_model_flag();
+  if(Ghosts_in_model) {
+    fprintf(stderr," Ghosts in Model:  TRUE\n");
+  }
+  else {
+    fprintf(stderr," Ghosts in Model:  FALSE\n");
+  }
+
+  /* Get ghosts in block flag - if needed
+   *-------------------------------------*/
+  for(i=1; i<=Num_parts; ++i) {
+    if(part_types[i-1] != Z_UNSTRUCTURED && Ghosts_in_model) {
+      ghosts_in_block = USERD_get_ghosts_in_block_flag(i);
+      Pbuild[i-1].ghosts = ghosts_in_block;
+      if(ghosts_in_block) {
+        fprintf(stderr," Ghosts in block part %d:  TRUE\n",i);
+      }
+      else {
+        fprintf(stderr," Ghosts in block part %d:  FALSE\n",i);
+      }
+    }
+  }
+
+#endif
+
+
+#if (defined GT_USERD_API_100)
+
+  /* Get maxsize info
+   *-----------------*/
+  max_num_nodes = (int *) calloc(Num_parts,sizeof(int));
+  if(max_num_nodes == (int *)NULL) {
+    fprintf(stderr," Problems allocating for part max num of nodes\n");
+    return(Z_ERR);
+  }
+
+  max_num_elems = (int **) calloc(Num_parts,sizeof(int *));
+  if(max_num_elems == (int **)NULL) {
+    fprintf(stderr," Problems allocating for part max num of elements\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_parts; ++i) {
+      max_num_elems[i] = (int *) calloc(Z_MAXTYPE,sizeof(int));
+      if(max_num_elems[i] == (int *)NULL) {
+        fprintf(stderr," Problems allocating for part max_num of elements\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  max_ijk_dimensions = (int **) calloc(Num_parts,sizeof(int *));
+  if(max_ijk_dimensions == (int **)NULL) {
+    fprintf(stderr," Problems allocating for part max ijk dimensions\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_parts; ++i) {
+      max_ijk_dimensions[i] = (int *) calloc(3,sizeof(int));
+      if(max_ijk_dimensions[i] == (int *)NULL) {
+        fprintf(stderr," Problems allocating for part max ijk dimensions\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  err = USERD_get_maxsize_info(max_num_nodes,
+                               max_num_elems,
+                               max_ijk_dimensions);
+  if(err == Z_ERR) {
+    fprintf(stderr," No maxsize info provided (or error getting them)\n");
+  }
+  else {
+
+    for(i=0; i<Num_parts; ++i) {
+      fprintf(stderr," For part %d:\n",i+1);
+
+      fprintf(stderr,"   max number of nodes :   %d\n",max_num_nodes[i]);
+
+      for(j=0; j<Z_MAXTYPE; ++j) {
+        if(max_num_elems[i][j] > 0) {
+          fprintf(stderr,"   max # %s elems:   %d\n",
+                  Elem_info[j].name,max_num_elems[i][j]);
+        }
+      }
+
+      if(part_types[i] != Z_UNSTRUCTURED) {
+        fprintf(stderr,"   max_ijk_dimensions: %d %d %d\n",
+                max_ijk_dimensions[i][0],
+                max_ijk_dimensions[i][1],
+                max_ijk_dimensions[i][2]);
+      }
+    }
+  }
+
+  /* Get model extents - if given
+   *-----------------------------*/
+  err = USERD_get_model_extents(extents);
+  if(err == Z_ERR) {
+    fprintf(stderr," No extents given\n");
+  }
+  else {
+    fprintf(stderr," Min x: %g\n",extents[0]);
+    fprintf(stderr," Max x: %g\n",extents[1]);
+    fprintf(stderr," Min y: %g\n",extents[2]);
+    fprintf(stderr," Max y: %g\n",extents[3]);
+    fprintf(stderr," Min z: %g\n",extents[4]);
+    fprintf(stderr," Max z: %g\n",extents[5]);
+  }
+
+#endif
+
+  /* Free the allocated memory
+   *--------------------------*/
+  free(part_ids);
+  free(part_types);
+  free(number_of_nodes);
+
+  for(i=0; i<Num_parts; ++i) {
+    free(ijk_dimensions[i]);
+    free(num_elems[i]);
+    free(part_descriptions[i]);
+  }
+  free(ijk_dimensions);
+  free(num_elems);
+  free(iblanking_options);
+  free(part_descriptions);
+
+#if (defined GT_USERD_API_100)
+  for(i=0; i<Num_parts; ++i) {
+    free(max_ijk_dimensions[i]);
+    free(max_num_elems[i]);
+  }
+  free(max_num_nodes);
+  free(max_num_elems);
+  free(max_ijk_dimensions);
+
+#endif
+
+  return(Z_OK);
+}
+
+
+/*--------------
+ * variable_info
+ *--------------*/
+static int
+variable_info( void )
+{
+  int i,j;
+  int err;
+
+  char **var_description;
+  char **var_filename;
+  int *var_type;
+  int *var_classify;
+  int *var_complex;
+  char **var_ifilename;
+  float *var_freq;
+  int *var_contran;
+  int *var_timeset;
+
+
+  fprintf(stderr,"\n------------ variable_info --------------\n");
+
+  /* Get the number of variables
+   *----------------------------*/
+  Num_vars = USERD_get_number_of_variables();
+  if(Num_vars < 0) {
+    fprintf(stderr,"Error: getting the number of variables\n");
+  }
+  else {
+    fprintf(stderr," Number of variables: %d\n",Num_vars);
+  }
+
+
+  /* Get the gold variable info
+   *---------------------------*/
+  Varinfo = (VARINFO *) calloc(Num_vars,sizeof(VARINFO));
+  if(Varinfo == (VARINFO *)NULL) {
+    fprintf(stderr," Problems allocating for Varinfo structure\n");
+    return(Z_ERR);
+  }
+
+
+  var_description = (char **) calloc(Num_vars,sizeof(char *));
+  if(var_description == (char **)NULL) {
+    fprintf(stderr," Problems allocating for var description\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_vars; ++i) {
+      var_description[i] = (char *) calloc(Z_BUFL,sizeof(char));
+      if(var_description[i] == (char *)NULL) {
+        fprintf(stderr," Problems allocating for var description\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  var_filename = (char **) calloc(Num_vars,sizeof(char *));
+  if(var_filename == (char **)NULL) {
+    fprintf(stderr," Problems allocating for var filename\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_vars; ++i) {
+      var_filename[i] = (char *) calloc(Z_BUFL,sizeof(char));
+      if(var_filename[i] == (char *)NULL) {
+        fprintf(stderr," Problems allocating for var filename\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  var_type = (int *) calloc(Num_vars,sizeof(int));
+  if(var_type == (int *)NULL) {
+    fprintf(stderr," Problems allocating for var type\n");
+    return(Z_ERR);
+  }
+
+  var_classify = (int *) calloc(Num_vars,sizeof(int));
+  if(var_classify == (int *)NULL) {
+    fprintf(stderr," Problems allocating for var classify\n");
+    return(Z_ERR);
+  }
+
+  var_complex = (int *) calloc(Num_vars,sizeof(int));
+  if(var_complex == (int *)NULL) {
+    fprintf(stderr," Problems allocating for var complex\n");
+    return(Z_ERR);
+  }
+
+
+  var_ifilename = (char **) calloc(Num_vars,sizeof(char *));
+  if(var_ifilename == (char **)NULL) {
+    fprintf(stderr," Problems allocating for var ifilename\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_vars; ++i) {
+      var_ifilename[i] = (char *) calloc(Z_BUFL,sizeof(char));
+      if(var_ifilename[i] == (char *)NULL) {
+        fprintf(stderr," Problems allocating for var ifilename\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  var_freq = (float *) calloc(Num_vars,sizeof(float));
+  if(var_freq == (float *)NULL) {
+    fprintf(stderr," Problems allocating for var freq\n");
+    return(Z_ERR);
+  }
+
+  var_contran = (int *) calloc(Num_vars,sizeof(int));
+  if(var_contran == (int *)NULL) {
+    fprintf(stderr," Problems allocating for var contran\n");
+    return(Z_ERR);
+  }
+
+  var_timeset = (int *) calloc(Num_vars,sizeof(int));
+  if(var_timeset == (int *)NULL) {
+    fprintf(stderr," Problems allocating for var timeset\n");
+    return(Z_ERR);
+  }
+
+#if (defined GT_USERD_API_100)
+
+  err = USERD_get_gold_variable_info(var_description,
+                                     var_filename,
+                                     var_type,
+                                     var_classify,
+                                     var_complex,
+                                     var_ifilename,
+                                     var_freq,
+                                     var_contran,
+                                     var_timeset);
+#else
+
+  err = USERD_get_variable_info(var_description,
+                                var_filename,
+                                var_type,
+                                var_classify);
+
+#endif
+
+  if(err == Z_ERR) {
+    fprintf(stderr,"Error: getting variable info\n");
+  }
+  else {
+    for(i=0; i<Num_vars; ++i) {
+
+      /* Loading the global
+       * (for use in other routines)
+       *----------------------------*/
+      strncpy(Varinfo[i].description,var_description[i],Z_BUFL);
+      strncpy(Varinfo[i].filename,var_filename[i],Z_BUFL);
+      strncpy(Varinfo[i].ifilename,var_ifilename[i],Z_BUFL);
+      Varinfo[i].type     = var_type[i];
+      Varinfo[i].classify = var_classify[i];
+      Varinfo[i].complex  = var_complex[i];
+      Varinfo[i].freq     = var_freq[i];
+      Varinfo[i].contran  = var_contran[i];
+      Varinfo[i].timeset  = var_timeset[i];
+
+      /* Echo some feedback
+       *-------------------*/
+      fprintf(stderr," For Variable %d:\n",i+1);
+
+      fprintf(stderr,"   var desc:      %s\n",var_description[i]);
+      fprintf(stderr,"   var filename:  %s\n",var_filename[i]);
+
+#if (defined GT_USERD_API_100)
+      if(var_complex[i]) {
+        fprintf(stderr,"   var complex:   TRUE\n");
+        fprintf(stderr,"   var ifilename: %s\n",var_ifilename[i]);
+        fprintf(stderr,"   var freq:      %g\n",var_freq[i]);
+      }
+      else {
+        fprintf(stderr,"   var complex:   FALSE\n");
+      }
+#endif
+
+      if(var_type[i] == Z_CONSTANT) {
+        fprintf(stderr,"   var type:      Z_CONSTANT\n");
+
+#if (defined GT_USERD_API_100)
+        if(var_contran[i]) {
+          fprintf(stderr,"   var contran:  TRUE\n");
+        }
+        else {
+          fprintf(stderr,"   var contran:  FALSE\n");
+        }
+#endif
+
+      }
+      else if(var_type[i] == Z_SCALAR) {
+        fprintf(stderr,"   var type:      Z_SCALAR\n");
+      }
+      else if(var_type[i] == Z_VECTOR) {
+        fprintf(stderr,"   var type:      Z_VECTOR\n");
+      }
+      else if(var_type[i] == Z_TENSOR) {
+        fprintf(stderr,"   var type:      Z_TENSOR\n");
+      }
+      else if(var_type[i] == Z_TENSOR9) {
+        fprintf(stderr,"   var type:      Z_TENSOR9\n");
+      }
+      else {
+        fprintf(stderr,"   Invalid var type\n");
+        return(Z_ERR);
+      }
+
+      if(var_classify[i] == Z_PER_NODE) {
+        fprintf(stderr,"   var classify:  Z_PER_NODE\n");
+      }
+      else if(var_classify[i] == Z_PER_ELEM) {
+        fprintf(stderr,"   var classify:  Z_PER_ELEM\n");
+      }
+      else if(var_classify[i] != Z_CONSTANT) {
+        fprintf(stderr,"   Invalid var classify\n");
+        return(Z_ERR);
+      }
+
+#if (defined GT_USERD_API_100)
+      fprintf(stderr,"   var timeset:   %d\n",var_timeset[i]);
+#endif
+    }
+  }
+
+  /* Free the allocated memory
+   *--------------------------*/
+  for(i=0; i<Num_vars; ++i) {
+    free(var_description[i]);
+    free(var_filename[i]);
+    free(var_ifilename[i]);
+  }
+  free(var_description);
+  free(var_filename);
+  free(var_ifilename);
+  free(var_type);
+  free(var_classify);
+  free(var_complex);
+  free(var_freq);
+  free(var_contran);
+  free(var_timeset);
+
+  return(Z_OK);
+}
+
+
+#if (defined GT_USERD_API_100)
+/*------------------
+ * gold_part_builder
+ *------------------*/
+static int
+gold_part_builder(int geom_time_step)
+{
+  int i, j, k, jj, kk;
+  int err;
+  int geom_timeset;
+  int p, pn;
+  int et, ne;
+  int *elemids;
+  int **conns;
+  int nn;
+  int comp;
+  int bdim[3];
+  int ib[5];
+  int num_ghosts;
+  int num_dims;
+  int cell_type;
+  float mm[6];
+  float **coords;
+  int *nodeids;
+  int *iblanking;
+  int *ghost_flag;
+  short *parent_type;
+  int *parent_num;
+  int num_elems[Z_MAXTYPE];
+  CRD *crds;
+  int bd1,bd2,bd3;
+  int empty_part;
+  int *pdata;
+  int nsid_len;
+  int *nsid_con;
+  int nface_len;
+  int *nface_con;
+  int npf_len;
+  int *npf_con;
+  int maxcheck;
+  int num_failed = 0;
+  int *fail_flags = (int *) NULL;
+  
+  fprintf(stderr,"\n------------- part_builder --------------\n");
+
+  if(Num_time_sets > 0) {
+    /* Get the timeset used for the geometry
+     *--------------------------------------*/
+    geom_timeset = USERD_get_geom_timeset_number();
+
+    /* Get the number of time steps for this timeset
+     *----------------------------------------------*/
+    Num_time_steps = USERD_get_num_of_time_steps(geom_timeset);
+    if(Num_time_steps < 1) {
+      fprintf(stderr," Error: Number of time steps returned: %d\n",Num_time_steps);
+      fprintf(stderr," (Must be >0 to be okay)\n");
+      return(Z_ERR);
+    }
+    if(geom_time_step > (Num_time_steps - 1)) {
+      geom_time_step = Num_time_steps - 1;
+    }
+
+    /* Set the timeset and step - to first step by default, but
+     * can set it at others using -gts command argument
+     *---------------------------------------------------------*/
+    USERD_set_time_set_and_step(geom_timeset,geom_time_step);
+
+    fprintf(stderr," Using timeset:   %d  (step range is %d through %d)\n",
+            geom_timeset,0,Num_time_steps-1);
+    fprintf(stderr," Using time step: %d\n",geom_time_step);
+  }
+
+  for(p=0; p<Num_parts; ++p) {
+    pn = p+1;
+
+    fprintf(stderr,"\n\n----------------------------------------");
+    fprintf(stderr," Part %d:\n",pn);
+
+    /*-----------------------
+     * For unstructured parts
+     *-----------------------*/
+    if(Pbuild[p].type == Z_UNSTRUCTURED) {
+
+      for(et=0; et<Z_MAXTYPE; ++et) {
+        ne = Pbuild[p].ne[et];
+
+        if(ne > 0) {
+
+          pdata = (int *)calloc(ne*Elem_info[et].con_len,sizeof(int));
+          if(pdata == (int *) NULL) {
+            fprintf(stderr,"Error: allocating conns array\n");
+            return(Z_ERR);
+          }
+          else {
+            conns = (int **) calloc(ne,sizeof(int *));
+            if(conns == (int **) NULL) {
+              fprintf(stderr,"Error: allocating conns array\n");
+              return(Z_ERR);
+            }
+            for(i=0; i<ne; ++i) {
+              conns[i] = pdata;
+              pdata += Elem_info[et].con_len;
+            }
+          }
+
+
+          /* Get the elements
+           *-----------------*/
+          err = USERD_get_part_elements_by_type(pn,et,conns);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting element connectivities\n");
+            return(Z_ERR);
+          }
+
+          if(Element_labels) {
+            elemids = (int *) calloc(ne,sizeof(int));
+            if(elemids == (int *) NULL) {
+              fprintf(stderr,"Error: allocating elemids array\n");
+              return(Z_ERR);
+            }
+          }
+
+          /* Get the element ids - if any
+           *-----------------------------*/
+          if(Element_labels) {
+            err = USERD_get_part_element_ids_by_type(pn,et,elemids);
+            if(err == Z_ERR) {
+              fprintf(stderr,"Error: getting element ids\n");
+              return(Z_ERR);
+            }
+          }
+
+          /* Echo "some" info
+           *-----------------*/
+
+#if (defined GT_USERD_API_202)
+
+          maxcheck = Z_NSIDED;
+
+          /* Nsided elements, if any
+           *------------------------*/
+          if(et == Z_NSIDED ||
+             et == Z_G_NSIDED) {
+
+            nsid_len = 0;
+            for(i=0; i<ne; ++i) {
+              nsid_len += conns[i][0];
+            }
+
+            nsid_con = (int *) calloc(nsid_len,sizeof(int));
+            if(nsid_con == (int *) NULL) {
+              fprintf(stderr,"Error: allocating nsided conn array\n");
+              return(Z_ERR);
+            }
+
+            err = USERD_get_nsided_conn(pn,nsid_con);
+            if(err == Z_ERR) {
+              fprintf(stderr,"Error: getting nsided conn array\n");
+              return(Z_ERR);
+            }
+            
+            /* First element of the type
+             *--------------------------*/
+            i = 0;
+            fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+            if(Element_labels) {
+              fprintf(stderr,"      id: %d\n",elemids[i]);
+            }
+            fprintf(stderr,"      connectivity:");
+            for(j=0; j<conns[i][0]; ++j) {
+              fprintf(stderr," %d",nsid_con[j]);
+            }
+            fprintf(stderr,"\n");
+            
+            /* Last element of the type
+             *-------------------------*/
+            i = ne - 1;
+            if(i > 0) {
+              fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+              if(Element_labels) {
+                fprintf(stderr,"      id: %d\n",elemids[i]);
+              }
+              fprintf(stderr,"      connectivity:");
+              
+              for(j=nsid_len-conns[i][0]; j<nsid_len; ++j) {
+                fprintf(stderr," %d",nsid_con[j]);
+              }
+              fprintf(stderr,"\n");
+            }
+          }
+
+          /* Nfaced elements if any
+           *-----------------------*/
+          if(et == Z_NFACED ||
+             et == Z_G_NFACED) {
+
+            nface_len = 0;
+            for(i=0; i<ne; ++i) {
+              nface_len += conns[i][0];
+            }
+
+            nface_con = (int *) calloc(nface_len,sizeof(int));
+            if(nface_con == (int *) NULL) {
+              fprintf(stderr,"Error: allocating nfaced face array\n");
+              return(Z_ERR);
+            }
+
+            err = USERD_get_nfaced_nodes_per_face(pn,nface_con);
+            if(err == Z_ERR) {
+              fprintf(stderr,"Error: getting nfaced face array array\n");
+              return(Z_ERR);
+            }
+
+            npf_len = 0;
+            for(i=0; i<nface_len; ++i) {
+              npf_len += nface_con[i];
+            }
+
+            npf_con = (int *) calloc(npf_len,sizeof(int));
+            if(npf_con == (int *) NULL) {
+              fprintf(stderr,"Error: allocating nfaced npf array\n");
+              return(Z_ERR);
+            }
+
+            err = USERD_get_nfaced_conn(pn,npf_con);
+            if(err == Z_ERR) {
+              fprintf(stderr,"Error: getting nfaced conn array\n");
+              return(Z_ERR);
+            }
+            
+            /* First element of the type
+             *--------------------------*/
+            jj = 0;
+            kk = 0;
+            for(i=0; i<ne; ++i) {
+
+              if(i == 0 ||
+                 i == ne-1) {
+                fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,
+                        i+1,ne);
+                if(Element_labels) {
+                  fprintf(stderr,"      id: %d\n",elemids[i]);
+                }
+                for(j=0; j<conns[i][0]; ++j) {
+                  fprintf(stderr,"      face %d connectivity:",j+1);
+                  for(k=0; k<nface_con[jj]; ++k) {
+                    fprintf(stderr," %d",npf_con[kk]);
+                    ++kk;
+                  }
+                  fprintf(stderr,"\n");
+                  ++jj;
+                }
+              }
+              else {
+                for(j=0; j<conns[i][0]; ++j) {
+                  for(k=0; k<nface_con[jj]; ++k) {
+                    ++kk;
+                  }
+                  ++jj;
+                }
+              }
+            }
+          }
+#else
+
+          maxcheck = Z_MAXTYPE;
+
+#endif
+
+          /* Regular elements
+           *-----------------*/
+          if(et < maxcheck) {
+
+            /* First element of the type
+             *--------------------------*/
+            i = 0;
+            fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+            if(Element_labels) {
+              fprintf(stderr,"      id: %d\n",elemids[i]);
+            }
+            fprintf(stderr,"      connectivity:");
+            for(j=0; j<Elem_info[et].con_len; ++j) {
+              fprintf(stderr," %d",conns[i][j]);
+            }
+            fprintf(stderr,"\n");
+
+	    /* check the connectivity for negative numbers
+	     * -------------------------------------------*/
+#if defined GT_USERD_API_100
+	    for (i=0;i<ne;i++){
+	      for(j=0; j<Elem_info[et].con_len; ++j) {
+		/* ---------- uncomment to print out connectivity values ---------- */
+/*  		fprintf(stderr," %d",conns[i][j]);  */
+		if (conns[i][j] <= 0 || conns[i][j] > Pbuild[p].nn ) {
+		  fprintf(stderr,"\n****************************\n");
+		  fprintf(stderr,"Connectivity value out of bounds: \n");
+		  fprintf(stderr,"Either less than zero or greater than \n");
+		  fprintf(stderr,"  number of nodes in part!!  \n");
+		  fprintf(stderr,"i = %d   j = %d  conns[i][j] = %d \n",i,j,conns[i][j]);
+		  fprintf(stderr,"****************************\n");
+		}
+	      }
+		/* ---------- uncomment to print out connectivity values ---------- */
+/* 	      fprintf(stderr,"\n"); */
+	    }
+#endif            
+            /* Last element of the type
+             *-------------------------*/
+            i = ne - 1;
+            if(i > 0) {
+              fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+              if(Element_labels) {
+                fprintf(stderr,"      id: %d\n",elemids[i]);
+              }
+              fprintf(stderr,"      connectivity:");
+              for(j=0; j<Elem_info[et].con_len; ++j) {
+                fprintf(stderr," %d",conns[i][j]);
+              }
+              fprintf(stderr,"\n");
+            }
+          }
+  
+          /* Free the allocated memory
+           *--------------------------*/
+          if(NULL != conns) {
+            if(NULL != *conns) {
+              free(*conns);
+              *conns = NULL;
+            }
+            free(conns);
+            conns = NULL;
+          }
+
+          if(Element_labels) {
+            free(elemids);
+          }
+        }
+      }
+
+      /* Get the coords
+       *---------------*/
+      nn = Pbuild[p].nn;
+
+      if(nn > 0) {
+
+        coords = (float **) calloc(3,sizeof(float *));
+        if(coords == (float **) NULL) {
+          fprintf(stderr,"Error: allocating coords array\n");
+          return(Z_ERR);
+        }
+        else {
+          for(i=0; i<3; ++i) {
+            coords[i] = (float *) calloc((nn+1),sizeof(float));
+            if(coords[i] == (float *) NULL) {
+              fprintf(stderr,"Error: allocating coords array\n");
+              return(Z_ERR);
+            }
+          }
+        }
+        
+        if(Node_labels) {
+          nodeids = (int *) calloc((nn+1),sizeof(int));
+          if(nodeids == (int *) NULL) {
+            fprintf(stderr,"Error: allocating nodeids array\n");
+            return(Z_ERR);
+          }
+        }
+
+
+        err = USERD_get_part_coords(pn,coords);
+        if(err == Z_ERR) {
+          fprintf(stderr,"Error: getting unstructured coords\n");
+          return(Z_ERR);
+        }
+
+        if(Node_labels) {
+          err = USERD_get_part_node_ids(pn,nodeids);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting nodeids\n");
+            return(Z_ERR);
+          }
+        }
+
+        /* Echo "some" info
+         *-----------------*/
+
+        /* First node
+         *-----------*/
+        i = 1;
+        fprintf(stderr,"   Node %d of %d:\n",i,nn);
+        if(Node_labels) {
+          fprintf(stderr,"      id: %d\n",nodeids[i]);
+        }
+        fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+                coords[0][i], coords[1][i], coords[2][i]);
+        mm[0] = mm[1] = coords[0][i];
+        mm[2] = mm[3] = coords[1][i];
+        mm[4] = mm[5] = coords[2][i];
+
+
+        /* Last node
+         *----------*/
+        i = nn;
+        if(i > 1) {
+          fprintf(stderr,"   Node %d of %d:\n",i,nn);
+          if(Node_labels) {
+            fprintf(stderr,"      id: %d\n",nodeids[i]);
+          }
+          fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+                  coords[0][i], coords[1][i], coords[2][i]);
+        }
+
+        /* Min and max coordinate values
+         *------------------------------*/
+        for(i=2; i<=nn; ++i) {
+          if(coords[0][i] < mm[0]) {
+            mm[0] = coords[0][i];
+          }
+          if(coords[0][i] > mm[1]) {
+            mm[1] = coords[0][i];
+          }
+          if(coords[1][i] < mm[2]) {
+            mm[2] = coords[1][i];
+          }
+          if(coords[1][i] > mm[3]) {
+            mm[3] = coords[1][i];
+          }
+          if(coords[2][i] < mm[4]) {
+            mm[4] = coords[2][i];
+          }
+          if(coords[2][i] > mm[5]) {
+            mm[5] = coords[2][i];
+          }
+        }
+
+        fprintf(stderr,"   Coordinate ranges:\n");
+        fprintf(stderr,"      min x: %g\n",mm[0]);
+        fprintf(stderr,"      max x: %g\n",mm[1]);
+        fprintf(stderr,"      min y: %g\n",mm[2]);
+        fprintf(stderr,"      max y: %g\n",mm[3]);
+        fprintf(stderr,"      min z: %g\n",mm[4]);
+        fprintf(stderr,"      max z: %g\n",mm[5]);
+
+
+        /* Free the allocated memory
+         *--------------------------*/
+        for(i=0; i<3; ++i) {
+          free(coords[i]);
+        }
+        free(coords);
+        if(Node_labels) {
+          free(nodeids);
+        }
+      }
+    }
+
+
+    /*---------------------
+     * For structured parts
+     *---------------------*/
+    else {
+
+      empty_part = FALSE;
+      if(Pbuild[p].ne[0] == 0 &&
+         Pbuild[p].ne[1] == 0 &&
+         Pbuild[p].ne[2] == 0) {
+        empty_part = TRUE;
+      }
+
+      if(!empty_part) {
+
+        /* Get the block coords
+         *---------------------*/
+        for(comp=0; comp<3; ++comp) {
+          if(Pbuild[p].ne[comp] < 1) {
+            bdim[comp] = 1;
+          }
+          else {
+            bdim[comp] = Pbuild[p].ne[comp];
+          }
+        }
+        nn = bdim[0] * bdim[1] * bdim[2];
+        
+        bd1 = bdim[0]-1;
+        if(bd1 < 1) {
+          bd1 = 1;
+        }
+        bd2 = bdim[1]-1;
+        if(bd2 < 1) {
+          bd2 = 1;
+        }
+        bd3 = bdim[2]-1;
+        if(bd3 < 1) {
+          bd3 = 1;
+        }
+        ne = bd1 * bd2 * bd3;
+        
+        /* Determine cell type
+         *--------------------*/
+        num_dims = 3;
+        for(i=0; i<3; ++i) {
+          if(bdim[i] == 1) {
+            --num_dims;
+          }
+        }
+        if(num_dims == 3) {
+          cell_type = Z_HEX08;
+        }
+        else if(num_dims == 2) {
+          cell_type = Z_QUA04;
+        }
+        else {
+          cell_type = Z_BAR02;
+        }
+        
+        coords = (float **) calloc(num_dims,sizeof(float *));
+        if(coords == (float **) NULL) {
+          fprintf(stderr,"Error: allocating coords array\n");
+          return(Z_ERR);
+        }
+        else {
+          for(i=0; i<num_dims; ++i) {
+            coords[i] = (float *) calloc(nn,sizeof(float));
+            if(coords[i] == (float *) NULL) {
+              fprintf(stderr,"Error: allocating coords array\n");
+              return(Z_ERR);
+            }
+          }
+        }
+        
+        /* Get the coords
+         *---------------*/
+        for(comp=0; comp<num_dims; ++comp) {
+          err = USERD_get_block_coords_by_component(pn,comp,coords[comp]);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting block coords\n");
+            return(Z_ERR);
+          }
+        }
+        
+        
+#if (defined GT_USERD_API_200)
+        
+        if(Node_labels) {
+          nodeids = (int *) calloc(nn,sizeof(int));
+          if(nodeids == (int *) NULL) {
+            fprintf(stderr,"Error: allocating nodeids array\n");
+            return(Z_ERR);
+          }
+        }
+        /* Get the node ids - if any
+         *--------------------------*/
+        if(Node_labels) {
+          err = USERD_get_part_node_ids(pn,nodeids);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting nodeids\n");
+            return(Z_ERR);
+          }
+        }
+#endif
+
+        /* Echo "some" info
+         *-----------------*/
+        
+        /* First node
+         *-----------*/
+        if(nn > 0) {
+          i = 0;
+          fprintf(stderr,"   Node %d of %d:\n",i+1,nn);
+          
+#if (defined GT_USERD_API_200)
+          
+          if(Node_labels) {
+            fprintf(stderr,"      id: %d\n",nodeids[i]);
+          }
+#endif
+          if(num_dims == 3) {
+            fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+                    coords[0][i], coords[1][i], coords[2][i]);
+            mm[0] = mm[1] = coords[0][i];
+            mm[2] = mm[3] = coords[1][i];
+            mm[4] = mm[5] = coords[2][i];
+          }
+          else if(num_dims == 2) {
+            fprintf(stderr,"      x y coordinates: %g %g\n",
+                    coords[0][i], coords[1][i]);
+            mm[0] = mm[1] = coords[0][i];
+            mm[2] = mm[3] = coords[1][i];
+          }
+          else {
+            fprintf(stderr,"      x coordinates: %g\n",
+                    coords[0][i]);
+            mm[0] = mm[1] = coords[0][i];
+          }
+          
+          
+          /* Last node
+           *----------*/
+          i = nn-1;
+          if(i > 1) {
+            fprintf(stderr,"   Node %d of %d:\n",i+1,nn);
+            
+#if (defined GT_USERD_API_200)
+            if(Node_labels) {
+              fprintf(stderr,"      id: %d\n",nodeids[i]);
+            }
+#endif
+            if(num_dims == 3) {
+              fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+                      coords[0][i], coords[1][i], coords[2][i]);
+            }
+            else if(num_dims == 2) {
+              fprintf(stderr,"      x y coordinates: %g %g\n",
+                      coords[0][i], coords[1][i]);
+            }
+            else {
+              fprintf(stderr,"      x coordinates: %g\n",
+                      coords[0][i]);
+            }
+          }
+        }
+        
+        /* Min and max coordinate values
+         *------------------------------*/
+        for(i=1; i<nn; ++i) {
+          if(coords[0][i] < mm[0]) {
+            mm[0] = coords[0][i];
+          }
+          if(coords[0][i] > mm[1]) {
+            mm[1] = coords[0][i];
+          }
+          if(num_dims > 1) {
+            if(coords[1][i] < mm[2]) {
+              mm[2] = coords[1][i];
+            }
+            if(coords[1][i] > mm[3]) {
+              mm[3] = coords[1][i];
+            }
+          }
+          if(num_dims > 2) {
+            if(coords[2][i] < mm[4]) {
+              mm[4] = coords[2][i];
+            }
+            if(coords[2][i] > mm[5]) {
+              mm[5] = coords[2][i];
+            }
+          }
+        }
+        
+        fprintf(stderr,"   Coordinate ranges:\n");
+        fprintf(stderr,"      min x: %g\n",mm[0]);
+        fprintf(stderr,"      max x: %g\n",mm[1]);
+        if(num_dims > 1) {
+          fprintf(stderr,"      min y: %g\n",mm[2]);
+          fprintf(stderr,"      max y: %g\n",mm[3]);
+        }
+        if(num_dims > 2) {
+          fprintf(stderr,"      min z: %g\n",mm[4]);
+          fprintf(stderr,"      max z: %g\n",mm[5]);
+        }
+
+        /* Free the allocated memory - so far
+         *-----------------------------------*/
+        for(i=0; i<num_dims; ++i) {
+          free(coords[i]);
+        }
+        free(coords);
+
+#if (defined GT_USERD_API_200)
+        if(Node_labels) {
+          free(nodeids);
+        }
+#endif
+        
+        /* Get the block iblanking - if any
+         *---------------------------------*/
+        if(Pbuild[p].type == Z_IBLANKED) {
+
+          iblanking = (int *) calloc(nn,sizeof(int));
+          if(iblanking == (int *) NULL) {
+            fprintf(stderr,"Error: allocating iblanking array\n");
+            return(Z_ERR);
+          }
+
+          err = USERD_get_block_iblanking(pn,iblanking);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting block iblanking\n");
+            return(Z_ERR);
+          }
+
+          /* Echo "some" info
+           *-----------------*/
+          ib[Z_EXT]    = 0;
+          ib[Z_INT]    = 0;
+          ib[Z_BND]    = 0;
+          ib[Z_INTBND] = 0;
+          ib[Z_SYM]    = 0;
+          
+          for(i=0; i<nn; ++i) {
+            ++ib[iblanking[i]];
+          }
+
+          fprintf(stderr,"   Iblanking breakdown:\n");
+          fprintf(stderr,"      Number of Z_EXT:    %d\n",ib[Z_EXT]);
+          fprintf(stderr,"      Number of Z_INT:    %d\n",ib[Z_INT]);
+          fprintf(stderr,"      Number of Z_BND:    %d\n",ib[Z_BND]);
+          fprintf(stderr,"      Number of Z_INTBND: %d\n",ib[Z_INTBND]);
+          fprintf(stderr,"      Number of Z_SYM:    %d\n",ib[Z_SYM]);
+          
+          free(iblanking);
+        }
+
+#if (defined GT_USERD_API_200)
+
+        /* Get the ghost flags - if any
+         *-----------------------------*/
+        if(Pbuild[p].ghosts) {
+
+          ghost_flag = (int *) calloc(ne,sizeof(int));
+          if(ghost_flag == (int *) NULL) {
+            fprintf(stderr,"Error: allocating ghost_flag array\n");
+            return(Z_ERR);
+          }
+
+          err = USERD_get_block_ghost_flags(pn,ghost_flag);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting block ghost flags\n");
+            return(Z_ERR);
+          }
+
+          /* Echo "some" info
+           *-----------------*/
+          num_ghosts = 0;
+          
+          for(i=0; i<ne; ++i) {
+            if(ghost_flag[i] > 0) {
+              ++num_ghosts;
+            }
+          }
+          
+          fprintf(stderr,"   Block Ghost flag breakdown:\n");
+          fprintf(stderr,"      %d ghost cells out of %d total cells\n",
+                  num_ghosts,ne);
+          
+          free(ghost_flag);
+        }
+        
+        /* Get the element ids - if any
+         *-----------------------------*/
+        if(Element_labels) {
+
+          elemids = (int *) calloc(ne,sizeof(int));
+          if(elemids == (int *) NULL) {
+            fprintf(stderr,"Error: allocating elemids array\n");
+            return(Z_ERR);
+          }
+
+
+          et = cell_type;
+          err = USERD_get_part_element_ids_by_type(pn,et,elemids);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting element ids\n");
+            return(Z_ERR);
+          }
+
+          /* First element of the type
+           *--------------------------*/
+          i = 0;
+          fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+          fprintf(stderr,"      id: %d\n",elemids[i]);
+          
+          /* Last element of the type
+           *-------------------------*/
+          i = ne - 1;
+          if(i > 0) {
+            fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+            fprintf(stderr,"      id: %d\n",elemids[i]);
+          }
+
+          free(elemids);
+        }
+#endif
+      }
+      else {
+        fprintf(stderr,"   Empty structured part\n");
+      }
+    }
+
+    /* Get border availability
+     *------------------------*/
+    err = USERD_get_border_availability(pn,num_elems);
+    if(err == Z_OK) {
+
+      /* Get border elements - if any
+       *-----------------------------*/
+      for(et=0; et<Z_MAXTYPE; ++et) {
+        ne = num_elems[et];
+        if(ne > 0) {
+
+          conns = (int **) calloc(ne,sizeof(int *));
+          if(conns == (int **) NULL) {
+            fprintf(stderr,"Error: allocating border conns array\n");
+            return(Z_ERR);
+          }
+          else {
+            for(i=0; i<ne; ++i) {
+              conns[i] = (int *) calloc(Elem_info[et].con_len,sizeof(int));
+              if(conns[i] == (int *) NULL) {
+                fprintf(stderr,"Error: allocating border conns array\n");
+                return(Z_ERR);
+              }
+            }
+          }
+
+          parent_type = (short *) calloc(ne,sizeof(short));
+          if(parent_type == (short *) NULL) {
+            fprintf(stderr,"Error: allocating border parent_type array\n");
+            return(Z_ERR);
+          }
+
+          parent_num = (int *) calloc(ne,sizeof(int));
+          if(parent_num == (int *) NULL) {
+            fprintf(stderr,"Error: allocating border parent_num array\n");
+            return(Z_ERR);
+          }
+
+
+          err = USERD_get_border_elements_by_type(pn,
+                                                  et,
+                                                  conns,
+                                                  parent_type,
+                                                  parent_num);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting border elements\n");
+            return(Z_ERR);
+          }
+
+
+          /* Echo "some" info
+           *-----------------*/
+
+          /* First element of the type
+           *--------------------------*/
+          i = 0;
+          fprintf(stderr,"   %s border element %d of %d:\n",
+                  Elem_info[et].name,i+1,ne);
+          fprintf(stderr,"      Parent type: %s\n",
+                  Elem_info[parent_type[i]].name);
+          fprintf(stderr,"      Parent num:  %d\n",parent_num[i]);
+          fprintf(stderr,"      connectivity:");
+          for(j=0; j<Elem_info[et].con_len; ++j) {
+            fprintf(stderr," %d",conns[i][j]);
+          }
+          fprintf(stderr,"\n");
+
+          /* Last element of the type
+           *-------------------------*/
+          i = ne - 1;
+          if(i > 0) {
+            fprintf(stderr,"   %s border element %d of %d:\n",
+                    Elem_info[et].name,i+1,ne);
+            fprintf(stderr,"      Parent type: %s\n",
+                    Elem_info[parent_type[i]].name);
+            fprintf(stderr,"      Parent num:  %d\n",parent_num[i]);
+            fprintf(stderr,"      connectivity:");
+            for(j=0; j<Elem_info[et].con_len; ++j) {
+              fprintf(stderr," %d",conns[i][j]);
+            }
+            fprintf(stderr,"\n");
+          }
+
+
+          /* Free the allocated memory
+           *--------------------------*/
+          for(i=0; i<ne; ++i) {
+            free(conns[i]);
+          }
+          free(conns);
+          free(parent_type);
+          free(parent_num);
+        }
+      }
+    }
+  } /* end for p = 0 to Num_parts */
+
+  return(Z_OK);
+}
+
+
+/*----------------
+ * gold_var_loader
+ *----------------*/
+static int
+gold_var_loader(int var_time_step)
+{
+  int i, j;
+  int err;
+  int v, vn;
+  int var_timeset;
+  int p, pn;
+  int et, e1, e2;
+  int num_comps;
+  int num_dims;
+  int nsize;
+  int comp;
+  int bdim[3];
+  int ne;
+  int cell_type;
+  float constant_val;
+  char line1[Z_BUFL];
+  char line2[Z_BUFL];
+  float *values;
+  float minv,maxv;
+  int bd1,bd2,bd3;
+
+
+  fprintf(stderr,"\n--------------- var_loader --------------\n");
+
+  for(v=0; v<Num_vars; ++v) {
+    vn = v + 1;
+
+    if(v > 0) {
+      fprintf(stderr,"\n");
+    }
+    if(Varinfo[v].classify == Z_PER_NODE) {
+      fprintf(stderr," Z_PER_NODE Variable %d:\n",vn);
+    }
+    else {
+      fprintf(stderr," Z_PER_ELEM Variable %d:\n",vn);
+    }
+
+
+    if(Num_time_sets > 0) {
+      /* Get the timeset used for the variable
+       *---------------------------------------*/
+      var_timeset = Varinfo[v].timeset;
+      
+      /* Get the number of time steps for this timeset
+       *----------------------------------------------*/
+      Num_time_steps = USERD_get_num_of_time_steps(var_timeset);
+      if(Num_time_steps < 1) {
+        fprintf(stderr," Error: Number of time steps returned: %d\n",
+                Num_time_steps);
+        fprintf(stderr," (Must be >0 to be okay)\n");
+        return(Z_ERR);
+      }
+      if(var_time_step > (Num_time_steps - 1)) {
+        var_time_step = Num_time_steps - 1;
+      }
+      
+      /* Set the timeset and step - to first step by default, but
+       * can set it at others using -vts command argument
+       *---------------------------------------------------------*/
+      USERD_set_time_set_and_step(var_timeset,var_time_step);
+      
+      fprintf(stderr,"   Using timeset:   %d  (step range is %d through %d)\n",
+              var_timeset,0,Num_time_steps-1);
+      fprintf(stderr,"   Using time step: %d\n",var_time_step);
+    }
+
+
+    /* Constants
+     *----------*/
+    if(Varinfo[v].type == Z_CONSTANT) {
+
+      constant_val = USERD_get_constant_val(vn,FALSE);
+      fprintf(stderr,"   Constant (%s):\n",Varinfo[v].description);
+      fprintf(stderr,"     value: %g\n",constant_val);
+
+      if(Varinfo[v].complex) {
+        constant_val = USERD_get_constant_val(vn,TRUE);
+        fprintf(stderr,"   value (imag): %g\n",constant_val);
+      }
+    }
+
+    /* Scalars, Vectors, Tensors
+     *--------------------------*/
+    else {
+
+      /* Get the var description line
+       *-----------------------------*/
+      err = USERD_get_descrip_lines(Z_VARI,vn,FALSE,line1,line2);
+      if(err == Z_OK) {
+        fprintf(stderr,"   Desc line: %s\n",line1);
+      }
+      else {
+        fprintf(stderr,"Error: getting var description line\n");
+        return(Z_ERR);
+      }
+
+      if(Varinfo[v].complex) {
+        err = USERD_get_descrip_lines(Z_VARI,vn,TRUE,line1,line2);
+        if(err == Z_OK) {
+          fprintf(stderr,"   Desc line (imag): %s\n",line1);
+        }
+        else {
+          fprintf(stderr,"Error: getting var description line (imag)\n");
+          return(Z_ERR);
+        }
+      }
+
+
+      /* Get the values by component
+       *-----------------------------*/
+      if(Varinfo[v].type == Z_SCALAR) {
+        num_comps = 1;
+      }
+      else if(Varinfo[v].type == Z_VECTOR) {
+        num_comps = 3;
+      }
+      else if(Varinfo[v].type == Z_TENSOR) {
+        num_comps = 6;
+      }
+      else if(Varinfo[v].type == Z_TENSOR9) {
+        num_comps = 9;
+      }
+
+
+      /* Per_Node
+       *---------*/
+      if(Varinfo[v].classify == Z_PER_NODE) {
+
+        for(p=0; p<Num_parts; ++p) {
+          pn = p + 1;
+
+          if(Pbuild[p].type == Z_UNSTRUCTURED) {
+            nsize = Pbuild[p].nn;
+          }
+          else {
+            for(comp=0; comp<3; ++comp) {
+              if(Pbuild[p].ne[comp] < 1) {
+                bdim[comp] = 1;
+              }
+              else {
+                bdim[comp] = Pbuild[p].ne[comp];
+              }
+            }
+            nsize = bdim[0] * bdim[1] * bdim[2];
+          }
+
+
+          fprintf(stderr,"   For part %d, with %d nodes:\n",pn,nsize);
+
+          if(nsize > 0) {
+            values = (float *) calloc((nsize+1),sizeof(float));
+            if(values == (float *) NULL) {
+              fprintf(stderr,"Error: alocating variable values\n");
+              return(Z_ERR);
+            }
+
+            for(comp=0; comp<num_comps; ++comp) {
+
+              err = USERD_get_var_by_component(vn,
+                                               pn,
+                                               Varinfo[v].type,
+                                               0,
+                                               FALSE,
+                                               comp,
+                                               values);
+              if(err == Z_UNDEF) {
+                fprintf(stderr,"  Variable not defined on this part\n");
+              }
+
+
+              /* For the component, show 1st node, last node, min, max values
+               *-------------------------------------------------------------*/
+              minv = maxv = values[1];
+              for(i=2; i<=nsize; ++i) {
+                if(values[i] < minv) {
+                  minv = values[i];
+                }
+                if(values[i] > maxv) {
+                  maxv = values[i];
+                }
+              }
+              
+              fprintf(stderr,"     For component %d: \n",comp);
+              fprintf(stderr,"       node %10d value:   %g\n",1,values[1]);
+              fprintf(stderr,"       node %10d value:   %g\n",nsize,values[nsize]);
+              fprintf(stderr,"       min value:               %g\n",minv);
+              fprintf(stderr,"       max value:               %g\n",maxv);
+
+              if(Varinfo[v].complex) {
+                err = USERD_get_var_by_component(vn,
+                                                 pn,
+                                                 Varinfo[v].type,
+                                                 0,
+                                                 FALSE,
+                                                 comp,
+                                                 values);
+                if(err == Z_UNDEF) {
+                  fprintf(stderr,"  Variable not defined on this part\n");
+                }
+                
+                /* For the component, show 1st node, last node, min, max values
+                 *-------------------------------------------------------------*/
+                minv = maxv = values[1];
+                for(i=2; i<=nsize; ++i) {
+                  if(values[i] < minv) {
+                    minv = values[i];
+                  }
+                  if(values[i] > maxv) {
+                    maxv = values[i];
+                  }
+                }
+                
+                fprintf(stderr,"     For component %d (imag): \n",comp);
+                fprintf(stderr,"       node %10d value:   %g\n",1,values[1]);
+                fprintf(stderr,"       node %10d value:   %g\n",nsize,values[nsize]);
+                fprintf(stderr,"       min value:               %g\n",minv);
+                fprintf(stderr,"       max value:               %g\n",maxv);
+              }
+            }
+            free(values);
+          }
+        }
+      }
+
+      /* Per_Elem
+       *---------*/
+      else {
+        for(p=0; p<Num_parts; ++p) {
+          pn = p + 1;
+
+          if(Pbuild[p].type != Z_UNSTRUCTURED) {
+
+            for(comp=0; comp<3; ++comp) {
+              if(Pbuild[p].ne[comp] < 1) {
+                bdim[comp] = 1;
+              }
+              else {
+                bdim[comp] = Pbuild[p].ne[comp];
+              }
+            }
+
+            bd1 = bdim[0]-1;
+            if(bd1 < 1) {
+              bd1 = 1;
+            }
+            bd2 = bdim[1]-1;
+            if(bd2 < 1) {
+              bd2 = 1;
+            }
+            bd3 = bdim[2]-1;
+            if(bd3 < 1) {
+              bd3 = 1;
+            }
+            nsize = bd1 * bd2 * bd3;
+
+
+            /* Determine cell type
+             *--------------------*/
+            num_dims = 3;
+            for(i=0; i<3; ++i) {
+              if(bdim[i] == 1) {
+                --num_dims;
+              }
+            }
+            if(num_dims == 3) {
+              cell_type = Z_HEX08;
+            }
+            else if(num_dims == 2) {
+              cell_type = Z_QUA04;
+            }
+            else {
+              cell_type = Z_BAR02;
+            }
+          }
+
+          if(Pbuild[p].type == Z_UNSTRUCTURED) {
+            e1 = 0;
+            e2 = Z_MAXTYPE-1;
+          }
+          else {
+            e1 = e2 = cell_type;
+          }
+
+          for(et=e1; et<=e2; ++et) {
+
+            if(Pbuild[p].type == Z_UNSTRUCTURED) {
+              nsize = Pbuild[p].ne[et];
+            }
+
+            if(nsize > 0) {
+
+              fprintf(stderr,"   For part %d, with %d elems of type %s:\n",
+                      pn,nsize,Elem_info[et].name);
+
+
+              values = (float *) calloc((nsize+1),sizeof(float));
+              if(values == (float *) NULL) {
+                fprintf(stderr,"Error: alocating variable values\n");
+                return(Z_ERR);
+              }
+              
+              for(comp=0; comp<num_comps; ++comp) {
+                
+                err = USERD_get_var_by_component(vn,
+                                                 pn,
+                                                 Varinfo[v].type,
+                                                 et,
+                                                 FALSE,
+                                                 comp,
+                                                 values);
+                if(err == Z_UNDEF) {
+                  fprintf(stderr,"  Variable not defined on this part\n");
+                }
+                
+                /* For the component, show 1st elem, last elem, min, max values
+                 *-------------------------------------------------------------*/
+                minv = maxv = values[1];
+                for(i=2; i<=nsize; ++i) {
+                  if(values[i] < minv) {
+                    minv = values[i];
+                  }
+                  if(values[i] > maxv) {
+                    maxv = values[i];
+                  }
+                }
+                
+                fprintf(stderr,"     For component %d: \n",comp);
+                fprintf(stderr,"       elem %10d value:  %g\n",1,values[1]);
+                fprintf(stderr,"       elem %10d value:  %g\n",nsize,values[nsize]);
+                fprintf(stderr,"       min value:              %g\n",minv);
+                fprintf(stderr,"       max value:              %g\n",maxv);
+                
+                if(Varinfo[v].complex) {
+                  err = USERD_get_var_by_component(vn,
+                                                   pn,
+                                                   Varinfo[v].type,
+                                                   et,
+                                                   FALSE,
+                                                   comp,
+                                                   values);
+                  if(err == Z_UNDEF) {
+                    fprintf(stderr,"  Variable not defined on this part\n");
+                  }
+                  
+                  /* For the component, show 1st elem, last elem, min, max values
+                   *-------------------------------------------------------------*/
+                  minv = maxv = values[1];
+                  for(i=2; i<=nsize; ++i) {
+                    if(values[i] < minv) {
+                      minv = values[i];
+                    }
+                    if(values[i] > maxv) {
+                      maxv = values[i];
+                    }
+                  }
+                  
+                  fprintf(stderr,"     For component %d (imag): \n",comp);
+                  fprintf(stderr,"       elem %10d value:  %g\n",1,values[1]);
+                  fprintf(stderr,"       elem %10d value:  %g\n",nsize,values[nsize]);
+                  fprintf(stderr,"       min value:              %g\n",minv);
+                  fprintf(stderr,"       max value:              %g\n",maxv);
+                  
+                }
+              }
+              free(values);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return(Z_OK);
+}
+
+#else
+
+/*-------------
+ * part_builder
+ *-------------*/
+static int
+part_builder(int geom_time_step)
+{
+  int i, j;
+  int err;
+  int p, pn;
+  int et, ne;
+  int *elemids[Z_MAXTYPE];
+  int **conns[Z_MAXTYPE];
+  int nn;
+  int comp;
+  int bdim[3];
+  int ib[5];
+  int num_dims;
+  int cell_type;
+  float mm[6];
+  float **coords;
+  int *nodeids;
+  int *iblanking;
+  CRD *crds;
+  int bd1,bd2,bd3;
+
+
+  fprintf(stderr,"\n------------- part_builder --------------\n");
+
+
+  if(Num_time_steps > 1) {
+    if(geom_time_step > (Num_time_steps - 1)) {
+      geom_time_step = Num_time_steps - 1;
+    }
+
+    /* Set the time step - to first step by default, but
+     * can set it at others using -gts command argument
+     *---------------------------------------------------*/
+    USERD_set_time_step(geom_time_step);
+    
+    fprintf(stderr," Using time step: %d  (where range is %d through %d\n",
+            geom_time_step,0,Num_time_steps-1);
+  }
+
+
+  /* Get the global coords
+   *----------------------*/
+  nn = USERD_get_number_of_global_nodes();
+
+  if(nn > 0) {
+
+    crds = (CRD *) calloc(nn,sizeof(CRD));
+    if(crds == (CRD *) NULL) {
+      fprintf(stderr,"Error: allocating crds array\n");
+      return(Z_ERR);
+    }
+        
+    if(Node_labels) {
+      nodeids = (int *) calloc(nn,sizeof(int));
+      if(nodeids == (int *) NULL) {
+        fprintf(stderr,"Error: allocating nodeids array\n");
+        return(Z_ERR);
+      }
+    }
+    
+    
+    err = USERD_get_global_coords(crds);
+    if(err == Z_ERR) {
+      fprintf(stderr,"Error: getting unstructured coords\n");
+      return(Z_ERR);
+    }
+
+    if(Node_labels) {
+      err = USERD_get_global_node_ids(nodeids);
+      if(err == Z_ERR) {
+        fprintf(stderr,"Error: getting nodeids\n");
+        return(Z_ERR);
+      }
+    }
+
+    /* Echo "some" info
+     *-----------------*/
+
+    /* First node
+     *-----------*/
+    i = 0;
+    fprintf(stderr,"   Node %d of %d:\n",i+1,nn);
+    if(Node_labels) {
+      fprintf(stderr,"      id: %d\n",nodeids[i]);
+    }
+    fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+            crds[i].xyz[0], crds[i].xyz[1], crds[i].xyz[2]);
+    mm[0] = mm[1] = crds[i].xyz[0];
+    mm[2] = mm[3] = crds[i].xyz[1];
+    mm[4] = mm[5] = crds[i].xyz[2];
+
+
+    /* Last node
+     *----------*/
+    i = nn-1;
+    if(i > 0) {
+      fprintf(stderr,"   Node %d of %d:\n",i+1,nn);
+      if(Node_labels) {
+        fprintf(stderr,"      id: %d\n",nodeids[i]);
+      }
+      fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+              crds[i].xyz[0], crds[i].xyz[1], crds[i].xyz[2]);
+    }
+    
+    /* Min and max coordinate values
+     *------------------------------*/
+    for(i=1; i<nn; ++i) {
+      if(crds[i].xyz[0] < mm[0]) {
+        mm[0] = crds[i].xyz[0];
+      }
+      if(crds[i].xyz[0] > mm[1]) {
+        mm[1] = crds[i].xyz[0];
+      }
+      if(crds[i].xyz[1] < mm[2]) {
+        mm[2] = crds[i].xyz[1];
+      }
+      if(crds[i].xyz[1] > mm[3]) {
+        mm[3] = crds[i].xyz[1];
+      }
+      if(crds[i].xyz[2] < mm[4]) {
+        mm[4] = crds[i].xyz[2];
+      }
+      if(crds[i].xyz[2] > mm[5]) {
+        mm[5] = crds[i].xyz[2];
+      }
+    }
+
+    fprintf(stderr,"   Global coordinate ranges:\n");
+    fprintf(stderr,"      min x: %g\n",mm[0]);
+    fprintf(stderr,"      max x: %g\n",mm[1]);
+    fprintf(stderr,"      min y: %g\n",mm[2]);
+    fprintf(stderr,"      max y: %g\n",mm[3]);
+    fprintf(stderr,"      min z: %g\n",mm[4]);
+    fprintf(stderr,"      max z: %g\n",mm[5]);
+
+
+    /* Free the allocated memory
+     *--------------------------*/
+    free(crds);
+    if(Node_labels) {
+      free(nodeids);
+    }
+  }
+
+
+
+  for(p=0; p<Num_parts; ++p) {
+    pn = p+1;
+
+    fprintf(stderr,"\n");
+    fprintf(stderr," Part %d:\n",pn);
+
+    /*-----------------------
+     * For unstructured parts
+     *-----------------------*/
+    if(Pbuild[p].type == Z_UNSTRUCTURED) {
+
+      for(et=0; et<Z_MAXTYPE; ++et) {
+        ne = Pbuild[p].ne[et];
+
+        if(ne > 0) {
+
+          conns[et] = (int **) calloc(ne,sizeof(int *));
+          if(conns[et] == (int **) NULL) {
+            fprintf(stderr,"Error: allocating conns array\n");
+            return(Z_ERR);
+          }
+          else {
+            for(i=0; i<ne; ++i) {
+              conns[et][i] = (int *) calloc(Elem_info[et].con_len,sizeof(int));
+              if(conns[et][i] == (int *) NULL) {
+                fprintf(stderr,"Error: allocating conns array\n");
+                return(Z_ERR);
+              }
+            }
+          }
+
+          if(Element_labels) {
+            elemids[et] = (int *) calloc(ne,sizeof(int));
+            if(elemids[et] == (int *) NULL) {
+              fprintf(stderr,"Error: allocating elemids array\n");
+              return(Z_ERR);
+            }
+          }
+        }
+      }
+
+      /* Get the elements
+       *-----------------*/
+      err = USERD_get_element_connectivities_for_part(pn,conns);
+      if(err == Z_ERR) {
+        fprintf(stderr,"Error: getting element connectivities\n");
+        return(Z_ERR);
+      }
+      
+      /* Get the element ids - if any
+       *-----------------------------*/
+      if(Element_labels) {
+        err = USERD_get_element_ids_for_part(pn,elemids);
+        if(err == Z_ERR) {
+          fprintf(stderr,"Error: getting element ids\n");
+          return(Z_ERR);
+        }
+      }
+
+      /* Echo "some" info
+       *-----------------*/
+      for(et=0; et<Z_MAXTYPE; ++et) {
+        ne = Pbuild[p].ne[et];
+
+        if(ne > 0) {
+
+          /* First element of the type
+           *--------------------------*/
+          i = 0;
+          fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+          if(Element_labels) {
+            fprintf(stderr,"      id: %d\n",elemids[et][i]);
+          }
+          fprintf(stderr,"      connectivity:");
+          for(j=0; j<Elem_info[et].con_len; ++j) {
+            fprintf(stderr," %d",conns[et][i][j]);
+          }
+          fprintf(stderr,"\n");
+
+          /* Last element of the type
+           *-------------------------*/
+          i = ne - 1;
+          if(i > 0) {
+            fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+            if(Element_labels) {
+              fprintf(stderr,"      id: %d\n",elemids[et][i]);
+            }
+            fprintf(stderr,"      connectivity:");
+            for(j=0; j<Elem_info[et].con_len; ++j) {
+              fprintf(stderr," %d",conns[et][i][j]);
+            }
+            fprintf(stderr,"\n");
+          }
+        }
+      }
+
+      /* Free the allocated memory
+       *--------------------------*/
+      for(et=0; et<Z_MAXTYPE; ++et) {
+        ne = Pbuild[p].ne[et];
+
+        if(ne > 0) {
+          for(i=0; i<ne; ++i) {
+            free(conns[et][i]);
+          }
+          free(conns[et]);
+
+          if(Element_labels) {
+            free(elemids[et]);
+          }
+        }
+      }
+    }
+
+
+    /*---------------------
+     * For structured parts
+     *---------------------*/
+    else {
+
+      /* Get the block coords
+       *---------------------*/
+      for(comp=0; comp<3; ++comp) {
+        if(Pbuild[p].ne[comp] < 1) {
+          bdim[comp] = 1;
+        }
+        else {
+          bdim[comp] = Pbuild[p].ne[comp];
+        }
+      }
+      nn = bdim[0] * bdim[1] * bdim[2];
+
+      bd1 = bdim[0]-1;
+      if(bd1 < 1) {
+        bd1 = 1;
+      }
+      bd2 = bdim[1]-1;
+      if(bd2 < 1) {
+        bd2 = 1;
+      }
+      bd3 = bdim[2]-1;
+      if(bd3 < 1) {
+        bd3 = 1;
+      }
+      ne = bd1 * bd2 * bd3;
+
+
+      /* Determine cell type
+       *--------------------*/
+      num_dims = 3;
+      for(i=0; i<3; ++i) {
+        if(bdim[i] == 1) {
+          --num_dims;
+        }
+      }
+      if(num_dims == 3) {
+        cell_type = Z_HEX08;
+      }
+      else if(num_dims == 2) {
+        cell_type = Z_QUA04;
+      }
+      else {
+        cell_type = Z_BAR02;
+      }
+
+      coords = (float **) calloc(num_dims,sizeof(float *));
+      if(coords == (float **) NULL) {
+        fprintf(stderr,"Error: allocating coords array\n");
+        return(Z_ERR);
+      }
+      else {
+        for(i=0; i<num_dims; ++i) {
+          coords[i] = (float *) calloc(nn,sizeof(float));
+          if(coords[i] == (float *) NULL) {
+            fprintf(stderr,"Error: allocating coords array\n");
+            return(Z_ERR);
+          }
+        }
+      }
+        
+      /* Get the coords
+       *---------------*/
+      for(comp=0; comp<num_dims; ++comp) {
+        err = USERD_get_block_coords_by_component(pn,comp,coords[comp]);
+        if(err == Z_ERR) {
+          fprintf(stderr,"Error: getting block coords\n");
+          return(Z_ERR);
+        }
+      }
+      
+
+      /* Echo "some" info
+       *-----------------*/
+
+      /* First node
+       *-----------*/
+      if(nn > 0) {
+        i = 0;
+        fprintf(stderr,"   Node %d of %d:\n",i+1,nn);
+        
+        if(num_dims == 3) {
+          fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+                  coords[0][i], coords[1][i], coords[2][i]);
+          mm[0] = mm[1] = coords[0][i];
+          mm[2] = mm[3] = coords[1][i];
+          mm[4] = mm[5] = coords[2][i];
+        }
+        else if(num_dims == 2) {
+          fprintf(stderr,"      x y coordinates: %g %g\n",
+                  coords[0][i], coords[1][i]);
+          mm[0] = mm[1] = coords[0][i];
+          mm[2] = mm[3] = coords[1][i];
+        }
+        else {
+          fprintf(stderr,"      x coordinates: %g\n",
+                  coords[0][i]);
+          mm[0] = mm[1] = coords[0][i];
+        }
+
+        
+        /* Last node
+         *----------*/
+        i = nn-1;
+        if(i > 1) {
+          fprintf(stderr,"   Node %d of %d:\n",i+1,nn);
+          
+          if(num_dims == 3) {
+            fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+                    coords[0][i], coords[1][i], coords[2][i]);
+          }
+          else if(num_dims == 2) {
+            fprintf(stderr,"      x y coordinates: %g %g\n",
+                    coords[0][i], coords[1][i]);
+          }
+          else {
+            fprintf(stderr,"      x coordinates: %g\n",
+                    coords[0][i]);
+          }
+        }
+      }
+
+      /* Min and max coordinate values
+       *------------------------------*/
+      for(i=2; i<=nn; ++i) {
+        if(coords[0][i] < mm[0]) {
+          mm[0] = coords[0][i];
+        }
+        if(coords[0][i] > mm[1]) {
+          mm[1] = coords[0][i];
+        }
+        if(num_dims > 1) {
+          if(coords[1][i] < mm[2]) {
+            mm[2] = coords[1][i];
+          }
+          if(coords[1][i] > mm[3]) {
+            mm[3] = coords[1][i];
+          }
+        }
+        if(num_dims > 2) {
+          if(coords[2][i] < mm[4]) {
+            mm[4] = coords[2][i];
+          }
+          if(coords[2][i] > mm[5]) {
+            mm[5] = coords[2][i];
+          }
+        }
+      }
+      
+      fprintf(stderr,"   Coordinate ranges:\n");
+      fprintf(stderr,"      min x: %g\n",mm[0]);
+      fprintf(stderr,"      max x: %g\n",mm[1]);
+      if(num_dims > 1) {
+        fprintf(stderr,"      min y: %g\n",mm[2]);
+        fprintf(stderr,"      max y: %g\n",mm[3]);
+      }
+      if(num_dims > 2) {
+        fprintf(stderr,"      min z: %g\n",mm[4]);
+        fprintf(stderr,"      max z: %g\n",mm[5]);
+      }
+
+      /* Free the allocated memory - so far
+       *-----------------------------------*/
+      for(i=0; i<num_dims; ++i) {
+        free(coords[i]);
+      }
+      free(coords);
+
+
+      /* Get the block iblanking - if any
+       *---------------------------------*/
+      if(Pbuild[p].type == Z_IBLANKED) {
+
+        iblanking = (int *) calloc(nn,sizeof(int));
+        if(iblanking == (int *) NULL) {
+          fprintf(stderr,"Error: allocating iblanking array\n");
+          return(Z_ERR);
+        }
+
+        err = USERD_get_block_iblanking(pn,iblanking);
+        if(err == Z_ERR) {
+          fprintf(stderr,"Error: getting block iblanking\n");
+          return(Z_ERR);
+        }
+
+        /* Echo "some" info
+         *-----------------*/
+        ib[Z_EXT]    = 0;
+        ib[Z_INT]    = 0;
+        ib[Z_BND]    = 0;
+        ib[Z_INTBND] = 0;
+        ib[Z_SYM]    = 0;
+
+        for(i=0; i<nn; ++i) {
+          ++ib[iblanking[i]];
+        }
+
+        fprintf(stderr,"   Iblanking breakdown:\n");
+        fprintf(stderr,"      Number of Z_EXT:    %d\n",ib[Z_EXT]);
+        fprintf(stderr,"      Number of Z_INT:    %d\n",ib[Z_INT]);
+        fprintf(stderr,"      Number of Z_BND:    %d\n",ib[Z_BND]);
+        fprintf(stderr,"      Number of Z_INTBND: %d\n",ib[Z_INTBND]);
+        fprintf(stderr,"      Number of Z_SYM:    %d\n",ib[Z_SYM]);
+
+        free(iblanking);
+      }
+    }
+  }
+
+  return(Z_OK);
+}
+
+
+/*-----------
+ * var_loader
+ *-----------*/
+static int
+var_loader(int var_time_step)
+{
+  int i, j, k;
+  int err;
+  int v, vn;
+  int var_timeset;
+  int p, pn;
+  int et, e1, e2;
+  int num_comps;
+  int num_dims;
+  int nsize;
+  int comp;
+  int bdim[3];
+  int ne;
+  int cell_type;
+  float constant_val;
+  char line1[Z_BUFL];
+  char line2[Z_BUFL];
+  float *values;
+  float *tvalues;
+  float minv[3],maxv[3];
+  int bd1,bd2,bd3;
+
+
+  fprintf(stderr,"\n--------------- var_loader --------------\n");
+
+  if(Num_time_steps > 1 && v == 0) {
+    if(var_time_step > (Num_time_steps - 1)) {
+      var_time_step = Num_time_steps - 1;
+    }
+    
+    /* Set the time step - to first step by default, but
+     * can set it at others using -vts command argument
+     *---------------------------------------------------------*/
+    USERD_set_time_step(var_time_step);
+    
+    fprintf(stderr," Using time step: %d  (where range is %d through %d)\n\n",
+            var_time_step,0,Num_time_steps-1);
+  }
+
+  for(v=0; v<Num_vars; ++v) {
+    vn = v + 1;
+
+    if(v > 0) {
+      fprintf(stderr,"\n");
+    }
+    if(Varinfo[v].classify == Z_PER_NODE) {
+      fprintf(stderr," Z_PER_NODE Variable %d:\n",vn);
+    }
+    else {
+      fprintf(stderr," Z_PER_ELEM Variable %d:\n",vn);
+    }
+
+    /* Constants
+     *----------*/
+    if(Varinfo[v].type == Z_CONSTANT) {
+
+      constant_val = USERD_get_constant_value(vn);
+      fprintf(stderr,"   Constant (%s):\n",Varinfo[v].description);
+      fprintf(stderr,"     value: %g\n",constant_val);
+    }
+
+
+    /* Scalars, Vectors, Tensors
+     *--------------------------*/
+    else {
+
+      /* Get the var description line
+       *-----------------------------*/
+      err = USERD_get_description_lines(Z_VARI,vn,line1,line2);
+      if(err == Z_OK) {
+        fprintf(stderr,"   Desc line: %s\n",line1);
+      }
+      else {
+        fprintf(stderr,"Error: getting var description line\n");
+        return(Z_ERR);
+      }
+
+
+      /* Get the values by component
+       *-----------------------------*/
+      if(Varinfo[v].type == Z_SCALAR) {
+        num_comps = 1;
+      }
+      else if(Varinfo[v].type == Z_VECTOR) {
+        num_comps = 3;
+      }
+      else if(Varinfo[v].type == Z_TENSOR) {
+        num_comps = 6;
+      }
+      else if(Varinfo[v].type == Z_TENSOR9) {
+        num_comps = 9;
+      }
+
+
+      /* Per_Node
+       *---------*/
+      if(Varinfo[v].classify == Z_PER_NODE) {
+
+        for(p=0; p<Num_parts; ++p) {
+          pn = p + 1;
+
+          if(Pbuild[p].type == Z_UNSTRUCTURED) {
+            nsize = Pbuild[p].nn;
+          }
+          else {
+            for(comp=0; comp<3; ++comp) {
+              if(Pbuild[p].ne[comp] < 1) {
+                bdim[comp] = 1;
+              }
+              else {
+                bdim[comp] = Pbuild[p].ne[comp];
+              }
+            }
+            nsize = bdim[0] * bdim[1] * bdim[2];
+          }
+
+
+          fprintf(stderr,"   For part %d, with %d nodes:\n",pn,nsize);
+
+          if(nsize > 0) {
+            values = (float *) calloc((num_comps * nsize),sizeof(float));
+            if(values == (float *) NULL) {
+              fprintf(stderr,"Error: alocating variable values\n");
+              return(Z_ERR);
+            }
+
+            if(num_comps == 1) {
+
+              if(Pbuild[p].type == Z_UNSTRUCTURED) {
+                err = USERD_get_scalar_values(vn,
+                                              pn,
+                                              0,
+                                              values);
+                if(err == Z_ERR) {
+                  fprintf(stderr,"Error: getting scalar values\n");
+                  return(Z_ERR);
+                }
+              }
+              else {
+                err = USERD_get_block_scalar_values(pn,
+                                                    vn,
+                                                    values);
+                if(err == Z_ERR) {
+                  fprintf(stderr,"Error: getting block scalar values\n");
+                  return(Z_ERR);
+                }
+              }
+
+              /* For the component, show 1st node, last node, min, max values
+               *-------------------------------------------------------------*/
+              minv[0] = maxv[0] = values[0];
+              for(i=0; i<nsize; ++i) {
+                if(values[i] < minv[0]) {
+                  minv[0] = values[i];
+                }
+                if(values[i] > maxv[0]) {
+                  maxv[0] = values[i];
+                }
+              }
+              
+              fprintf(stderr,"       node %10d value: %g\n",1,values[0]);
+              fprintf(stderr,"       node %10d value: %g\n",nsize,values[nsize-1]);
+              fprintf(stderr,"       min value:             %g\n",minv[0]);
+              fprintf(stderr,"       max value:             %g\n",maxv[0]);
+
+            }
+
+            else if(num_comps == 3) {
+
+              if(Pbuild[p].type == Z_UNSTRUCTURED) {
+                err = USERD_get_vector_values(vn,
+                                              pn,
+                                              0,
+                                              values);
+                if(err == Z_ERR) {
+                  fprintf(stderr,"Error: getting vector values\n");
+                  return(Z_ERR);
+                }
+              }
+              else {
+
+                tvalues = (float *) calloc(nsize,sizeof(float));
+                if(tvalues == (float *) NULL) {
+                  fprintf(stderr,"Error: alocating tvalues array\n");
+                  return(Z_ERR);
+                }
+
+                for(i=0; i<3; ++i) {
+                  err = USERD_get_block_vector_values_by_component(pn,
+                                                                   vn,
+                                                                   i,
+                                                                   tvalues);
+                  if(err == Z_ERR) {
+                    fprintf(stderr,"Error: getting vector values\n");
+                    return(Z_ERR);
+                  }
+                  for(j=0; j<nsize; ++j) {
+                    k = j*3 + i;
+                    values[k] = tvalues[j];
+                  }
+                }
+                free(tvalues);
+              }
+
+              /* For the component, show 1st node, last node, min, max values
+               *-------------------------------------------------------------*/
+              minv[0] = maxv[0] = values[0];
+              minv[1] = maxv[1] = values[1];
+              minv[2] = maxv[2] = values[2];
+              for(i=0; i<nsize; ++i) {
+                j = i*3;
+                for(k=0; k<3; ++k) {
+                  if(values[j+k] < minv[k]) {
+                    minv[k] = values[j+k];
+                  }
+                  if(values[j+k] > maxv[k]) {
+                    maxv[k] = values[j+k];
+                  }
+                }
+              }
+              
+              fprintf(stderr,"       node %10d values: %g %g %g\n",1,
+                      values[0],values[1],values[2]);
+              fprintf(stderr,"       node %10d values: %g %g %g\n",nsize,
+                      values[3*nsize-3],values[3*nsize-2],values[3*nsize-1]);
+              fprintf(stderr,"       min values:             %g %g %g\n",
+                      minv[0],minv[1],minv[2]);
+              fprintf(stderr,"       max values:             %g %g %g\n",
+                      maxv[0],maxv[1],maxv[2]);
+
+            }
+            free(values);
+          }
+        }
+      }
+
+      /* Per_Elem
+       *---------*/
+      else {
+        for(p=0; p<Num_parts; ++p) {
+          pn = p + 1;
+
+          if(Pbuild[p].type != Z_UNSTRUCTURED) {
+
+            for(comp=0; comp<3; ++comp) {
+              if(Pbuild[p].ne[comp] < 1) {
+                bdim[comp] = 1;
+              }
+              else {
+                bdim[comp] = Pbuild[p].ne[comp];
+              }
+            }
+            bd1 = bdim[0]-1;
+            if(bd1 < 1) {
+              bd1 = 1;
+            }
+            bd2 = bdim[1]-1;
+            if(bd2 < 1) {
+              bd2 = 1;
+            }
+            bd3 = bdim[2]-1;
+            if(bd3 < 1) {
+              bd3 = 1;
+            }
+            nsize = bd1 * bd2 * bd3;
+
+
+            /* Determine cell type
+             *--------------------*/
+            num_dims = 3;
+            for(i=0; i<3; ++i) {
+              if(bdim[i] == 1) {
+                --num_dims;
+              }
+            }
+            if(num_dims == 3) {
+              cell_type = Z_HEX08;
+            }
+            else if(num_dims == 2) {
+              cell_type = Z_QUA04;
+            }
+            else {
+              cell_type = Z_BAR02;
+            }
+          }
+
+          if(Pbuild[p].type == Z_UNSTRUCTURED) {
+            e1 = 0;
+            e2 = Z_MAXTYPE-1;
+          }
+          else {
+            e1 = e2 = cell_type;
+          }
+
+          for(et=e1; et<=e2; ++et) {
+
+            if(Pbuild[p].type == Z_UNSTRUCTURED) {
+              nsize = Pbuild[p].ne[et];
+            }
+
+            if(nsize > 0) {
+
+              fprintf(stderr,"   For part %d, with %d elems of type %s:\n",
+                      pn,nsize,Elem_info[et].name);
+
+              values = (float *) calloc((num_comps * nsize),sizeof(float));
+              if(values == (float *) NULL) {
+                fprintf(stderr,"Error: alocating variable values\n");
+                return(Z_ERR);
+              }
+
+              if(num_comps == 1) {
+                if(Pbuild[p].type == Z_UNSTRUCTURED) {
+                  err = USERD_get_scalar_values(vn,
+                                                pn,
+                                                et,
+                                                values);
+                  if(err == Z_ERR) {
+                    fprintf(stderr,"Error: getting scalar values\n");
+                    return(Z_ERR);
+                  }
+                }
+                else {
+                  err = USERD_get_block_scalar_values(pn,
+                                                      vn,
+                                                      values);
+                  if(err == Z_ERR) {
+                    fprintf(stderr,"Error: getting block scalar values\n");
+                    return(Z_ERR);
+                  }
+                }
+
+                /* For the component, show 1st node, last node, min, max values
+                 *-------------------------------------------------------------*/
+                minv[0] = maxv[0] = values[0];
+                for(i=1; i<nsize; ++i) {
+                  if(values[i] < minv[0]) {
+                    minv[0] = values[i];
+                  }
+                  if(values[i] > maxv[0]) {
+                    maxv[0] = values[i];
+                  }
+                }
+                
+                fprintf(stderr,"       elem %10d value: %g\n",1,values[0]);
+                fprintf(stderr,"       elem %10d value: %g\n",nsize,values[nsize-1]);
+                fprintf(stderr,"       min value:             %g\n",minv[0]);
+                fprintf(stderr,"       max value:             %g\n",maxv[0]);
+                
+              }
+
+              else if(num_comps == 3) {
+
+                if(Pbuild[p].type == Z_UNSTRUCTURED) {
+                  err = USERD_get_vector_values(vn,
+                                                pn,
+                                                et,
+                                                values);
+                  if(err == Z_ERR) {
+                    fprintf(stderr,"Error: getting vector values\n");
+                    return(Z_ERR);
+                  }
+                }
+                else {
+                  
+                  tvalues = (float *) calloc(nsize,sizeof(float));
+                  if(tvalues == (float *) NULL) {
+                    fprintf(stderr,"Error: alocating tvalues array\n");
+                    return(Z_ERR);
+                  }
+                  
+                  for(i=0; i<3; ++i) {
+                    err = USERD_get_block_vector_values_by_component(pn,
+                                                                     vn,
+                                                                     i,
+                                                                     tvalues);
+                    if(err == Z_ERR) {
+                      fprintf(stderr,"Error: getting vector values\n");
+                      return(Z_ERR);
+                    }
+                    for(j=0; j<nsize; ++j) {
+                      k = j*3 + i;
+                      values[k] = tvalues[j];
+                    }
+                  }
+                  free(tvalues);
+                }
+
+                /* For the component, show 1st node, last node, min, max values
+                 *-------------------------------------------------------------*/
+                minv[0] = maxv[0] = values[0];
+                minv[1] = maxv[1] = values[1];
+                minv[2] = maxv[2] = values[2];
+                for(i=1; i<=nsize; ++i) {
+                  j = i*3;
+                  for(k=0; k<3; ++k) {
+                    if(values[j+k] < minv[k]) {
+                      minv[k] = values[j+k];
+                    }
+                    if(values[j+k] > maxv[k]) {
+                      maxv[k] = values[j+k];
+                    }
+                  }
+                }
+                
+                fprintf(stderr,"       elem %10d values: %g %g %g\n",1,
+                        values[0],values[1],values[2]);
+                fprintf(stderr,"       elem %10d values: %g %g %g\n",nsize,
+                        values[3*nsize-3],values[3*nsize-2],values[3*nsize-1]);
+                fprintf(stderr,"       min values:             %g %g %g\n",
+                        minv[0],minv[1],minv[2]);
+                fprintf(stderr,"       max values:             %g %g %g\n",
+                        maxv[0],maxv[1],maxv[2]);
+                
+              }
+              free(values);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return(Z_OK);
+}
+
+#endif
+
+
+#if (defined GT_USERD_API_202)
+
+
+/*---------------
+ * materials_info
+ *---------------*/
+static int
+materials_info( void )
+{
+  int i,j;
+  int err;
+  int   *num_materials;
+  int   *msids;
+  char **msname;
+  int   *mids;
+  char **mdesc;
+
+
+  fprintf(stderr,"\n------------ materials_info --------------\n");
+
+  /* Get the number of variables
+   *----------------------------*/
+  Num_materials_sets = USERD_get_number_of_material_sets();
+  if(Num_materials_sets < 0) {
+    fprintf(stderr,"Error: getting the number of material sets\n");
+    return(Z_ERR);
+  }
+  else {
+    if(Num_materials_sets == 0) {
+      fprintf(stderr," No materials sets in the model\n");
+      return (Z_OK);
+    }
+    else if(Num_materials_sets > 1) {
+      fprintf(stderr," Number of materials sets: %d\n",Num_materials_sets);
+      fprintf(stderr," Currently, EnSight 7.6 only supports 1 material set\n");
+      return(Z_ERR);
+    }
+    else {
+      fprintf(stderr," Number of materials sets: %d\n",Num_materials_sets);
+    }
+  }
+
+  /* Get the material set index list and names
+   *------------------------------------------*/
+  msids = (int *) calloc(Num_materials_sets,sizeof(int));
+  if(msids == (int *)NULL) {
+    fprintf(stderr," Problems allocating for material set ids\n");
+    return(Z_ERR);
+  }
+
+  num_materials = (int *) calloc(Num_materials_sets,sizeof(int));
+  if(num_materials == (int *)NULL) {
+    fprintf(stderr," Problems allocating for material set num materials\n");
+    return(Z_ERR);
+  }
+
+  msname = (char **) calloc(Num_materials_sets,sizeof(char *));
+  if(msname == (char **)NULL) {
+    fprintf(stderr," Problems allocating for material set names\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_materials_sets; ++i) {
+      msname[i] = (char *) calloc(Z_BUFL,sizeof(char));
+      if(msname[i] == (char *)NULL) {
+        fprintf(stderr," Problems allocating for material set names\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  err = USERD_get_matf_set_info(msids,msname);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Error: getting material set info\n");
+  }
+  else {
+    for(i=0; i<Num_materials_sets; ++i) {
+
+      /* Echo some feedback
+       *-------------------*/
+      fprintf(stderr," For Material set %d:\n",i+1);
+
+      fprintf(stderr,"   id:   %d\n",msids[i]);
+      fprintf(stderr,"   name: %s\n",msname[i]);
+
+      num_materials[i] = USERD_get_number_of_materials(i);
+      if(num_materials[i] < 0) {
+        fprintf(stderr,"Error: getting the number of materials in set %d\n",i);
+        return (Z_ERR);
+      }
+      else if(num_materials[i] == 0) {
+        fprintf(stderr," No materials in Materials set %d\n",i);
+        return (Z_OK);
+      }
+      else {
+        mids = (int *) calloc(num_materials[i],sizeof(int));
+        if(mids == (int *)NULL) {
+          fprintf(stderr," Problems allocating for material ids\n");
+          return(Z_ERR);
+        }
+        
+        mdesc = (char **) calloc(num_materials[i],sizeof(char *));
+        if(mdesc == (char **)NULL) {
+          fprintf(stderr," Problems allocating for material desc\n");
+          return(Z_ERR);
+        }
+        else {
+          for(j=0; j<num_materials[i]; ++j) {
+            mdesc[j] = (char *) calloc(Z_BUFL,sizeof(char));
+            if(mdesc[j] == (char *)NULL) {
+              fprintf(stderr," Problems allocating for material desc\n");
+              return(Z_ERR);
+            }
+          }
+        }
+
+        err = USERD_get_matf_var_info(i,mids,mdesc);
+        if(err == Z_ERR) {
+          fprintf(stderr,"Error: getting material info\n");
+        }
+        else {
+
+          for(j=0; j<num_materials[i]; ++j) {
+            /* Echo some feedback
+             *-------------------*/
+            fprintf(stderr,"   For Material %d:\n",j+1);
+            
+            fprintf(stderr,"     index:       %d\n",mids[j]);
+            fprintf(stderr,"     description: %s\n",mdesc[j]);
+          }
+        }
+      }
+    }
+  }
+
+  /* Free the allocated memory
+   *--------------------------*/
+  for(i=0; i<Num_materials_sets; ++i) {
+    free(msname[i]);
+
+    for(j=0; j<num_materials[i]; ++j) {
+      free(mdesc[j]);
+    }
+  }
+  free(msname);
+  free(msids);
+  free(num_materials);
+  free(mdesc);
+  free(mids);
+
+  return(Z_OK);
+}
+
+
+/*----------------------
+ * gold_materials_loader
+ *----------------------*/
+static int
+gold_materials_loader(int geom_time_step)
+{
+  int i, j, k, ms, nn;
+  int err, err1, err2;
+  int geom_timeset;
+  int p, pn;
+  int et, e1, e2;
+  int num_dims;
+  int comp;
+  int bdim[3];
+  int ne;
+  int cell_type;
+  int bd1,bd2,bd3;
+  int *ivals;
+  float *fvals;
+  int do_num;
+  int mixed_present;
+  int matf_size, matfv_size;
+
+
+  fprintf(stderr,"\n-------------- materials_loader --------------\n");
+
+  if(Num_time_sets > 0) {
+    /* Get the timeset used for the geometry
+     *--------------------------------------*/
+    geom_timeset = USERD_get_geom_timeset_number();
+    
+    /* Get the number of time steps for this timeset
+     *----------------------------------------------*/
+    Num_time_steps = USERD_get_num_of_time_steps(geom_timeset);
+    if(Num_time_steps < 1) {
+      fprintf(stderr," Error: Num time steps returned: %d\n",Num_time_steps);
+      fprintf(stderr," (Must be >0 to be okay)\n");
+      return(Z_ERR);
+    }
+    if(geom_time_step > (Num_time_steps - 1)) {
+      geom_time_step = Num_time_steps - 1;
+    }
+
+    /* Set the timeset and step - to first step by default, but
+     * can set it at others using -gts command argument
+     *---------------------------------------------------------*/
+    USERD_set_time_set_and_step(geom_timeset,geom_time_step);
+    
+    fprintf(stderr," Using timeset:   %d  (step range is %d through %d)\n",
+            geom_timeset,0,Num_time_steps-1);
+    fprintf(stderr," Using time step: %d\n",geom_time_step);
+  }
+
+  for(ms=0; ms<Num_materials_sets; ++ms) {
+    fprintf(stderr,"\n");
+    fprintf(stderr," Materials Set %d:\n",ms+1);
+
+    for(p=0; p<Num_parts; ++p) {
+      pn = p+1;
+
+      fprintf(stderr,"\n");
+      fprintf(stderr,"   Part %d:\n",pn);
+
+      /*-----------------------
+       * For unstructured parts
+       *-----------------------*/
+      if(Pbuild[p].type == Z_UNSTRUCTURED) {
+
+        e1 = 0;
+        e2 = Z_MAXTYPE;
+      }
+      else {
+        for(comp=0; comp<3; ++comp) {
+          if(Pbuild[p].ne[comp] < 1) {
+            bdim[comp] = 1;
+          }
+          else {
+            bdim[comp] = Pbuild[p].ne[comp];
+          }
+        }
+        nn = bdim[0] * bdim[1] * bdim[2];
+        
+        bd1 = bdim[0]-1;
+        if(bd1 < 1) {
+          bd1 = 1;
+        }
+        bd2 = bdim[1]-1;
+        if(bd2 < 1) {
+          bd2 = 1;
+        }
+        bd3 = bdim[2]-1;
+        if(bd3 < 1) {
+          bd3 = 1;
+        }
+        ne = bd1 * bd2 * bd3;
+        
+        /* Determine cell type
+         *--------------------*/
+        num_dims = 3;
+        for(i=0; i<3; ++i) {
+          if(bdim[i] == 1) {
+            --num_dims;
+          }
+        }
+        if(num_dims == 3) {
+          cell_type = Z_HEX08;
+        }
+        else if(num_dims == 2) {
+          cell_type = Z_QUA04;
+        }
+        else {
+          cell_type = Z_BAR02;
+        }
+
+        e1 = cell_type;
+        e2 = cell_type + 1;
+      }
+
+
+      for(et=e1; et<e2; ++et) {
+
+        if(Pbuild[p].type == Z_UNSTRUCTURED) {
+          ne = Pbuild[p].ne[et];
+        }
+
+        if(ne > 0) {
+
+          /* Get the material ids, if any
+           *-----------------------------*/
+          err = USERD_size_matf_data(ms,
+                                     pn,
+                                     et,
+                                     Z_MAT_INDEX,
+                                     &matf_size);
+          if(err == Z_OK && matf_size > 0) {
+
+              
+            /* Go get the material ids
+             *------------------------*/
+            ivals = (int *) calloc(matf_size,sizeof(int));
+            if(ivals == (int *)NULL) {
+              fprintf(stderr," Problems allocating for material ids\n");
+              return(Z_ERR);
+            }
+            err = USERD_load_matf_data(ms,
+                                       pn,
+                                       et,
+                                       Z_MAT_INDEX,
+                                       ivals,
+                                       fvals);
+            if(err == Z_OK) {
+              if(matf_size < 20) {
+                fprintf(stderr,"     Printing all mat ids for %s elements\n",
+                        Elem_info[et].name);
+                do_num = matf_size;
+              }
+              else {
+                fprintf(stderr,"     Printing first 20 mat ids for %s elements\n",
+                        Elem_info[et].name);
+                do_num = 20;
+              }
+
+              /* See if any mixed materials
+               *---------------------------*/
+              mixed_present = FALSE;
+              for(k=0; k<matf_size; ++k) {
+                if(ivals[k] < 0) {
+                  mixed_present = TRUE;
+                  break;
+                }
+              }
+
+              /* Feedback
+               *---------*/
+              for(k=0; k<do_num; ++k) {
+                fprintf(stderr,"       mat id[%d] = %d\n",k,ivals[k]);
+              }
+              free(ivals);
+            }
+            else {
+              fprintf(stderr,"     Trouble getting mat ids for %s elements\n",
+                      Elem_info[et].name);
+              free(ivals);
+              return(Z_ERR);
+            }
+          }
+          else {
+            fprintf(stderr,"     %s elements have no material ids\n",
+                    Elem_info[et].name);
+          }
+
+
+          /* Get the mixed material ids, if any
+           *-----------------------------------*/
+          if(mixed_present) {
+            err1 = USERD_size_matf_data(ms,
+                                        pn,
+                                        et,
+                                        Z_MIX_INDEX,
+                                        &matf_size);
+            err2 = USERD_size_matf_data(ms,
+                                        pn,
+                                        et,
+                                        Z_MIX_VALUE,
+                                        &matfv_size);
+            
+            if(err1 == Z_OK &&
+               err2 == Z_OK &&
+               matf_size > 0 &&
+               matfv_size > 0) {
+                
+              /* Go get the material ids
+               *------------------------*/
+              ivals = (int *) calloc(matf_size,sizeof(int));
+              if(ivals == (int *)NULL) {
+                fprintf(stderr," Problems allocating for mixed material ids\n");
+                return(Z_ERR);
+              }
+              fvals = (float *) calloc(matfv_size,sizeof(float));
+              if(fvals == (float *)NULL) {
+                fprintf(stderr," Problems allocating for mixed material values\n");
+                return(Z_ERR);
+              }
+              
+              err1 = USERD_load_matf_data(ms,
+                                          pn,
+                                          et,
+                                          Z_MIX_INDEX,
+                                          ivals,
+                                          fvals);
+              
+              err2 = USERD_load_matf_data(ms,
+                                          pn,
+                                          et,
+                                          Z_MIX_VALUE,
+                                          ivals,
+                                          fvals);
+              if(err1 == Z_OK &&
+                 err2 == Z_OK) {
+                if(matf_size < 20) {
+                  fprintf(stderr,"     Printing all mixed mat ids for %s elements\n",
+                          Elem_info[et].name);
+                  do_num = matf_size;
+                }
+                else {
+                  fprintf(stderr,"     Printing first 20 mixed mat ids for %s elements\n",
+                          Elem_info[et].name);
+                  do_num = 20;
+                }
+                for(k=0; k<do_num; ++k) {
+                  fprintf(stderr,"       mixed mat id[%d] = %d\n",k,ivals[k]);
+                }
+                free(ivals);
+                
+                if(matfv_size < 20) {
+                  fprintf(stderr,"     Printing all mixed mat values for %s elements\n",
+                          Elem_info[et].name);
+                  do_num = matfv_size;
+                }
+                else {
+                  fprintf(stderr,"     Printing first 20 mixed mat values for %s elements\n",
+                          Elem_info[et].name);
+                  do_num = 20;
+                }
+                for(k=0; k<do_num; ++k) {
+                  fprintf(stderr,"       mixed mat val[%d] = %f\n",k,fvals[k]);
+                }
+                free(fvals);
+              }
+              else {
+                fprintf(stderr,"     Trouble getting mixed mat ids or vals for %s elements\n",
+                        Elem_info[et].name);
+                free(ivals);
+                free(fvals);
+                return(Z_ERR);
+              }
+            }
+            else {
+              fprintf(stderr,"     Trouble getting mixed mat sizes for %s elements\n",
+                      Elem_info[et].name);
+              return(Z_ERR);
+            }
+          }
+          else {
+            fprintf(stderr,"       (%s elements have no mixed material ids)\n",
+                    Elem_info[et].name);
+          }
+        }
+      }
+    }
+  }
+  return(Z_OK);
+}
+
+#endif
+
+/*--------------
+ * entity_querys
+ *--------------*/
+static int
+entity_querys(int var_time_step)
+{
+  int i, j;
+  int err;
+  int v, vn;
+  int var_timeset;
+  int p, pn;
+  int et, e1, e2;
+  int num_comps;
+  int num_dims;
+  int nsize;
+  int comp;
+  int bdim[3];
+  int ne;
+  int cell_type;
+  char line1[Z_BUFL];
+  char line2[Z_BUFL];
+  float qvals[3];
+  int bd1,bd2,bd3;
+
+
+  fprintf(stderr,"\n-------------- entity_querys ------------\n");
+  fprintf(stderr,"       (scalar & vector variables only)    \n");
+  fprintf(stderr,"\n");
+
+#if (defined USERD_API_100)
+
+  if(Num_time_steps > 1) {
+    /* Get the number of time steps for this timeset
+     *----------------------------------------------*/
+    if(var_time_step > (Num_time_steps - 1)) {
+      var_time_step = Num_time_steps - 1;
+    }
+        
+    /* Set the time step - to first step by default, but
+     * can set it at others using -vts command argument
+     *---------------------------------------------------------*/
+    USERD_set_time_step(var_time_step);
+    
+    fprintf(stderr," Using time step: %d  (where range is %d through %d)\n\n",
+            var_time_step,0,Num_time_steps-1);
+  }
+#endif
+
+  for(v=0; v<Num_vars; ++v) {
+    vn = v + 1;
+
+    /* Scalar or vectors only
+     *-----------------------*/
+    if(Varinfo[v].type == Z_SCALAR || Varinfo[v].type == Z_VECTOR) {
+
+
+      if(Varinfo[v].classify == Z_PER_NODE) {
+        fprintf(stderr," Z_PER_NODE Variable %d:\n",vn);
+      }
+      else {
+        fprintf(stderr," Z_PER_ELEM Variable %d:\n",vn);
+      }
+
+#if (defined GT_USERD_API_100)
+
+      if(Num_time_sets > 0) {
+        /* Get the timeset used for the variable
+         *---------------------------------------*/
+        var_timeset = Varinfo[v].timeset;
+        
+        /* Get the number of time steps for this timeset
+         *----------------------------------------------*/
+        Num_time_steps = USERD_get_num_of_time_steps(var_timeset);
+        if(Num_time_steps < 1) {
+          fprintf(stderr," Error: Number of time steps returned: %d\n",
+                  Num_time_steps);
+          fprintf(stderr," (Must be >0 to be okay)\n");
+          return(Z_ERR);
+        }
+        if(var_time_step > (Num_time_steps - 1)) {
+          var_time_step = Num_time_steps - 1;
+        }
+
+        /* Set the timeset and step - to first step by default, but
+         * can set it at others using -vts command argument
+         *---------------------------------------------------------*/
+        USERD_set_time_set_and_step(var_timeset,var_time_step);
+        
+        fprintf(stderr,"   Using timeset:   %d  (step range is %d through %d)\n",
+                var_timeset,0,Num_time_steps-1);
+        fprintf(stderr,"   Using time step: %d\n",var_time_step);
+      }
+#endif
+
+      
+      /* Get the var description line
+       *-----------------------------*/
+#if (defined GT_USERD_API_100)
+      err = USERD_get_descrip_lines(Z_VARI,vn,FALSE,line1,line2);
+      if(err == Z_OK) {
+        fprintf(stderr,"   Desc line: %s\n",line1);
+      }
+      else {
+        fprintf(stderr,"Error: getting var description line\n");
+        return(Z_ERR);
+      }
+
+      if(Varinfo[v].complex) {
+        err = USERD_get_descrip_lines(Z_VARI,vn,TRUE,line1,line2);
+        if(err == Z_OK) {
+          fprintf(stderr,"   Desc line (imag): %s\n",line1);
+        }
+        else {
+          fprintf(stderr,"Error: getting var description line (imag)\n");
+          return(Z_ERR);
+        }
+      }
+#else
+
+      err = USERD_get_description_lines(Z_VARI,vn,line1,line2);
+      if(err == Z_OK) {
+        fprintf(stderr,"   Desc line: %s\n",line1);
+      }
+      else {
+        fprintf(stderr,"Error: getting var description line\n");
+        return(Z_ERR);
+      }
+
+#endif
+
+      /* Get the values by component
+       *-----------------------------*/
+      if(Varinfo[v].type == Z_SCALAR) {
+        num_comps = 1;
+      }
+      else if(Varinfo[v].type == Z_VECTOR) {
+        num_comps = 3;
+      }
+
+      /* Per_Node
+       *---------*/
+      if(Varinfo[v].classify == Z_PER_NODE) {
+
+        for(p=0; p<Num_parts; ++p) {
+          pn = p + 1;
+
+          if(Pbuild[p].type == Z_UNSTRUCTURED) {
+            nsize = Pbuild[p].nn;
+          }
+          else {
+            for(comp=0; comp<3; ++comp) {
+              if(Pbuild[p].ne[comp] < 1) {
+                bdim[comp] = 1;
+              }
+              else {
+                bdim[comp] = Pbuild[p].ne[comp];
+              }
+            }
+            nsize = bdim[0] * bdim[1] * bdim[2];
+          }
+
+
+
+          if(nsize > 0) {
+
+            fprintf(stderr,"   For part %d, using node %d:\n",pn,nsize);
+
+#if (defined GT_USERD_API_100)
+            err = USERD_get_var_value_at_specific(vn,
+                                                  nsize,
+                                                  pn,
+                                                  0,
+                                                  var_time_step,
+                                                  qvals,
+                                                  FALSE);
+#else
+            err = USERD_get_variable_value_at_specific(vn,
+                                                       nsize,
+                                                       pn,
+                                                       0,
+                                                       var_time_step,
+                                                       qvals);
+#endif
+            if(err == Z_NOT_IMPLEMENTED) {
+              fprintf(stderr,"  Node and element queries not implemented\n");
+              return(Z_OK);
+            }
+            else if(err == Z_ERR) {
+              fprintf(stderr,"     Could not get value\n");
+            }
+            else {
+
+              /* For the component, show 1st node, last node, min, max values
+               *-------------------------------------------------------------*/
+              if(Varinfo[v].type == Z_SCALAR) {
+                fprintf(stderr,"     Scalar value is: %g\n",qvals[0]);
+              }
+              else {
+                fprintf(stderr,"     Vector values are: %g %g %g\n",
+                        qvals[0],qvals[1],qvals[2]);
+              }
+
+#if (defined GT_USERD_API_100)
+              if(Varinfo[v].complex) {
+
+                err = USERD_get_var_value_at_specific(vn,
+                                                      nsize,
+                                                      pn,
+                                                      0,
+                                                      var_time_step,
+                                                      qvals,
+                                                      TRUE);
+
+                if(err == Z_ERR) {
+                  fprintf(stderr,"     Could not get imag value\n");
+                }
+                else {
+
+                  /* For the component, show 1st node, last node, min, max values
+                   *-------------------------------------------------------------*/
+                  if(Varinfo[v].type == Z_SCALAR) {
+                    fprintf(stderr,"     Scalar value (imag) is: %g\n",qvals[0]);
+                  }
+                  else {
+                    fprintf(stderr,"     Vector values (imag) are: %g %g %g\n",
+                            qvals[0],qvals[1],qvals[2]);
+                  }
+                }
+              }
+#endif
+
+            }
+          }
+        }
+      }
+
+      /* Per_Elem
+       *---------*/
+      else {
+        for(p=0; p<Num_parts; ++p) {
+          pn = p + 1;
+
+          if(Pbuild[p].type != Z_UNSTRUCTURED) {
+
+            for(comp=0; comp<3; ++comp) {
+              if(Pbuild[p].ne[comp] < 1) {
+                bdim[comp] = 1;
+              }
+              else {
+                bdim[comp] = Pbuild[p].ne[comp];
+              }
+            }
+            bd1 = bdim[0]-1;
+            if(bd1 < 1) {
+              bd1 = 1;
+            }
+            bd2 = bdim[1]-1;
+            if(bd2 < 1) {
+              bd2 = 1;
+            }
+            bd3 = bdim[2]-1;
+            if(bd3 < 1) {
+              bd3 = 1;
+            }
+            nsize = bd1 * bd2 * bd3;
+
+
+            /* Determine cell type
+             *--------------------*/
+            num_dims = 3;
+            for(i=0; i<3; ++i) {
+              if(bdim[i] == 1) {
+                --num_dims;
+              }
+            }
+            if(num_dims == 3) {
+              cell_type = Z_HEX08;
+            }
+            else if(num_dims == 2) {
+              cell_type = Z_QUA04;
+            }
+            else {
+              cell_type = Z_BAR02;
+            }
+          }
+
+          if(Pbuild[p].type == Z_UNSTRUCTURED) {
+            e1 = 0;
+            e2 = Z_MAXTYPE-1;
+          }
+          else {
+            e1 = e2 = cell_type;
+          }
+
+          for(et=e1; et<=e2; ++et) {
+
+            if(Pbuild[p].type == Z_UNSTRUCTURED) {
+              nsize = Pbuild[p].ne[et];
+            }
+
+            if(nsize > 0) {
+
+
+              fprintf(stderr,"   For part %d, using elem %d of type %s:\n",
+                      pn,nsize,Elem_info[et].name);
+
+
+#if (defined GT_USERD_API_100)
+              err = USERD_get_var_value_at_specific(vn,
+                                                    nsize,
+                                                    pn,
+                                                    et,
+                                                    var_time_step,
+                                                    qvals,
+                                                    FALSE);
+#else
+            err = USERD_get_variable_value_at_specific(vn,
+                                                       nsize,
+                                                       pn,
+                                                       et,
+                                                       var_time_step,
+                                                       qvals);
+#endif
+
+              if(err == Z_NOT_IMPLEMENTED) {
+                fprintf(stderr,"  Node and element queries not implemented\n");
+                return(Z_OK);
+              }
+              else if(err == Z_ERR) {
+                fprintf(stderr,"     Could not get value\n");
+              }
+              else {
+                if(Varinfo[v].type == Z_SCALAR) {
+                  fprintf(stderr,"     Scalar value is: %g\n",qvals[0]);
+                }
+                else {
+                  fprintf(stderr,"     Vector values are: %g %g %g\n",
+                          qvals[0],qvals[1],qvals[2]);
+                }
+                
+#if (defined GT_USERD_API_100)
+                if(Varinfo[v].complex) {
+
+                  err = USERD_get_var_value_at_specific(vn,
+                                                        nsize,
+                                                        pn,
+                                                        et,
+                                                        var_time_step,
+                                                        qvals,
+                                                        TRUE);
+                  if(err == Z_ERR) {
+                    fprintf(stderr,"     Could not get imag value\n");
+                  }
+                  else {
+                    if(Varinfo[v].type == Z_SCALAR) {
+                      fprintf(stderr,"     Scalar value (imag) is: %g\n",qvals[0]);
+                    }
+                    else {
+                      fprintf(stderr,"     Vector values (imag) are: %g %g %g\n",
+                              qvals[0],qvals[1],qvals[2]);
+                    }
+                  }                  
+                }
+#endif
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return(Z_OK);
+}
+
+
+/*--------------
+ * exercise_bkup
+ *--------------*/
+static int
+exercise_bkup( void )
+{
+  int err;
+  FILE *arcfile;
+
+  fprintf(stderr,"\n------------ exercise_archive -----------\n");
+
+  arcfile = fopen("test.arc","wb");
+  if(arcfile == (FILE *)NULL) {
+    fprintf(stderr,"Error: opening test archive file\n");
+    return(Z_ERR);
+  }
+  err = USERD_bkup(arcfile,Z_SAVE_ARCHIVE);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Error: saving to test archive file\n");
+    return(Z_ERR);
+  }
+  fclose(arcfile);
+
+  arcfile = fopen("test.arc","rb");
+  err = USERD_bkup(arcfile,Z_REST_ARCHIVE);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Error: restoring from test archive file\n");
+    return(Z_ERR);
+  }
+
+  fprintf(stderr," Archive test completed\n");
+
+  fclose(arcfile);
+  
+  return(Z_OK);
+}
+
+/* -------------------------------------------------------
+ *  threshold_operator1 & 2 can be one of the following
+ *    Z_ELE_FAILED_NONE,           - disables checking
+ *     Z_ELE_FAILED_GREATER,        - greater than
+ *     Z_ELE_FAILED_LESS,           - less than
+ *     Z_ELE_FAILED_EQUAL,          - equal
+ *     Z_ELE_FAILED_NOT_EQUAL,      - not equal
+ *     Z_ELE_FAILED_MANY            - not used
+ *
+ * logic_criteria2
+ *      Z_ELE_FAILED_LOGIC_NONE,
+ *      Z_ELE_FAILED_LOGIC_AND,
+ *      Z_ELE_FAILED_LOGIC_OR,
+ *      Z_ELE_FAILED_LOGIC_MANY
+ *
+ * ------------------------------------------------------ */
+int load_fail_defaults(void) 
+{
+  int check_for_failed = FALSE; 
+  int cri1 = 0;                 /* Criteria1 ELE_FAILED_GREATER, etc */
+  int cri2 = 0;       
+  int  logic_cri2 = 0;        /* Logic for criteria 2  ELE_FAILED_LOGIC_NONE, AND, etc */
+  float val1 = 0.0;           /* failure threshold 1 */
+  float  val2= 0.0;           /* failure threshold 2 */
+  char failed_var_name[Z_MXVARIABLEDESC]={EOS};
+  
+  check_for_failed =  USERD_get_uns_failed_params( failed_var_name, 
+						   &val1, &val2, &cri1, &cri2,
+						   &logic_cri2 );
+  if (check_for_failed == TRUE) {
+    fprintf(stderr,"Failed element criteria info \n");
+    fprintf(stderr,"Variable name = %s\n",failed_var_name);
+    fprintf(stderr,"Criteria 1 = %d\n",cri1);
+    fprintf(stderr,"Criteria 2 = %d\n",cri1);
+    fprintf(stderr,"Logic criteria = %d\n",logic_cri2);
+    fprintf(stderr,"Value 1 = %f\n",val1);
+    fprintf(stderr,"Value 2 = %f\n",val2);
+  } else {
+    fprintf(stderr,"No Failed elements\n");
+  }
+  return(Z_OK);
+}  
+
+
+/* End of File */
diff --git a/applications/test/ensightFoamReader/udr_checker-82.c b/applications/test/ensightFoamReader/udr_checker-82.c
new file mode 100644
index 0000000000..8e0c572db6
--- /dev/null
+++ b/applications/test/ensightFoamReader/udr_checker-82.c
@@ -0,0 +1,5884 @@
+/*----------------------------------
+ *     User Defined Reader - checker
+ *----------------------------------*/
+
+/********************************************************************
+ *
+ *      ****************************************
+ *       Copyright 2004 Computational Engineering International, Inc.
+ *       All Rights Reserved.
+ *
+ *              Restricted Rights Legend
+ *
+ *       Use, duplication, or disclosure of this
+ *       software and its documentation by the
+ *       Government is subject to restrictions as
+ *       set forth in subdivision [(b)(3)(ii)] of
+ *       the Rights in Technical Data and Computer
+ *       Software clause at 52.227-7013.
+ *******************************************************************/
+
+/*----------------------------------------------------------------------
+ * MAJOR ROUTINES ACCESS:     (VERSION 2.00)    Gold_Userd   API
+ *
+ *        Get the name of the reader
+ *        ==========================
+ *        USERD_get_name_of_reader
+ *        USERD_get_extra_gui_numbers    (optional)
+ *        USERD_get_extra_gui_defaults   (optional)
+ *
+ *        Get the reader version
+ *        ======================
+ *        USERD_get_reader_version
+ *
+ *        Set the filenames, gather timeset and time info
+ *        ===============================================
+ *        USERD_set_extra_gui_data       (optional)
+ *        USERD_set_server_number
+ *        USERD_set_filenames
+ *        USERD_get_number_of_timesets
+ *        USERD_get_geom_timeset_number
+ *
+ *        for each timeset:
+ *          USERD_get_timeset_description
+ *          USERD_get_num_of_time_steps
+ *          USERD_get_sol_times
+ *
+ *        USERD_set_time_set_and_step
+ *
+ *
+ *        Gather variable and time info
+ *        =============================
+ *        USERD_get_number_of_variables
+ *        USERD_get_gold_variable_info
+ *
+ *
+ *        Get initial part building info
+ *        ==============================
+ *        USERD_set_time_set_and_step
+ *        USERD_get_changing_geometry_status
+ *        USERD_get_node_label_status
+ *        USERD_get_element_label_status
+ *        USERD_get_number_of_files_in_dataset
+ *        USERD_get_dataset_query_file_info
+ *        USERD_get_descrip_lines                 (geometry)
+ *        USERD_get_number_of_model_parts
+ *        USERD_get_gold_part_build_info
+ *        USERD_get_ghosts_in_model_flag
+ *        USERD_get_maxsize_info
+ *        USERD_get_ghosts_in_block_flag          (if any ghost cells in model)
+ *        USERD_get_model_extents    **OR**
+ *             USERD_get_part_coords  **AND/OR**
+ *             USERD_get_block_coords_by_component
+ *
+ *
+ *
+ *         Part Builder
+ *         ============                                                 
+ *
+ *         both unstructured and structured
+ *         --------------------------------
+ *         USERD_set_time_set_and_step
+ *
+ *         if unstructured
+ *         ---------------
+ *         USERD_get_part_element_ids_by_type
+ *         USERD_get_part_elements_by_type
+ *
+ *         if any nsided elements:
+ *           USERD_get_nsided_conn
+ *
+ *         if any nfaced elements:
+ *           USERD_get_nfaced_nodes_per_face
+ *           USERD_get_nfaced_conn
+ *
+ *         USERD_get_part_coords
+ *         USERD_get_part_node_ids
+ *
+ *         else if structured
+ *         ------------------
+ *         USERD_get_block_iblanking
+ *         USERD_get_block_coords_by_component
+ *         USERD_get_block_ghost_flags
+ *         USERD_get_part_node_ids              (If node ids given)
+ *         USERD_get_part_element_ids_by_type   (If element ids given)
+ *
+ *         both again 
+ *         ----------
+ *         USERD_get_border_availability        (If border representation
+ *         USERD_get_border_elements_by_type     is selected)
+ *
+ *         USERD_stop_part_building
+ *
+ *
+ *         Changing geometry
+ *         =================
+ *
+ *         changing coords only
+ *         --------------------
+ *         USERD_set_time_set_and_step
+ *         USERD_get_descrip_lines
+ *         USERD_get_part_coords
+ *         USERD_get_block_coords_by_component
+ *
+ *         changing connectivity
+ *         ---------------------
+ *         USERD_set_time_set_and_step
+ *         USERD_get_descrip_lines
+ *         USERD_get_number_of_model_parts
+ *         USERD_get_gold_part_build_info
+ *         USERD_get_ghosts_in_model_flag
+ *         USERD_get_ghosts_in_block_flag       (If any ghost cells in model)
+ *         USERD_get_model_extents     **OR**
+ *             USERD_get_part_coords  **AND/OR**
+ *             USERD_get_block_coords_by_component
+ *         USERD_get_part_element_ids_by_type
+ *         USERD_get_part_elements_by_type
+ *         USERD_get_part_coords
+ *         USERD_get_part_node_ids
+ *         USERD_get_block_iblanking
+ *         USERD_get_block_coords_by_component
+ *         USERD_get_block_ghost_flags          (If ghost cells in part)
+ *         USERD_get_part_node_ids              (If node ids given)
+ *         USERD_get_part_element_ids_by_type   (If element ids given)
+ *
+ *         USERD_get_border_availability        (If border representation
+ *         USERD_get_border_elements_by_type     is selected) 
+ *
+ *
+ *         Loading Variables
+ *         ==================
+ *
+ *         constants
+ *         ---------
+ *         USERD_set_time_set_and_step
+ *         USERD_get_constant_val
+ *
+ *         scalars/vectors/tensors
+ *         -----------------------
+ *         USERD_get_description_lines
+ *         USERD_set_time_set_and_step
+ *         USERD_get_var_by_component
+ *
+ *
+ *         Node or Element queries over time
+ *         =================================
+ *         USERD_get_var_value_at_specific
+ *
+ *
+ *  At 2.03, added:
+ *  ---------------
+ *
+ *         Materials
+ *         =========
+ *         USERD_get_number_of_material_sets
+ *         USERD_get_matf_set_info
+ *
+ *         If any material sets in the model (calls once per material set)
+ *           USERD_get_number_of_materials
+ *           USERD_get_matf_var_info
+ *
+ *         For each element type of each part containing material ids
+ *           USERD_size_matf_data
+ *           USERD_load_matf_data
+ *
+ *
+ *  At 2.04, added:
+ *  ---------------
+ *          USERD_get_uns_failed_params  - Sets params used in element failure
+ *
+ *
+ *----------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------
+ * MAJOR ROUTINES ACCESS:       (Version 1.00)  original API
+ *
+ *        Get the name of the reader
+ *        ==========================
+ *        USERD_get_name_of_reader
+ *        USERD_get_extra_gui_numbers     (optional    -extra_gui on command line)
+ *        USERD_get_extra_gui_defaults    (optional    -extra_gui on command line)
+ *
+ *        Set the filenames
+ *        =================
+ *        USERD_set_extra_gui_data        (optional    -extra_gui on command line)  
+ *        USERD_set_filenames
+ *        USERD_get_number_of_time_steps
+ *        USERD_get_solution_times
+ *        USERD_set_time_step
+ *
+ *
+ *        Gather variable and time info
+ *        =============================
+ *        USERD_get_number_of_variables
+ *        USERD_get_variable_info
+ *
+ *
+ *        Get initial part building info
+ *        ==============================
+ *        USERD_set_time_step
+ *        USERD_get_changing_geometry_status
+ *        USERD_get_node_label_status
+ *        USERD_get_element_label_status
+ *        USERD_get_number_of_files_in_dataset
+ *        USERD_get_dataset_query_file_info
+ *        USERD_get_description_lines                     (geometry)
+ *        USERD_get_number_of_model_parts
+ *        USERD_get_part_build_info
+ *        USERD_get_number_global_nodes
+ *        USERD_get_global_coords
+ *        USERD_get_block_coords_by_component
+ *
+ *        Failure Info
+ *        ============
+ *        USERD_get_uns_failed_params
+ *
+ *
+ *        Part Builder
+ *        ============
+ *        USERD_set_time_step
+ *        USERD_get_global_coords
+ *        USERD_get_global_node_ids
+ *        USERD_get_element_connectivities_for_part
+ *        USERD_get_element_ids_for_part
+ *        USERD_get_block_iblanking
+ *        USERD_get_block_coords_by_component
+ *
+ *        USERD_stop_part_building
+ *
+ *
+ *        Changing geometry
+ *        =================
+ *
+ *        changing coords only
+ *        --------------------
+ *        USERD_set_time_step
+ *        USERD_get_global_coords
+ *        USERD_get_block_coords_by_component
+ *
+ *        changing connectivity
+ *        ---------------------
+ *        USERD_set_time_step
+ *        USERD_get_number_of_model_parts
+ *        USERD_get_part_build_info
+ *        USERD_get_number_global_nodes
+ *        USERD_get_global_coords
+ *        USERD_get_global_node_ids
+ *        USERD_get_element_connectivities_for_part
+ *        USERD_get_element_ids_for_part
+ *        USERD_get_block_iblanking
+ *        USERD_get_block_coords_by_component
+ *
+ *        Loading Variables
+ *        =================
+ *
+ *        constants:
+ *        ----------
+ *        USERD_set_time_step
+ *        USERD_get_constant_value
+ *
+ *        scalars:
+ *        --------
+ *        USERD_get_description_lines
+ *        USERD_set_time_step
+ *        USERD_get_scalar_values
+ *        USERD_get_block_scalar_values
+ *
+ *        vectors:
+ *        --------
+ *        USERD_get_description_lines
+ *        USERD_set_time_step
+ *        USERD_get_vector_values
+ *        USERD_get_block_vector_values_by_component
+ *
+ *
+ *        Node or Element queries over time
+ *        =================================
+ *        USERD_get_variable_value_at_specific
+ *
+ *----------------------------------------------------------------------*/
+#include <stdio.h>
+#include <stdlib.h>
+#ifndef WIN32
+#include <unistd.h>
+#endif
+#include <string.h>
+#include <ctype.h>
+#include <sys/types.h>
+#ifndef CONVEX
+#include <malloc.h>
+#endif
+#include <math.h>
+
+#include "global_extern.h"
+
+/* -----------------------------------------------
+ *  If you wish to test out various optional routines
+ *  you must uncomment the proper #define below
+ *
+ *  #define _EGS  is for extra_gui routines
+ *  #define _VES  is for var_extract_gui routines
+ *---------------------------------------------------*/
+/* #define _EGS */
+/* #define _VES */
+
+
+#if (defined USERD_API_209)
+#define GT_USERD_API_100
+#define GT_USERD_API_200
+#define GT_USERD_API_201
+#define GT_USERD_API_202
+#define GT_USERD_API_203
+#define GT_USERD_API_204
+#define GT_USERD_API_205
+#define GT_USERD_API_206
+#define GT_USERD_API_207
+#define GT_USERD_API_208
+
+#elif (defined USERD_API_208)
+#define GT_USERD_API_100
+#define GT_USERD_API_200
+#define GT_USERD_API_201
+#define GT_USERD_API_202
+#define GT_USERD_API_203
+#define GT_USERD_API_204
+#define GT_USERD_API_205
+#define GT_USERD_API_206
+#define GT_USERD_API_207
+
+#elif (defined USERD_API_207)
+#define GT_USERD_API_100
+#define GT_USERD_API_200
+#define GT_USERD_API_201
+#define GT_USERD_API_202
+#define GT_USERD_API_203
+#define GT_USERD_API_204
+#define GT_USERD_API_205
+#define GT_USERD_API_206
+
+#elif (defined USERD_API_206)
+#define GT_USERD_API_100
+#define GT_USERD_API_200
+#define GT_USERD_API_201
+#define GT_USERD_API_202
+#define GT_USERD_API_203
+#define GT_USERD_API_204
+#define GT_USERD_API_205
+
+#elif (defined USERD_API_205)
+#define GT_USERD_API_100
+#define GT_USERD_API_200
+#define GT_USERD_API_201
+#define GT_USERD_API_202
+#define GT_USERD_API_203
+#define GT_USERD_API_204
+
+#elif (defined USERD_API_204)
+#define GT_USERD_API_100
+#define GT_USERD_API_200
+#define GT_USERD_API_201
+#define GT_USERD_API_202
+#define GT_USERD_API_203
+
+#elif (defined USERD_API_203)
+#define GT_USERD_API_100
+#define GT_USERD_API_200
+#define GT_USERD_API_201
+#define GT_USERD_API_202
+
+#elif (defined USERD_API_202)
+#define GT_USERD_API_100
+#define GT_USERD_API_200
+#define GT_USERD_API_201
+
+#elif (defined USERD_API_201)
+#define GT_USERD_API_100
+#define GT_USERD_API_200
+
+#elif (defined USERD_API_200)
+#define GT_USERD_API_100
+#endif
+
+
+#define EOS '\0'
+
+typedef struct {
+  int  id;                /* part_id                                      */
+  char desc[Z_BUFL];      /* description given in the file                */
+  int  type;              /* Z_UNSTRUCTURED, Z_STRUCTURED, Z_IBLANKED     */
+  int  ne[Z_MAXTYPE];     /* Number of elements per type (Z_UNSTRUCTURED) */
+                          /* or ne[0] = I dimension (Z_STRUCTURED)        */
+                          /*    ne[1] = J dimension                       */
+                          /*    ne[2] = K dimension                       */
+  int  nn;                /* Num of unstructured nodes (All_Local only)   */
+  int  ghosts;            /* TRUE if ghost cells, FALSE otherwise         */
+}BUILDINFO;
+
+typedef struct {
+  char  description[Z_BUFL];  /* description */ 
+  char  filename[Z_BUFL];     /* real filename */
+  char  ifilename[Z_BUFL];    /* imaginary filename */
+  int   type;
+  int   classify;
+  int   complex;
+  float freq;
+  int   contran;
+  int   timeset;
+}VARINFO;
+
+
+typedef struct {
+  char name[12];          /* Z_POINT, Z_G_POINT, Z_BAR02, ... */
+  int  con_len;           /* Number of nodes per element      */
+}EINFO;
+
+
+/* Global variables
+ *-----------------*/
+int Geom_status;
+int Node_labels;
+int Element_labels;
+int Ghosts_in_model;
+int Num_parts;
+int Num_vars;
+int Num_materials_sets;
+BUILDINFO *Pbuild;
+VARINFO *Varinfo;
+char Version_number[Z_MAX_USERD_NAME];
+int Num_time_sets;
+int Num_time_steps;
+
+/* ------------------
+ * Extra GUI stuff
+ * ------------------ */
+int Num_toggles = 0;
+int Num_pulldowns = 0;
+int Num_fields = 0;
+char **Toggle_title;
+int *Toggle_default_status;
+char **Pulldown_title;
+int *Pulldown_number_in_list;
+int *Pulldown_default_selection;
+char ***Pulldown_item_strings;
+char **Field_title;
+char **Field_user_string;
+int *Toggle_choice; /* user choice */
+int *Pulldown_choice; /* user choice */
+
+/* ------------------
+ * Var Extract stuff
+ * ------------------ */
+int Num_ve_toggles = 0;
+int Num_ve_pulldowns = 0;
+int Num_ve_fields = 0;
+char **Toggle_ve_title;
+int *Toggle_ve_default_status;
+char **Pulldown_ve_title;
+int *Pulldown_ve_number_in_list;
+int *Pulldown_ve_default_selection;
+char ***Pulldown_ve_item_strings;
+char **Field_ve_title;
+char **Field_ve_user_string;
+int *Toggle_ve_choice; /* user choice */
+int *Pulldown_ve_choice; /* user choice */
+
+/* ---------------------------
+ * Failed elements (API 2.04)
+ * --------------------------- */
+int Any_uns_failed_model_elems = FALSE;
+
+/* ---------------------------
+ * Rigidbody (API 2.05)
+ * --------------------------- */
+int Any_Rigid_Body_Present = FALSE;
+
+/* ---------------------------
+ * Structured Reader Cinching (API 2.06)
+ * --------------------------- */
+int Doing_Structured_Cinching = FALSE;
+
+
+
+#if (defined USERD_API_100 || defined USERD_API_200)
+EINFO Elem_info[Z_MAXTYPE] = {"Z_POINT",1,
+                              "Z_BAR02",2,
+                              "Z_BAR03",3,
+                              "Z_TRI03",3,
+                              "Z_TRI06",6,
+                              "Z_QUA04",4,
+                              "Z_QUA08",8,
+                              "Z_TET04",4,
+                              "Z_TET10",10,
+                              "Z_PYR05",5,
+                              "Z_PYR13",13,
+                              "Z_PEN06",6,
+                              "Z_PEN15",15,
+                              "Z_HEX08",8,
+                              "Z_HEX20",20};
+#elif defined USERD_API_201
+EINFO Elem_info[Z_MAXTYPE] = {"Z_POINT",  1,
+                              "Z_G_POINT",1,
+                              "Z_BAR02",  2,
+                              "Z_G_BAR02",2,
+                              "Z_BAR03",  3,
+                              "Z_G_BAR03",3,
+                              "Z_TRI03",  3,
+                              "Z_G_TRI03",3,
+                              "Z_TRI06",  6,
+                              "Z_G_TRI06",6,
+                              "Z_QUA04",  4,
+                              "Z_G_QUA04",4,
+                              "Z_QUA08",  8,
+                              "Z_G_QUA08",8,
+                              "Z_TET04",  4,
+                              "Z_G_TET04",4,
+                              "Z_TET10",  10,
+                              "Z_G_TET10",10,
+                              "Z_PYR05",  5,
+                              "Z_G_PYR05",5,
+                              "Z_PYR13",  13,
+                              "Z_G_PYR13",13,
+                              "Z_PEN06",  6,
+                              "Z_G_PEN06",6,
+                              "Z_PEN15",  15,
+                              "Z_G_PEN15",15,
+                              "Z_HEX08",  8,
+                              "Z_G_HEX08",8,
+                              "Z_HEX20",  20,
+                              "Z_G_HEX20",20};
+#else
+EINFO Elem_info[Z_MAXTYPE] = {"Z_POINT",  1,
+                              "Z_G_POINT",1,
+                              "Z_BAR02",  2,
+                              "Z_G_BAR02",2,
+                              "Z_BAR03",  3,
+                              "Z_G_BAR03",3,
+                              "Z_TRI03",  3,
+                              "Z_G_TRI03",3,
+                              "Z_TRI06",  6,
+                              "Z_G_TRI06",6,
+                              "Z_QUA04",  4,
+                              "Z_G_QUA04",4,
+                              "Z_QUA08",  8,
+                              "Z_G_QUA08",8,
+                              "Z_TET04",  4,
+                              "Z_G_TET04",4,
+                              "Z_TET10",  10,
+                              "Z_G_TET10",10,
+                              "Z_PYR05",  5,
+                              "Z_G_PYR05",5,
+                              "Z_PYR13",  13,
+                              "Z_G_PYR13",13,
+                              "Z_PEN06",  6,
+                              "Z_G_PEN06",6,
+                              "Z_PEN15",  15,
+                              "Z_G_PEN15",15,
+                              "Z_HEX08",  8,
+                              "Z_G_HEX08",8,
+                              "Z_HEX20",  20,
+                              "Z_G_HEX20",20,
+                              "Z_NSIDED",  1,   /* Not yet implemented */
+                              "Z_G_NSIDED",1,   /* Not yet implemented */
+                              "Z_NFACED",  1,   /* Not yet implemented */
+                              "Z_G_NFACED",1};  /* Not yet implemented */
+#endif
+
+
+/* Prototypes
+ *-----------*/
+static int load_fail_defaults(void); 
+static int prelim_info(int *two_fields,
+                       int *any_extra_gui,
+                       int *any_var_extract);
+static int get_input(int set_server_number,
+                     int use_playfile,
+                     char playfile[Z_MAXFILENP],
+                     int two_fields,
+		     int any_extra_gui,
+                     int any_var_extract,
+                     int *swapbytes);
+static int time_info( void );
+static int part_build_info(int geom_time_step);
+static int variable_info( void );
+
+#if (defined GT_USERD_API_100)
+static int gold_part_builder(int geom_time_step);
+static int gold_var_loader(int var_time_step);
+#else
+static int part_builder(int geom_time_step);
+static int var_loader(int var_time_step);
+#endif
+
+#if (defined GT_USERD_API_100)
+static int materials_info( void );
+static int gold_materials_loader(int geom_time_step);
+#endif
+
+static int entity_querys(int var_time_step);
+static int exercise_bkup( void );
+static void usage( void );
+
+
+/*=============
+ * Main Routine
+ *=============*/
+#ifdef WIN32
+int main(int argc, char *argv[])
+#else
+int main(int argc, char *argv[])
+#endif
+{
+  /* Command line option variables
+   *------------------------------*/
+  int set_server_number = FALSE;
+  int use_playfile = FALSE;
+  char playfile[Z_MAXFILENP];
+  FILE *fplay;
+  int geom_time_step = 0;
+  int var_time_step = 0;
+
+  /* Other local variables
+   *----------------------*/
+  int i, j;
+  int err;
+  int two_fields;
+  int any_extra_gui = FALSE;
+  int any_var_extract = FALSE;
+  int swapbytes;
+  int indx;
+
+  /*----------------------------
+   * Command argument processing
+   *----------------------------*/
+  fprintf(stderr,"\n");
+  fprintf(stderr,"\n");
+  fprintf(stderr,"********************************************\n");
+  fprintf(stderr,"*  EnSight User Defined Reader Debug Tool  *\n");
+  fprintf(stderr,"********************************************\n");
+  fprintf(stderr,"\n");
+
+  indx = 1;
+  while(indx < argc) {
+
+    if(!strcmp("-h",argv[indx])) {
+      usage();
+    }
+    else if(!strcmp("-help",argv[indx])) {
+      usage();
+    }
+
+    /* if you want to test the server number routines
+     *
+     * Use:
+     * > checker -server_number
+     *
+     * You will then be prompted for the current and total
+     * number of servers
+     *-----------------------------------------------*/
+    else if(!strcmp("-server_number",argv[indx])) {
+      set_server_number = TRUE;
+    }
+
+    /* if you want to use a "playfile" instead of being prompted
+     * for the data loader information
+     *
+     * Use:
+     * > checker -p <playfile>
+     *
+     * This playfile should have 3 [or 4] lines:
+     * line 1:   the path
+     * line 2:   filename_1
+     * line 3:   [filename_2]   (if two_fields is TRUE)
+     * line 4:   0 or 1, for swapytes (0 is FALSE, 1 is TRUE)
+     *
+     * example (two_fields is FALSE, so only 3 lines):
+     *
+     *  /usr/scratch/stealth/bjn/dat/sp_gold/binary
+     *  simple.case
+     *  1
+     *
+     *------------------------------------------------------*/
+    else if(!strcmp("-p",argv[indx])) {
+      indx++;
+      if((indx < argc) && (argv[indx][0] != '-')) {
+        use_playfile = TRUE;
+        memset(playfile,EOS,Z_MAXFILENP);
+        strcpy(playfile,argv[indx]);
+      }
+      else {
+        usage();
+      }
+    }
+
+    /* if you want to specify the geometry timestep to test (default is step 0)
+     *
+     * Use:
+     * > checker -gts #
+     *
+     * Where # is the step number (zero based)
+     *-------------------------------------------------------------------------*/
+    else if(!strcmp("-gts",argv[indx])) {
+      indx++;
+      if((indx < argc) && (argv[indx][0] != '-')) {
+        geom_time_step = atoi(argv[indx]);
+      }
+      else {
+        usage();
+      }
+    }
+
+    /* if you want to specify the variable timestep to test (default is step 0)
+     * (will use this step for the appropriate timeset of each variable)
+     *
+     * Use:
+     * > checker -vts #
+     *
+     * Where # is the step number (zero based)
+     *-------------------------------------------------------------------------*/
+    else if(!strcmp("-vts",argv[indx])) {
+      indx++;
+      if((indx < argc) && (argv[indx][0] != '-')) {
+        var_time_step = atoi(argv[indx]);
+      }
+      else {
+        usage();
+      }
+    }
+    else {
+      usage();
+    }
+
+    indx++;
+  }
+
+
+  /*-------------------------------------------------------------
+   *
+   * Now start exercising EnSight
+   *
+   *--------------------------------------------------------------*/
+
+  /*-----------------
+   * Preliminary info
+   *-----------------*/
+  err = prelim_info(&two_fields,&any_extra_gui,&any_var_extract);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping because of error in prelim_info\n");
+    exit(1);
+  }
+
+
+  /*------------------
+   * User input needed
+   *------------------*/
+  err = get_input(set_server_number,
+                  use_playfile,
+                  playfile,
+                  two_fields,
+		  any_extra_gui,
+                  any_var_extract,
+                  &swapbytes);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping because of error in get_input\n");
+    exit(1);
+  }
+  
+
+  /*----------
+   * Time info
+   *----------*/
+  err = time_info();
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping because of error in time_info\n");
+    exit(1);
+  }
+
+
+  /*----------------
+   * Part build info
+   *----------------*/
+  err = part_build_info(geom_time_step);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping because of error in part_build_info\n");
+    exit(1);
+  }
+
+
+  /*------------------
+   * Get Variable Info
+   *------------------*/
+  err = variable_info();
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping because of error in variable_info\n");
+    exit(1);
+  }
+
+
+#if (defined GT_USERD_API_202)
+  /*-------------------
+   * Get Materials Info
+   *-------------------*/
+  err = materials_info();
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping because of error in materials_info\n");
+    exit(1);
+  }
+#endif
+
+#if (defined GT_USERD_API_203)
+  if (Z_ERR == load_fail_defaults()) {
+    fprintf(stderr,"Stopping due to error in failed element flag routine\n");
+    exit(1);
+  }
+#endif
+
+#if (defined GT_USERD_API_204)
+
+  /*-----------------------------------------------
+   * Mel needs to do these species routines yet!!!
+   *----------------------------------------------*/  
+  /* USERD_get_matsp_info
+     USERD_get_number_of_species */
+  
+
+  /* See if any rigid body in model
+   *-------------------------------*/
+  fprintf(stderr,"\n------------- rigid body existence -------------\n");
+  if(USERD_rigidbody_existence() == Z_OK) {
+    fprintf(stderr," Rigid Body values exist in the model\n");
+    Any_Rigid_Body_Present = TRUE;
+  }
+  else {
+    fprintf(stderr," N0 Rigid Body values exist in the model\n");
+  }
+
+#endif
+
+
+#if (defined GT_USERD_API_205)
+
+  /* See if doing structured cinching
+   *---------------------------------*/
+  fprintf(stderr,"\n------------- structured reader cinching existence -------------\n");
+  if(USERD_get_structured_reader_cinching() == Z_OK) {
+    fprintf(stderr," Doing structured reader cinching\n");
+    fprintf(stderr,"  for each of the i,j,k directions,\n");
+    fprintf(stderr,"    will send in min and max unchanged, but\n");
+    fprintf(stderr,"    will send in stride as 2\n");
+    Doing_Structured_Cinching = TRUE;
+  }
+  else {
+    fprintf(stderr," NOT doing structured reader cinching\n");
+  }
+#endif
+
+#if (defined GT_USERD_API_206)
+
+  /* Probably won't do either of these - trivial
+   *--------------------------------------------*/
+  /* USERD_prefer_auto_distribute   <optional> */
+  /* USERD_set_filename_button_labels  <optional> */
+#endif
+
+
+#if (defined GT_USERD_API_207)
+
+  /* If we choose to do these, Bruce should implement them
+   *------------------------------------------------------*/
+  /* All the _buffer routines!  <optional> */
+
+  /* If we choose to do these, Bill should implement them
+   *-----------------------------------------------------*/
+  /* USERD_get_num_xy_queries  <optional>
+     USERD_get_xy_query_data   <optional>
+     USERD_get_xy_query_info   <optional> */
+
+#endif
+
+#if (defined GT_USERD_API_208)
+
+  /* If we choose to do these, Bruce should implement them
+   *------------------------------------------------------*/
+  /* VGLYPH routines <optional> */
+#endif
+
+  /*------------------------
+   * Act like building parts
+   *------------------------*/
+  if(Num_parts > 0) {
+
+#if (defined GT_USERD_API_100)
+    err = gold_part_builder(geom_time_step);
+#else
+    err = part_builder(geom_time_step);
+#endif
+    if(err == Z_ERR) {
+      fprintf(stderr,"Stopping because of error in part_builder\n");
+      exit(1);
+    }
+    else {
+      USERD_stop_part_building();
+    }
+  }
+
+
+  /*---------------------------
+   * Act like loading variables
+   *---------------------------*/
+  if(Num_vars > 0) {
+
+#if (defined GT_USERD_API_100)
+    err = gold_var_loader(var_time_step);
+#else
+    err = var_loader(var_time_step);
+#endif
+    if(err == Z_ERR) {
+      fprintf(stderr,"Stopping because of error in var_loader\n");
+      exit(1);
+    }
+  }
+
+#if (defined GT_USERD_API_202)
+  /*---------------------------
+   * Act like loading materials
+   *---------------------------*/
+  if(Num_materials_sets > 0) {
+    err = gold_materials_loader(geom_time_step);
+    if(err == Z_ERR) {
+      fprintf(stderr,"Stopping because of error in materials_loader\n");
+      exit(1);
+    }
+  }
+#endif
+
+
+
+  /*----------------------------------------------------
+   * See if can do node and/or element queries over time
+   *----------------------------------------------------*/
+  if(Num_parts > 0 &&
+     Num_vars > 0) {
+    err = entity_querys(var_time_step);
+    if(err == Z_ERR) {
+      fprintf(stderr,"Stopping because of error in entity_querys\n");
+      exit(1);
+    }
+  }
+
+  /*----------------------------------------
+   * Call the bkup file once in save mode,
+   * then again in restore mode - so someone
+   * could debug if desired
+   *----------------------------------------*/
+  err = exercise_bkup();
+  if(err == Z_ERR) {
+    fprintf(stderr,"Stopping due to error in saving and/or restoring archive\n");
+    exit(1);
+  }
+
+  /*-------------
+   * Exit Routine
+   *-------------*/
+  fprintf(stderr,"\n----------------- exiting ---------------\n");
+
+#if (defined GT_USERD_API_100)
+  USERD_exit_routine();
+#endif
+
+  fprintf(stderr,"\n\n");
+
+  return(0);
+}
+
+/*--------------
+ * Usage routine
+ *--------------*/
+static void
+usage( void )
+{
+  fprintf(stderr,"------------------------------------------------------------\n");
+  fprintf(stderr,"USAGE: checker [-p pfile] [-server_number] [-gts #] [-vts #]\n");
+  fprintf(stderr,"------------------------------------------------------------\n");
+  fprintf(stderr," -h, -help        Prints out this USAGE text.\n");
+  fprintf(stderr," -gts #           Specify the geometry time step to use.)\n");
+  fprintf(stderr," -p pfile         Plays the checker playfile (pfile).\n");
+  fprintf(stderr," -server_number   Cause servers numbers to be prompted for.\n");
+  fprintf(stderr," -vts #           Specify the variable time step to use.)\n");
+  fprintf(stderr,"\n");
+  exit(1);
+}
+
+
+
+
+/*------------
+ * prelim_info
+ *------------*/
+static int
+prelim_info(int *two_fields, int *any_extra_gui, int *any_var_extract)
+{
+  int err;
+  char reader_name[Z_MAX_USERD_NAME];
+  char release_number[Z_MAX_USERD_NAME];
+  char description[Z_MAXFILENP];
+  int i,j;
+
+  *any_extra_gui = FALSE;
+  *any_var_extract = FALSE;
+
+  /* Get the reader name
+   *--------------------*/
+  err = USERD_get_name_of_reader(reader_name,two_fields);
+  if(err == Z_OK) {
+    fprintf(stderr," Name of reader: %s\n",reader_name);
+    if(*two_fields==1) {
+      fprintf(stderr," two_fields:     TRUE\n");
+    }
+    else if(*two_fields==0){
+      fprintf(stderr," two_fields:     FALSE\n");
+    }
+    else if(*two_fields < 0) {
+      fprintf(stderr," two_fields:     -1 (optional string) \n");
+    }
+  }
+  else {
+    fprintf(stderr,"Error: Could not get name of reader\n");
+    return(Z_ERR);
+  }
+
+  /* Get the Extra GUI stuff (optional) 
+   * ---------------------------------------------------------- */
+#ifdef _EGS
+
+  /* Get the Extra GUI numbers of toggles, pulldowns, & fields 
+   * ---------------------------------------------------------- */
+    
+  USERD_get_extra_gui_numbers( &Num_toggles,
+                               &Num_pulldowns,
+                               &Num_fields );
+    
+  if ( Num_toggles > 0 || Num_pulldowns > 0 || Num_fields > 0 ) {
+
+    *any_extra_gui = TRUE;
+      
+    if (Num_toggles>0) {
+      Toggle_title = (char **) calloc(Num_toggles,sizeof(char*));
+      if (Toggle_title == (char **)NULL) return(Z_ERR);
+      for (i=0; i<Num_toggles; i++) {
+        Toggle_title[i] = (char *) calloc(Z_LEN_GUI_TITLE_STR,sizeof(char));
+        if ( Toggle_title[i] == (char *)NULL ) return(Z_ERR);
+      }
+      Toggle_default_status = (int *) calloc(Num_toggles,sizeof(int));
+      Toggle_choice = (int *) calloc(Num_toggles,sizeof(int));
+    }
+      
+    if (Num_pulldowns > 0) {
+      Pulldown_title = (char **) calloc( Num_pulldowns , sizeof(char*) );
+      if (Pulldown_title == (char **)NULL) return(Z_ERR);
+        
+      Pulldown_item_strings = (char ***) calloc( Num_pulldowns , sizeof(char**) );
+      if (Pulldown_item_strings == (char ***)NULL) return(Z_ERR);
+        
+      for (i=0; i<Num_pulldowns; i++) {
+        Pulldown_title[i] = (char *) calloc( Z_LEN_GUI_TITLE_STR , sizeof(char) );
+        if ( Pulldown_title[i] == (char *)NULL ) return(Z_ERR);
+          
+        Pulldown_item_strings[i] = (char **) calloc( Z_MAX_NUM_GUI_PULL_ITEMS , sizeof(char *) );
+        if (Pulldown_item_strings[i] == (char **)NULL) return(Z_ERR);
+          
+        for(j = 0; j < Z_MAX_NUM_GUI_PULL_ITEMS; j++) {
+          Pulldown_item_strings[i][j] = (char *) calloc( Z_LEN_GUI_PULL_STR , sizeof(char) );
+          if ( Pulldown_item_strings[i][j] == (char *)NULL ) return(Z_ERR);
+        }
+      }
+      Pulldown_number_in_list = (int *) calloc(Num_pulldowns,sizeof(int));
+      Pulldown_default_selection = (int *) calloc(Num_pulldowns,sizeof(int));
+      Pulldown_choice = (int *) calloc(Num_pulldowns,sizeof(int));
+    }
+   
+    if (Num_fields > 0) {
+      Field_title = (char **) calloc(Num_fields,sizeof(char*));
+      Field_user_string = (char **) calloc(Num_fields,sizeof(char*));
+      if (Field_title == (char **) NULL) return(Z_ERR);
+      for (i=0; i<Num_fields; i++) {
+        Field_title[i] = (char *) calloc(Z_LEN_GUI_TITLE_STR,sizeof(char));
+        if ( Field_title[i] == (char *)NULL) return(Z_ERR);
+        Field_user_string[i] = (char *) calloc(Z_LEN_GUI_FIELD_STR,sizeof(char));
+        if ( Field_user_string[i] == (char *)NULL) return(Z_ERR);
+      }
+    }
+      
+   
+    err = USERD_get_extra_gui_defaults(
+          Toggle_title,                 /* [num_toggles][Z_LEN_GUI_TITLE_STR] */
+          Toggle_default_status,        /* [num_toggles] */
+          Pulldown_title,               /* [num_pulldowns][Z_LEN_GUI_TITLE_STR] */
+          Pulldown_number_in_list,      /* [num_pulldowns] */
+          Pulldown_default_selection,   /* [num_pulldowns] */
+          Pulldown_item_strings,        /* [num_pulldowns][Z_MAX_NUM_GUI_PULL_ITEMS][Z_LEN_GUI_PULL_STR] */
+          Field_title,                  /* [num_fields][Z_LEN_GUI_TITLE_STR] */
+          Field_user_string              /* [num_fields][Z_LEN_GUI_FIELD_STR] */
+                                       );
+    if (Z_ERR == err) return(Z_ERR);
+     
+    fprintf(stderr,"\n**********************************************\n");
+    fprintf(stderr,"****          Extra GUI Information        ***\n");
+    fprintf(stderr,"**********************************************\n\n");
+      
+    fprintf(stderr,"\nTOGGLE INFO: %d active toggles\n",Num_toggles);
+    for (i=0; i<Num_toggles; i++) {
+      fprintf(stderr,"Toggle Title %d : %s\n",i,Toggle_title[i]);
+      fprintf(stderr,"Default status = %d \n",Toggle_default_status[i]);
+    }
+      
+    fprintf(stderr,"\nPULLDOWN INFO: %d active pulldowns\n",Num_pulldowns);
+    for (i=0; i<Num_pulldowns; i++) {
+      fprintf(stderr,"Pulldown Title %d : %s\n", i , Pulldown_title[i] );
+      for (j=0; j<Z_MAX_NUM_GUI_PULL_ITEMS; j++) {
+        fprintf(stderr,"Pulldown_item %d : %s\n",j,Pulldown_item_strings[i][j]);
+        if (strlen(Pulldown_item_strings[i][j]) == 0) {
+          Pulldown_number_in_list[i] = j;
+          break;
+        }
+      }
+      fprintf(stderr,"Number of items in list: %d\n",Pulldown_number_in_list[i]);
+      fprintf(stderr,"Default selection: %d\n\n",Pulldown_default_selection[i]);
+    }
+    fprintf(stderr,"\n");
+   
+    fprintf(stderr,"\nFIELDINFO: %d active fields\n",Num_fields);
+    for (i=0; i<Num_fields; i++) {
+      fprintf(stderr,"Field Title %d : %s\n",i,Field_title[i]);
+      fprintf(stderr,"Field string %d: %s\n",i,Field_user_string[i]);
+    }
+    fprintf(stderr,"\n\n\n");
+  }
+#endif
+
+ 
+  /* Get the var_extract stuff (optional) 
+   * ---------------------------------------------------------- */
+#ifdef _VES
+
+  /* Get the var_extract numbers of toggles, pulldowns, & fields 
+   * ---------------------------------------------------------- */
+  USERD_get_var_extract_gui_numbers(&Num_ve_toggles,
+                                    &Num_ve_pulldowns,
+                                    &Num_ve_fields );
+  if ( Num_ve_toggles > 0 || Num_ve_pulldowns > 0 || Num_ve_fields > 0 ) {
+
+    *any_var_extract = TRUE;
+
+    if (Num_ve_toggles > 0) {
+      Toggle_ve_title = (char **) calloc(Num_ve_toggles,sizeof(char*));
+      if (Toggle_ve_title == (char **)NULL) return(Z_ERR);
+      for (i=0; i<Num_ve_toggles; i++) {
+        Toggle_ve_title[i] = (char *) calloc(Z_LEN_GUI_TITLE_STR,sizeof(char));
+        if ( Toggle_ve_title[i] == (char *)NULL ) return(Z_ERR);
+      }
+      Toggle_ve_default_status = (int *) calloc(Num_ve_toggles,sizeof(int));
+      Toggle_ve_choice = (int *) calloc(Num_ve_toggles,sizeof(int));
+    }
+
+    if (Num_ve_pulldowns > 0) {
+      Pulldown_ve_title = (char **) calloc( Num_ve_pulldowns , sizeof(char*) );
+      if (Pulldown_ve_title == (char **)NULL) return(Z_ERR);
+        
+      Pulldown_ve_item_strings = (char ***) calloc( Num_ve_pulldowns , sizeof(char**) );
+      if (Pulldown_ve_item_strings == (char ***)NULL) return(Z_ERR);
+        
+      for (i=0; i<Num_ve_pulldowns; i++) {
+        Pulldown_ve_title[i] = (char *) calloc( Z_LEN_GUI_TITLE_STR , sizeof(char) );
+        if ( Pulldown_ve_title[i] == (char *)NULL ) return(Z_ERR);
+          
+        Pulldown_ve_item_strings[i] = (char **)calloc(Z_MAX_NUM_GUI_PULL_ITEMS, sizeof(char *));
+        if (Pulldown_ve_item_strings[i] == (char **)NULL) return(Z_ERR);
+          
+        for(j = 0; j < Z_MAX_NUM_GUI_PULL_ITEMS; j++) {
+          Pulldown_ve_item_strings[i][j] = (char *) calloc( Z_LEN_GUI_PULL_STR , sizeof(char) );
+          if ( Pulldown_ve_item_strings[i][j] == (char *)NULL ) return(Z_ERR);
+        }
+      }
+      Pulldown_ve_number_in_list = (int *) calloc(Num_ve_pulldowns,sizeof(int));
+      Pulldown_ve_default_selection = (int *) calloc(Num_ve_pulldowns,sizeof(int));
+      Pulldown_ve_choice = (int *) calloc(Num_ve_pulldowns,sizeof(int));
+    }
+   
+    if (Num_ve_fields > 0) {
+      Field_ve_title = (char **) calloc(Num_ve_fields,sizeof(char*));
+      Field_ve_user_string = (char **) calloc(Num_ve_fields,sizeof(char*));
+      if (Field_ve_title == (char **) NULL) return(Z_ERR);
+      for (i=0; i<Num_ve_fields; i++) {
+        Field_ve_title[i] = (char *) calloc(Z_LEN_GUI_TITLE_STR,sizeof(char));
+        if ( Field_ve_title[i] == (char *)NULL) return(Z_ERR);
+        Field_ve_user_string[i] = (char *) calloc(Z_LEN_GUI_FIELD_STR,sizeof(char));
+        if ( Field_ve_user_string[i] == (char *)NULL) return(Z_ERR);
+      }
+    }
+   
+   
+    err = USERD_get_var_extract_gui_defaults(
+          Toggle_ve_title,                 /* [num_ve_toggles][Z_LEN_GUI_TITLE_STR] */
+          Toggle_ve_default_status,        /* [num_ve_toggles] */
+          Pulldown_ve_title,               /* [num_ve_pulldowns][Z_LEN_GUI_TITLE_STR] */
+          Pulldown_ve_number_in_list,      /* [num_ve_pulldowns] */
+          Pulldown_ve_default_selection,   /* [num_ve_pulldowns] */
+          Pulldown_ve_item_strings,        /* [num_ve_pulldowns][Z_MAX_NUM_GUI_PULL_ITEMS][Z_LEN_GUI_PULL_STR] */
+          Field_ve_title,                  /* [num_ve_fields][Z_LEN_GUI_TITLE_STR] */
+          Field_ve_user_string             /* [num_ve_fields][Z_LEN_GUI_FIELD_STR] */
+                                             );
+    if (Z_ERR == err) return(Z_ERR);
+     
+    fprintf(stderr,"\n**********************************************\n");
+    fprintf(stderr,"****          Var Extract Information      ***\n");
+    fprintf(stderr,"**********************************************\n\n");
+      
+    fprintf(stderr,"\nTOGGLE INFO: %d active toggles\n",Num_ve_toggles);
+    for (i=0; i<Num_ve_toggles; i++) {
+      fprintf(stderr,"Toggle Title %d : %s\n",i,Toggle_ve_title[i]);
+      fprintf(stderr,"Default status = %d \n",Toggle_ve_default_status[i]);
+    }
+      
+    fprintf(stderr,"\nPULLDOWN INFO: %d active pulldowns\n",Num_ve_pulldowns);
+    for (i=0; i<Num_ve_pulldowns; i++) {
+      fprintf(stderr,"Pulldown Title %d : %s\n", i , Pulldown_ve_title[i] );
+      for (j=0; j<Z_MAX_NUM_GUI_PULL_ITEMS; j++) {
+        fprintf(stderr,"Pulldown_item %d : %s\n",j,Pulldown_ve_item_strings[i][j]);
+        if (strlen(Pulldown_ve_item_strings[i][j]) == 0) {
+          Pulldown_ve_number_in_list[i] = j;
+          break;
+        }
+      }
+      fprintf(stderr,"Number of items in list: %d\n",Pulldown_ve_number_in_list[i]);
+      fprintf(stderr,"Default selection: %d\n\n",Pulldown_ve_default_selection[i]);
+    }
+    fprintf(stderr,"\n");
+   
+    fprintf(stderr,"\nFIELDINFO: %d active fields\n",Num_ve_fields);
+    for (i=0; i<Num_ve_fields; i++) {
+      fprintf(stderr,"Field Title %d : %s\n",i,Field_ve_title[i]);
+      fprintf(stderr,"Field string %d: %s\n",i,Field_ve_user_string[i]);
+    }
+    fprintf(stderr,"\n\n\n");
+  }
+#endif
+ 
+ 
+#if (defined GT_USERD_API_100)
+
+  /* Get the reader api used
+   *------------------------*/
+  err = USERD_get_reader_version(Version_number);
+  if(err == Z_OK) {
+    fprintf(stderr," API version:    %s\n",Version_number);
+  }
+  else {
+    fprintf(stderr,"Error: Could not get reader api version\n");
+    return(Z_ERR);
+  }
+
+  /* Get the reader release
+   *-----------------------*/
+  err = USERD_get_reader_release(release_number);
+  if(err == Z_OK) {
+    fprintf(stderr," Release:        %s\n",release_number);
+  }
+  else {
+    fprintf(stderr,"Error: Could not get reader release\n");
+    return(Z_ERR);
+  }
+#else
+  fprintf(stderr," API version:    1.00\n");
+#endif
+
+
+#if 0
+  /* Get the reader description
+   *---------------------------*/
+  err = USERD_get_reader_descrip(description);
+  if(err == Z_OK) {
+    fprintf(stderr," Description:\n\n");
+    fprintf(stderr,"%s\n\n",description);
+  }
+  else {
+    fprintf(stderr,"Error: Could not get reader description\n");
+    return(Z_ERR);
+  }
+#else
+  fprintf(stderr,"  Note: Not currently calling USERD_get_reader_descrip\n");
+  fprintf(stderr,"        because it is optional.\n");
+#endif
+
+  return(Z_OK);
+}
+
+
+/*----------
+ * get_input
+ *----------*/
+static int
+get_input(int set_server_number,
+          int use_playfile,
+          char playfile[Z_MAXFILENP],
+          int two_fields,
+	  int any_extra_gui,
+          int any_var_extract,
+          int *swapbytes)
+{
+  FILE *fplay;
+
+  int i, j;
+  int err;
+  int tot_servers;
+  int cur_server;
+  char the_path[Z_MAXFILENP];
+  char file1[Z_MAXFILENP];
+  char file2[Z_MAXFILENP];
+  char filename_1[Z_MAXFILENP];
+  char filename_2[Z_MAXFILENP];
+
+
+  fprintf(stderr,"\n-------------- get_input ----------------\n");
+
+  /*-----------------------------------------------------
+   * Prompt for the two input values, as the client would
+   * And set this info for the reader
+   *-----------------------------------------------------*/
+
+#if (defined GT_USERD_API_100)
+
+  /* Set the server number - if command line option to do so
+   *--------------------------------------------------------*/
+  if(set_server_number) {
+    fprintf(stderr,"     Enter total number of servers: ");
+    scanf("%d",&tot_servers);
+
+    fprintf(stderr,"     Enter current server number: ");
+    scanf("%d",&cur_server);
+
+    fprintf(stderr," Setting %d of %d for server number\n",cur_server,tot_servers);
+    USERD_set_server_number(cur_server,tot_servers);
+  }
+#endif
+
+  /* Set the filenames
+   *------------------*/
+  memset(the_path,EOS,Z_MAXFILENP);
+  memset(file1,EOS,Z_MAXFILENP);
+  memset(file2,EOS,Z_MAXFILENP);
+  memset(filename_1,EOS,Z_MAXFILENP);
+  memset(filename_2,EOS,Z_MAXFILENP);
+
+
+  if(!use_playfile) {
+    fprintf(stderr,"     Enter the path: ");
+    scanf("%s",the_path);
+
+
+    fprintf(stderr,"     Enter filename_1: ");
+    scanf("%s",file1);
+
+    if(two_fields == TRUE) {
+      fprintf(stderr,"     Enter filename_2: ");
+      scanf("%s",file2);
+    }
+
+    fprintf(stderr,"     Enter Swapbytes (0 if FALSE, 1 if TRUE): ");
+    scanf("%d",swapbytes);
+
+    if (TRUE == any_extra_gui ) {
+      fprintf(stderr,"\n**********************************************\n");
+      fprintf(stderr,"****          Extra GUI INPUT                ***\n");
+      fprintf(stderr,"**********************************************\n\n");
+
+      fprintf(stderr, "\n      TOGGLE INPUT \n");
+      for (i=0; i<Num_toggles; i++) {
+	fprintf(stderr, "      Enter Toggle Value for '%s' (1=toggle on, 0=toggle off)\n",Toggle_title[i]);
+	scanf("%d",&Toggle_choice[i]);
+      }
+      fprintf(stderr, "\n      PULLDOWN INPUT \n");
+      for (i=0; i<Num_pulldowns; i++) {
+	fprintf(stderr, "\n      PULLDOWN # %d \n",i);	
+	for (j = 0; j<Pulldown_number_in_list[i]; j++) {
+	  fprintf(stderr, "              %d %s\n",j,Pulldown_item_strings[i][j]);
+	}
+	fprintf(stderr, "              Enter Pulldown Value for '%s' (0 to %d)\n",Pulldown_title[i],Pulldown_number_in_list[i]-1);
+	scanf("%d",&Pulldown_choice[i]);	
+      }
+      fprintf(stderr, "\n      FIELD INPUT \n");
+      for (i=0; i<Num_fields; i++) {
+	fprintf(stderr, "Enter string for field %d '%s'\n",i,Field_title[i]);
+	scanf("%s",Field_user_string[i]);
+      }
+
+    }                /* end if there is any extra gui stuff */
+
+    if (TRUE == any_var_extract ) {
+      fprintf(stderr,"\n**********************************************\n");
+      fprintf(stderr,"****          Var extract INPUT            ***\n");
+      fprintf(stderr,"**********************************************\n\n");
+
+      fprintf(stderr, "\n      TOGGLE INPUT \n");
+      for (i=0; i<Num_ve_toggles; i++) {
+	fprintf(stderr, "      Enter Toggle Value for '%s' (1=toggle on, 0=toggle off)\n",Toggle_ve_title[i]);
+	scanf("%d",&Toggle_ve_choice[i]);
+      }
+      fprintf(stderr, "\n      PULLDOWN INPUT \n");
+      for (i=0; i<Num_ve_pulldowns; i++) {
+	fprintf(stderr, "\n      PULLDOWN # %d \n",i);	
+	for (j = 0; j<Pulldown_ve_number_in_list[i]; j++) {
+	  fprintf(stderr, "              %d %s\n",j,Pulldown_ve_item_strings[i][j]);
+	}
+	fprintf(stderr, "              Enter Pulldown Value for '%s' (0 to %d)\n",Pulldown_ve_title[i],Pulldown_ve_number_in_list[i]-1);
+	scanf("%d",&Pulldown_ve_choice[i]);	
+      }
+      fprintf(stderr, "\n      FIELD INPUT \n");
+      for (i=0; i<Num_ve_fields; i++) {
+	fprintf(stderr, "Enter string for field %d '%s'\n",i,Field_ve_title[i]);
+	scanf("%s",Field_ve_user_string[i]);
+      }
+
+    }                /* end if there is any var_extract stuff */
+
+  }                  /* end if not using playfile */
+  else {
+    fplay = fopen(playfile,"rb");
+    if(fplay == (FILE *)NULL) {
+      fprintf(stderr,"Error: Opening the playfile %s\n",playfile);
+      return(Z_ERR);
+    }
+    else {
+      fscanf(fplay,"%s",the_path);
+      fscanf(fplay,"%s",file1);
+      if(two_fields == TRUE) {
+        fscanf(fplay,"%s",file2);
+      }
+      fscanf(fplay,"%d",swapbytes);
+
+      /* ---------------------
+       * Extra GUI stuff
+       * --------------------- */
+      if (TRUE == any_extra_gui) {
+
+	for (i=0; i<Num_toggles; i++) {
+	  fscanf(fplay,"%d",&Toggle_choice[i]);
+	}
+	
+	for (i=0; i<Num_pulldowns; i++) {
+	  fscanf(fplay,"%d",&Pulldown_choice[i]);
+	}
+
+	for (i=0; i<Num_fields; i++) {
+	  fscanf(fplay,"%s",Field_user_string[i]);
+	}
+      }
+
+      /* ---------------------
+       * var_sxtract stuff
+       * --------------------- */
+      if (TRUE == any_var_extract) {
+
+	for (i=0; i<Num_ve_toggles; i++) {
+	  fscanf(fplay,"%d",&Toggle_ve_choice[i]);
+	}
+	
+	for (i=0; i<Num_ve_pulldowns; i++) {
+	  fscanf(fplay,"%d",&Pulldown_ve_choice[i]);
+	}
+
+	for (i=0; i<Num_ve_fields; i++) {
+	  fscanf(fplay,"%s",Field_ve_user_string[i]);
+	}
+      }
+
+      fclose(fplay);
+    }
+  }
+
+#ifdef _EGS
+  /* -------------------------------------------
+   * set the user choices here and run the code
+   * ------------------------------------------- */
+  
+  /* set your choices here 
+     Toggle_choice[0..Num_toggles]
+     Pulldown_choice[0..Num_pulldowns]
+     Field_user_string[Num_fields][0..Numfields] 
+     amd then send your choices into this routine */
+
+  USERD_set_extra_gui_data(Toggle_choice,            /* [num_toggle] */
+                           Pulldown_choice,          /* [num_pulldown] */
+                           Field_user_string  );    /* [num_fields][Z_LEN_GUI_FIELD_STR] */ 
+    
+  for (i=0; i<Num_toggles; i++) {
+    fprintf(stderr,"Toggle Title %d : %s\n",i,Toggle_title[i]);
+    fprintf(stderr,"User selection = %d \n",Toggle_choice[i]);
+  }
+  fprintf(stderr,"\n\n");
+    
+  for (i=0; i<Num_pulldowns; i++) {
+    fprintf(stderr,"Pulldown Title %d : %s\n", i , Pulldown_title[i] );
+    fprintf(stderr,"Pulldown selection is # %d : %s\n",
+            Pulldown_choice[i],Pulldown_item_strings[i][Pulldown_choice[i]]);
+  }
+  
+  for (i=0; i<Num_fields; i++) {
+    fprintf(stderr,"Field Title %d : %s\n",i,Field_title[i]);
+    fprintf(stderr,"Field string %d: %s\n",i,Field_user_string[i]);
+    
+  }
+#endif
+
+#ifdef _VES
+  /* -------------------------------------------
+   * set the user choices here and run the code
+   * ------------------------------------------- */
+  
+  /* set your choices here 
+     Toggle_ve_choice[0..Num_ve_toggles]
+     Pulldown_ve_choice[0..Num_ve_pulldowns]
+     Field_ve_user_string[Num_ve_fields][0..Numfields] 
+     amd then send your choices into this routine */
+    
+  USERD_set_var_extract_gui_data(Toggle_ve_choice,      /* [num_ve_toggle] */
+                                 Pulldown_ve_choice,    /* [num_ve_pulldown] */
+                                 Field_ve_user_string); /*[num_ve_fields][Z_LEN_GUI_FIELD_STR] */ 
+
+  for (i=0; i<Num_ve_toggles; i++) {
+    fprintf(stderr,"Toggle Title %d : %s\n",i,Toggle_ve_title[i]);
+    fprintf(stderr,"User selection = %d \n",Toggle_ve_choice[i]);
+  }
+  fprintf(stderr,"\n\n");
+  
+  for (i=0; i<Num_ve_pulldowns; i++) {
+    fprintf(stderr,"Pulldown Title %d : %s\n", i , Pulldown_ve_title[i] );
+    fprintf(stderr,"Pulldown selection is # %d : %s\n",
+            Pulldown_ve_choice[i],Pulldown_ve_item_strings[i][Pulldown_ve_choice[i]]);
+  }
+    
+  for (i=0; i<Num_ve_fields; i++) {
+    fprintf(stderr,"Field Title %d : %s\n",i,Field_ve_title[i]);
+    fprintf(stderr,"Field string %d: %s\n",i,Field_ve_user_string[i]);
+  }
+#endif
+
+
+  if(strncmp(file1,"/",1)) {
+    strcpy(filename_1,the_path);
+    strcat(filename_1,"/");
+    strcat(filename_1,file1);
+  }
+  if(two_fields == TRUE) {
+    if(strncmp(file2,"/",1)) {
+      strcpy(filename_2,the_path);
+      strcat(filename_2,"/");
+      strcat(filename_2,file2);
+    }
+  }
+  if(*swapbytes == 0) {
+    *swapbytes = FALSE;
+  }
+  else {
+    *swapbytes = TRUE;
+  }
+
+  /* Feedback
+   *---------*/
+  fprintf(stderr," path: %s\n",the_path);
+  fprintf(stderr," filename_1: %s\n",filename_1);
+  fprintf(stderr," filename_2: %s\n",filename_2);
+  if(*swapbytes) {
+    fprintf(stderr," Swapbytes:    TRUE\n");
+  }
+  else {
+    fprintf(stderr," Swapbytes:    FALSE\n");
+  }
+
+  err = USERD_set_filenames(filename_1,filename_2,the_path,*swapbytes);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Error: Trouble setting the filenames\n");
+    return(Z_ERR);
+  }
+
+  return(Z_OK);
+}
+
+
+/*----------
+ * time_info
+ *----------*/
+static int
+time_info( void )
+{
+  int i;
+  int err;
+  int geom_time_set;
+  int ts;
+  float *sol_times;
+  char ts_desc[Z_BUFL];
+
+  fprintf(stderr,"\n-------------- time_info ----------------\n");
+
+#if (defined GT_USERD_API_100)
+
+  /* Get the number of timesets
+   *---------------------------*/
+  Num_time_sets = USERD_get_number_of_timesets();
+  fprintf(stderr," number of timesets: %d\n",Num_time_sets);
+  if(Num_time_sets == 0) {
+    fprintf(stderr," So, static geometry and variables\n");
+    return(Z_OK);
+  }
+
+  /* Get the timeset used for the geometry
+   *--------------------------------------*/
+  geom_time_set = USERD_get_geom_timeset_number();
+
+  fprintf(stderr," geom timeset number: %d\n",geom_time_set);
+  if(geom_time_set < 1 && Num_time_sets > 0) {
+    fprintf(stderr,"Error: timeset numbers must be 1 or greater\n");
+    fprintf(stderr,"       (unless Num_time_sets is zero also)\n");
+  }
+
+
+  /* For each timeset
+   *-----------------*/
+  for(ts=1; ts<=Num_time_sets; ++ts) {
+
+    fprintf(stderr," Timeset %d:\n",ts);
+
+    /* Get the timeset descriptions
+     *-----------------------------*/
+    err = USERD_get_timeset_description(ts,ts_desc);
+    if(err == Z_ERR) {
+      fprintf(stderr,"Error: getting timeset description\n");
+      return(Z_ERR);
+    }
+    else {
+      fprintf(stderr,"   description: %s\n",ts_desc);
+    }
+
+    /* Get the number of time steps
+     *-----------------------------*/
+    Num_time_steps = USERD_get_num_of_time_steps(ts);
+    fprintf(stderr,"   number of time steps: %d\n",Num_time_steps);
+    if(Num_time_steps < 1) {
+      fprintf(stderr," Error: Number of time steps returned: %d\n",Num_time_steps);
+      fprintf(stderr," (Must be >0 to be okay)\n");
+      return(Z_ERR);
+    }
+    
+
+    /* Get the solution times
+     *-----------------------*/
+    if(Num_time_steps > 0) {
+      sol_times = (float *) calloc(Num_time_steps,sizeof(float));
+      if(sol_times == (float *)NULL) {
+        fprintf(stderr,"Error: allocating for solution times\n");
+        return(Z_ERR);
+      }
+      else {
+        err = USERD_get_sol_times(ts,sol_times);
+        if(err == Z_ERR) {
+          fprintf(stderr,"Error: getting solution times\n");
+          return(Z_ERR);
+        }
+        else {
+          for(i=0; i<Num_time_steps; ++i) {
+            fprintf(stderr,"   At step %d, time = %f\n",i,sol_times[i]);
+          }
+        }
+      }
+      free(sol_times);
+    }
+  }
+
+#else
+
+
+  /* Get the number of time steps
+   *-----------------------------*/
+  Num_time_steps = USERD_get_number_of_time_steps();
+  fprintf(stderr," Nnumber of time steps: %d\n",Num_time_steps);
+  if(Num_time_steps < 1) {
+    fprintf(stderr," Error: Number of time steps returned: %d\n",Num_time_steps);
+    fprintf(stderr," (Must be >0 to be okay)\n");
+    return(Z_ERR);
+  }
+    
+  
+  /* Get the solution times
+   *-----------------------*/
+  if(Num_time_steps > 0) {
+    sol_times = (float *) calloc(Num_time_steps,sizeof(float));
+    if(sol_times == (float *)NULL) {
+      fprintf(stderr,"Error: allocating for solution times\n");
+      return(Z_ERR);
+    }
+    else {
+      err = USERD_get_solution_times(sol_times);
+      if(err == Z_ERR) {
+        fprintf(stderr,"Error: getting solution times\n");
+        return(Z_ERR);
+      }
+      else {
+        for(i=0; i<Num_time_steps; ++i) {
+          fprintf(stderr,"   At step %d, time = %f\n",i,sol_times[i]);
+        }
+      }
+    }
+    free(sol_times);
+  }
+
+#endif
+
+  return(Z_OK);
+}
+
+
+
+/*----------------
+ * part_build_info
+ *----------------*/
+static int
+part_build_info(int geom_time_step)
+{
+  int i, j;
+  int fn;
+  int err;
+  int num_dataset_files;
+  int geom_time_set;
+  Z_QFILES *qfiles;
+  char line1[Z_BUFL];
+  char line2[Z_BUFL];
+
+  int *part_ids;
+  int *part_types;
+  int *number_of_nodes;
+  int **num_elems;
+  int **ijk_dimensions;
+  int **iblanking_options;
+  char **part_descriptions;
+  
+  int ghosts_in_block;
+
+  int *max_num_nodes;
+  int **max_num_elems;
+  int **max_ijk_dimensions;
+  float extents[6];
+
+
+  fprintf(stderr,"\n------------ part_build_info ------------\n");
+
+#if (defined GT_USERD_API_100)
+
+  /* Get the timeset used for the geometry
+   *--------------------------------------*/
+  geom_time_set = USERD_get_geom_timeset_number();
+
+  /* Get the number of time steps for this timeset
+   *----------------------------------------------*/
+  Num_time_steps = USERD_get_num_of_time_steps(geom_time_set);
+  if(Num_time_steps < 1) {
+    fprintf(stderr," Error: Number of time steps returned: %d\n",Num_time_steps);
+    fprintf(stderr," (Must be >0 to be okay)\n");
+    return(Z_ERR);
+  }
+  if(geom_time_step > (Num_time_steps - 1)) {
+    geom_time_step = Num_time_steps - 1;
+  }
+
+  /* Set the timeset and step - to first step
+   *-----------------------------------------*/
+  USERD_set_time_set_and_step(geom_time_set,geom_time_step);
+
+#else
+
+  /* Set the time step - to first step
+   *----------------------------------*/
+  USERD_set_time_step(geom_time_step);
+
+#endif
+
+  /* Get the changing geometry status
+   *---------------------------------*/
+  Geom_status = USERD_get_changing_geometry_status();
+  if(Geom_status == Z_STATIC) {
+    fprintf(stderr," Geom changing status: Z_STATIC\n");
+  }
+  else if(Geom_status == Z_CHANGE_COORDS) {
+    fprintf(stderr," Geom changing status: Z_CHANGE_COORDS\n");
+  }
+  else if(Geom_status == Z_CHANGE_CONN) {
+    fprintf(stderr," Geom changing status: Z_CHANGE_CONN\n");
+  }
+  else {
+    fprintf(stderr," Invalid Geom changing status!!\n");
+  }
+
+  
+  /* Get the node label status
+   *--------------------------*/
+  Node_labels = USERD_get_node_label_status();
+  if(Node_labels) {
+    fprintf(stderr," Node labels will be provided\n");
+  }
+  else {
+    fprintf(stderr," Node labels will NOT be provided\n");
+  }
+
+  /* Get the element label status
+   *-----------------------------*/
+  Element_labels = USERD_get_element_label_status();
+  if(Element_labels) {
+    fprintf(stderr," Element labels will be provided\n");
+  }
+  else {
+    fprintf(stderr," Element labels will NOT be provided\n");
+  }
+
+  fprintf(stderr,"\n");
+
+  /* Get the number of files in the dataset
+   *---------------------------------------*/
+  num_dataset_files = USERD_get_number_of_files_in_dataset();
+  fprintf(stderr," Number of files in dataset: %d\n",num_dataset_files);
+
+
+  /* Get the dataset query file info
+   *--------------------------------*/
+  if(num_dataset_files > 0) {
+
+    qfiles = (Z_QFILES *) calloc(num_dataset_files,sizeof(Z_QFILES));
+    if(qfiles == (Z_QFILES *)NULL) {
+      fprintf(stderr,"Error: allocating for dataset query files\n");
+      return(Z_ERR);
+    }
+    else {
+
+      for(i=0; i<num_dataset_files; ++i) {
+        qfiles[i].f_desc = (char **) calloc(10,sizeof(char *));
+        if(qfiles[i].f_desc == (char **)NULL) {
+          fprintf(stderr,"Error: allocating for dataset query descrip lines\n");
+          return(Z_ERR);
+        }
+        else {
+          for(j=0; j<10; ++j) {
+            qfiles[i].f_desc[j] = (char *) calloc(Z_MAXFILENP,sizeof(char));
+            if(qfiles[i].f_desc[j] == (char *)NULL) {
+              fprintf(stderr,"Error: allocating for dataset query descrip lines\n");
+              return(Z_ERR);
+            }
+          }
+        }
+      }
+
+      err = USERD_get_dataset_query_file_info(qfiles);
+      if(err == Z_OK) {
+        for(fn=0; fn<num_dataset_files; ++fn) {
+          fprintf(stderr," For dataset file %d:\n",fn);
+
+          fprintf(stderr,"   name:           %s\n",qfiles[fn].name);
+          fprintf(stderr,"   size:           %d\n",qfiles[fn].sizeb);
+          fprintf(stderr,"   time:           %s\n",qfiles[fn].timemod);
+          fprintf(stderr,"   num desc lines: %d\n",qfiles[fn].num_d_lines);
+          for(i=0; i<qfiles[fn].num_d_lines; ++i) {
+            fprintf(stderr,"    desc line %d: %s\n",i,qfiles[fn].f_desc[i]);
+          }
+        }
+      }
+      else {
+        fprintf(stderr,"Error: getting dataset query info\n");
+        return(Z_ERR);
+      }
+    }
+
+    /* Free allocated memory
+     *----------------------*/
+    for(i=0; i<num_dataset_files; ++i) {
+      for(j=0; j<10; ++j) {
+        free(qfiles[i].f_desc[j]);
+      }
+      free(qfiles[i].f_desc);
+    }
+    free(qfiles);
+  }
+
+  fprintf(stderr,"\n-----------------------------------------\n");
+
+#if (defined GT_USERD_API_100)
+
+  /* Get the geometry description lines
+   *-----------------------------------*/
+  err = USERD_get_descrip_lines(Z_GEOM,0,FALSE,line1,line2);
+  if(err == Z_OK) {
+    fprintf(stderr," Geom Desc line1: %s\n",line1);
+    fprintf(stderr," Geom Desc line2: %s\n",line2);
+  }
+  else {
+    fprintf(stderr,"Error: getting geom description lines\n");
+    return(Z_ERR);
+  }
+
+#else
+
+  /* Get the geometry description lines
+   *-----------------------------------*/
+  err = USERD_get_description_lines(Z_GEOM,0,line1,line2);
+  if(err == Z_OK) {
+    fprintf(stderr," Geom Desc line1: %s\n",line1);
+    fprintf(stderr," Geom Desc line2: %s\n",line2);
+  }
+  else {
+    fprintf(stderr,"Error: getting geom description lines\n");
+    return(Z_ERR);
+  }
+
+#endif
+
+  /* Get the number of model parts
+   *------------------------------*/
+  Num_parts = USERD_get_number_of_model_parts();
+  if(Num_parts > 0) {
+    fprintf(stderr," Number of parts: %d\n",Num_parts);
+  }
+  else {
+    fprintf(stderr," Problems getting number of parts\n");
+    return(Z_ERR);
+  }
+
+  
+
+  /* Get the gold part build info
+   *-----------------------------*/
+  Pbuild = (BUILDINFO *) calloc(Num_parts,sizeof(BUILDINFO));
+  if(Pbuild == (BUILDINFO *)NULL) {
+    fprintf(stderr," Problems allocating for Pbuild structure\n");
+    return(Z_ERR);
+  }
+
+
+  part_ids = (int *) calloc(Num_parts,sizeof(int));
+  if(part_ids == (int *)NULL) {
+    fprintf(stderr," Problems allocating for part ids\n");
+    return(Z_ERR);
+  }
+
+  part_types = (int *) calloc(Num_parts,sizeof(int));
+  if(part_types == (int *)NULL) {
+    fprintf(stderr," Problems allocating for part types\n");
+    return(Z_ERR);
+  }
+
+  part_descriptions = (char **) calloc(Num_parts,sizeof(char *));
+  if(part_descriptions == (char **)NULL) {
+    fprintf(stderr," Problems allocating for part descriptions\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_parts; ++i) {
+      part_descriptions[i] = (char *) calloc(Z_BUFL,sizeof(char));
+      if(part_descriptions[i] == (char *)NULL) {
+        fprintf(stderr," Problems allocating for part descriptions\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  number_of_nodes = (int *) calloc(Num_parts,sizeof(int));
+  if(number_of_nodes == (int *)NULL) {
+    fprintf(stderr," Problems allocating for part number of nodes\n");
+    return(Z_ERR);
+  }
+
+  num_elems = (int **) calloc(Num_parts,sizeof(int *));
+  if(num_elems == (int **)NULL) {
+    fprintf(stderr," Problems allocating for part number of elements\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_parts; ++i) {
+      num_elems[i] = (int *) calloc(Z_MAXTYPE,sizeof(int));
+      if(num_elems[i] == (int *)NULL) {
+        fprintf(stderr," Problems allocating for part number of elements\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  ijk_dimensions = (int **) calloc(Num_parts,sizeof(int *));
+  if(ijk_dimensions == (int **)NULL) {
+    fprintf(stderr," Problems allocating for part ijk dimensions\n");
+    return(Z_ERR);
+  }
+  else {
+
+#if (defined GT_USERD_API_202)
+    for(i=0; i<Num_parts; ++i) {
+      ijk_dimensions[i] = (int *) calloc(9,sizeof(int));
+      if(ijk_dimensions[i] == (int *)NULL) {
+        fprintf(stderr," Problems allocating for part ijk dimensions\n");
+        return(Z_ERR);
+      }
+      else {
+        for(j=0; j<9; ++j) {
+          ijk_dimensions[i][j] = -1;
+        }
+      }
+    }
+#else
+    for(i=0; i<Num_parts; ++i) {
+      ijk_dimensions[i] = (int *) calloc(3,sizeof(int));
+      if(ijk_dimensions[i] == (int *)NULL) {
+        fprintf(stderr," Problems allocating for part ijk dimensions\n");
+        return(Z_ERR);
+      }
+    }
+#endif
+  }
+
+  iblanking_options = (int **) calloc(Num_parts,sizeof(int *));
+  if(iblanking_options == (int **)NULL) {
+    fprintf(stderr," Problems allocating for part iblanking options\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_parts; ++i) {
+      iblanking_options[i] = (int *) calloc(6,sizeof(int));
+      if(iblanking_options[i] == (int *)NULL) {
+        fprintf(stderr," Problems allocating for part iblanking options\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+
+#if (defined GT_USERD_API_100)
+
+  err = USERD_get_gold_part_build_info(part_ids,
+                                       part_types,
+                                       part_descriptions,
+                                       number_of_nodes,
+                                       num_elems,
+                                       ijk_dimensions,
+                                       iblanking_options);
+#else
+
+  err = USERD_get_part_build_info(part_ids,
+                                  part_types,
+                                  part_descriptions,
+                                  num_elems,
+                                  ijk_dimensions,
+                                  iblanking_options);
+
+#endif
+
+  if(err == Z_ERR) {
+    fprintf(stderr," Problems getting part build info\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_parts; ++i) {
+      fprintf(stderr," For part %d:\n",i+1);
+
+      fprintf(stderr,"   part id:   %d\n",part_ids[i]);
+      Pbuild[i].id = part_ids[i];
+
+      if(part_types[i] == Z_UNSTRUCTURED) {
+        fprintf(stderr,"   part type: Z_UNSTRUCTURED\n");
+      }
+      else if(part_types[i] == Z_STRUCTURED) {
+        fprintf(stderr,"   part type: Z_STRUCTURED\n");
+      }
+      else if(part_types[i] == Z_IBLANKED) {
+        fprintf(stderr,"   part type: Z_IBLANKED\n");
+      }
+      else {
+        fprintf(stderr,"   Invalid part type\n");
+        return(Z_ERR);
+      }
+      Pbuild[i].type = part_types[i];
+
+      fprintf(stderr,"   part desc:   %s\n",part_descriptions[i]);
+      strncpy(Pbuild[i].desc,part_descriptions[i],Z_BUFL);
+
+#if (defined GT_USERD_API_100)
+      fprintf(stderr,"   number of nodes :   %d\n",number_of_nodes[i]);
+      Pbuild[i].nn = number_of_nodes[i];
+#else
+      Pbuild[i].nn = USERD_get_number_of_global_nodes();
+#endif
+
+      for(j=0; j<Z_MAXTYPE; ++j) {
+        if(num_elems[i][j] > 0) {
+          fprintf(stderr,"   # %s elements:   %d\n",
+                  Elem_info[j].name,num_elems[i][j]);
+          Pbuild[i].ne[j] = num_elems[i][j];
+        }
+      }
+
+      if(part_types[i] != Z_UNSTRUCTURED) {
+
+        /* For this checker, we will place the following in the
+         * Pbuild[].ne[] structure:
+         *
+         *   Note this can be used for block size whether ranges or not
+         *   -------------------------------------------------------------
+         *   Pbuild[].ne[0] = i dim of current block (to the range selected)
+         *   Pbuild[].ne[1] = j dim of current block (to the range selected)
+         *   Pbuild[].ne[2] = k dim of current block (to the range selected)
+         *
+         *   Thus if ranges:
+         *   ---------------
+         *   Pbuild[].ne[3] = i min range          (-1 indicates no ranges)
+         *   Pbuild[].ne[4] = i max range
+         *   Pbuild[].ne[5] = i min range
+         *   Pbuild[].ne[6] = i max range
+         *   Pbuild[].ne[7] = i min range
+         *   Pbuild[].ne[8] = i max range
+         *
+         *   Pbuild[].ne[9]  = i dim of total block (if ranges)
+         *   Pbuild[].ne[10] = j dim of total block (if ranges)
+         *   Pbuild[].ne[11] = k dim of total block (if ranges)
+         *
+         *   What comes back from the api is:
+         *   --------------------------------
+         *   before 2.03 (no ranges)
+         *   -----------------------
+         *   ijk_dimensions[][0] = i dim of block
+         *   ijk_dimensions[][1] = j dim of block
+         *   ijk_dimensions[][2] = k dim of block
+         *
+         *   at 2.03 (if no ranges)
+         *   -------
+         *   ijk_dimensions[][0] = i dim of block
+         *   ijk_dimensions[][1] = j dim of block
+         *   ijk_dimensions[][2] = k dim of block
+         *   ijk_dimensions[][3] = -1
+         *
+         *   at 2.03 (if ranges)
+         *   -------
+         *   ijk_dimensions[][0] = i dim of total block
+         *   ijk_dimensions[][1] = j dim of total block
+         *   ijk_dimensions[][2] = k dim of total block
+         *   ijk_dimensions[][3] = i min range
+         *   ijk_dimensions[][4] = i max range
+         *   ijk_dimensions[][5] = j min range
+         *   ijk_dimensions[][6] = j max range
+         *   ijk_dimensions[][7] = k min range
+         *   ijk_dimensions[][8] = k max range
+         *--------------------------------------------------------------*/
+
+#if (defined GT_USERD_API_202)
+        if(ijk_dimensions[i][3] == -1) {
+          fprintf(stderr,"   ijk_dimensions: %d %d %d\n",
+                  ijk_dimensions[i][0],
+                  ijk_dimensions[i][1],
+                  ijk_dimensions[i][2]);
+          Pbuild[i].ne[0] = ijk_dimensions[i][0];
+          Pbuild[i].ne[1] = ijk_dimensions[i][1];
+          Pbuild[i].ne[2] = ijk_dimensions[i][2];
+          Pbuild[i].ne[3] = ijk_dimensions[i][3];
+        }
+        else {
+
+          /* If empty part
+           *--------------*/
+          if(ijk_dimensions[i][0] == 0 &&
+             ijk_dimensions[i][1] == 0 &&
+             ijk_dimensions[i][2] == 0) {
+            fprintf(stderr,"   ijk_dimensions: %d %d %d\n",
+                    ijk_dimensions[i][0],
+                    ijk_dimensions[i][1],
+                    ijk_dimensions[i][2]);
+            Pbuild[i].ne[0] = ijk_dimensions[i][0];
+            Pbuild[i].ne[1] = ijk_dimensions[i][1];
+            Pbuild[i].ne[2] = ijk_dimensions[i][2];
+            Pbuild[i].ne[3] = -1;
+          }
+
+          /* range part
+           *-----------*/
+          else {
+            Pbuild[i].ne[0] = ijk_dimensions[i][4] - ijk_dimensions[i][3] + 1;
+            Pbuild[i].ne[1] = ijk_dimensions[i][6] - ijk_dimensions[i][5] + 1;
+            Pbuild[i].ne[2] = ijk_dimensions[i][8] - ijk_dimensions[i][7] + 1;
+
+            Pbuild[i].ne[3] = ijk_dimensions[i][3];
+            Pbuild[i].ne[4] = ijk_dimensions[i][4];
+            Pbuild[i].ne[5] = ijk_dimensions[i][5];
+            Pbuild[i].ne[6] = ijk_dimensions[i][6];
+            Pbuild[i].ne[7] = ijk_dimensions[i][7];
+            Pbuild[i].ne[8] = ijk_dimensions[i][8];
+
+            Pbuild[i].ne[9] = ijk_dimensions[i][0];
+            Pbuild[i].ne[10] = ijk_dimensions[i][1];
+            Pbuild[i].ne[11] = ijk_dimensions[i][2];
+
+            fprintf(stderr,"   Part has ranges:\n");
+            fprintf(stderr,"   ijk dimensions of total block: %d %d %d\n",
+                    Pbuild[i].ne[9],
+                    Pbuild[i].ne[10],
+                    Pbuild[i].ne[11]);
+            fprintf(stderr,"     i range: %d  to  %d\n",
+                    Pbuild[i].ne[3],
+                    Pbuild[i].ne[4]);
+            fprintf(stderr,"     j range: %d  to  %d\n",
+                    Pbuild[i].ne[5],
+                    Pbuild[i].ne[6]);
+            fprintf(stderr,"     k range: %d  to  %d\n",
+                    Pbuild[i].ne[7],
+                    Pbuild[i].ne[8]);
+            fprintf(stderr,"   ijk dimensions of range portion: %d %d %d\n",
+                    Pbuild[i].ne[0],
+                    Pbuild[i].ne[1],
+                    Pbuild[i].ne[2]);
+          }
+        }
+#else
+        fprintf(stderr,"   ijk_dimensions: %d %d %d\n",
+                ijk_dimensions[i][0],
+                ijk_dimensions[i][1],
+                ijk_dimensions[i][2]);
+        Pbuild[i].ne[0] = ijk_dimensions[i][0];
+        Pbuild[i].ne[1] = ijk_dimensions[i][1];
+        Pbuild[i].ne[2] = ijk_dimensions[i][2];
+        Pbuild[i].ne[3] = -1;
+#endif
+        if(part_types[i] == Z_IBLANKED) {
+          fprintf(stderr,"   Ibanking options on:\n");
+          if(iblanking_options[i][Z_EXT]) {
+            fprintf(stderr,"     Z_EXT\n");
+          }
+          if(iblanking_options[i][Z_INT]) {
+            fprintf(stderr,"     Z_INT\n");
+          }
+          if(iblanking_options[i][Z_BND]) {
+            fprintf(stderr,"     Z_BND\n");
+          }
+          if(iblanking_options[i][Z_INTBND]) {
+            fprintf(stderr,"     Z_INTBND\n");
+          }
+          if(iblanking_options[i][Z_SYM]) {
+            fprintf(stderr,"     Z_SYM\n");
+          }
+        }
+      }
+    }
+  }
+
+
+#if (defined GT_USERD_API_200)
+
+  /* Get ghosts in model flag
+   *-------------------------*/
+  Ghosts_in_model = USERD_get_ghosts_in_model_flag();
+  if(Ghosts_in_model) {
+    fprintf(stderr," Ghosts in Model:  TRUE\n");
+  }
+  else {
+    fprintf(stderr," Ghosts in Model:  FALSE\n");
+  }
+
+  /* Get ghosts in block flag - if needed
+   *-------------------------------------*/
+  for(i=1; i<=Num_parts; ++i) {
+    if(part_types[i-1] != Z_UNSTRUCTURED && Ghosts_in_model) {
+      ghosts_in_block = USERD_get_ghosts_in_block_flag(i);
+      Pbuild[i-1].ghosts = ghosts_in_block;
+      if(ghosts_in_block) {
+        fprintf(stderr," Ghosts in block part %d:  TRUE\n",i);
+      }
+      else {
+        fprintf(stderr," Ghosts in block part %d:  FALSE\n",i);
+      }
+    }
+  }
+
+#endif
+
+
+#if (defined GT_USERD_API_100)
+
+  /* Get maxsize info
+   *-----------------*/
+  max_num_nodes = (int *) calloc(Num_parts,sizeof(int));
+  if(max_num_nodes == (int *)NULL) {
+    fprintf(stderr," Problems allocating for part max num of nodes\n");
+    return(Z_ERR);
+  }
+
+  max_num_elems = (int **) calloc(Num_parts,sizeof(int *));
+  if(max_num_elems == (int **)NULL) {
+    fprintf(stderr," Problems allocating for part max num of elements\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_parts; ++i) {
+      max_num_elems[i] = (int *) calloc(Z_MAXTYPE,sizeof(int));
+      if(max_num_elems[i] == (int *)NULL) {
+        fprintf(stderr," Problems allocating for part max_num of elements\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  max_ijk_dimensions = (int **) calloc(Num_parts,sizeof(int *));
+  if(max_ijk_dimensions == (int **)NULL) {
+    fprintf(stderr," Problems allocating for part max ijk dimensions\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_parts; ++i) {
+      max_ijk_dimensions[i] = (int *) calloc(3,sizeof(int));
+      if(max_ijk_dimensions[i] == (int *)NULL) {
+        fprintf(stderr," Problems allocating for part max ijk dimensions\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  err = USERD_get_maxsize_info(max_num_nodes,
+                               max_num_elems,
+                               max_ijk_dimensions);
+  if(err == Z_ERR) {
+    fprintf(stderr," No maxsize info provided (or error getting them)\n");
+  }
+  else {
+
+    for(i=0; i<Num_parts; ++i) {
+      fprintf(stderr," For part %d:\n",i+1);
+
+      fprintf(stderr,"   max number of nodes :   %d\n",max_num_nodes[i]);
+
+      for(j=0; j<Z_MAXTYPE; ++j) {
+        if(max_num_elems[i][j] > 0) {
+          fprintf(stderr,"   max # %s elems:   %d\n",
+                  Elem_info[j].name,max_num_elems[i][j]);
+        }
+      }
+
+      if(part_types[i] != Z_UNSTRUCTURED) {
+        fprintf(stderr,"   max_ijk_dimensions: %d %d %d\n",
+                max_ijk_dimensions[i][0],
+                max_ijk_dimensions[i][1],
+                max_ijk_dimensions[i][2]);
+      }
+    }
+  }
+
+  /* Get model extents - if given
+   *-----------------------------*/
+  err = USERD_get_model_extents(extents);
+  if(err == Z_ERR) {
+    fprintf(stderr," No extents given\n");
+  }
+  else {
+    fprintf(stderr," Min x: %g\n",extents[0]);
+    fprintf(stderr," Max x: %g\n",extents[1]);
+    fprintf(stderr," Min y: %g\n",extents[2]);
+    fprintf(stderr," Max y: %g\n",extents[3]);
+    fprintf(stderr," Min z: %g\n",extents[4]);
+    fprintf(stderr," Max z: %g\n",extents[5]);
+  }
+
+#endif
+
+  /* Free the allocated memory
+   *--------------------------*/
+  free(part_ids);
+  free(part_types);
+  free(number_of_nodes);
+
+  for(i=0; i<Num_parts; ++i) {
+    free(ijk_dimensions[i]);
+    free(num_elems[i]);
+    free(part_descriptions[i]);
+  }
+  free(ijk_dimensions);
+  free(num_elems);
+  free(iblanking_options);
+  free(part_descriptions);
+
+#if (defined GT_USERD_API_100)
+  for(i=0; i<Num_parts; ++i) {
+    free(max_ijk_dimensions[i]);
+    free(max_num_elems[i]);
+  }
+  free(max_num_nodes);
+  free(max_num_elems);
+  free(max_ijk_dimensions);
+
+#endif
+
+  return(Z_OK);
+}
+
+
+/*--------------
+ * variable_info
+ *--------------*/
+static int
+variable_info( void )
+{
+  int i,j;
+  int err;
+
+  char **var_description;
+  char **var_filename;
+  int *var_type;
+  int *var_classify;
+  int *var_complex;
+  char **var_ifilename;
+  float *var_freq;
+  int *var_contran;
+  int *var_timeset;
+
+
+  fprintf(stderr,"\n------------ variable_info --------------\n");
+
+  /* Get the number of variables
+   *----------------------------*/
+  Num_vars = USERD_get_number_of_variables();
+  if(Num_vars < 0) {
+    fprintf(stderr,"Error: getting the number of variables\n");
+  }
+  else {
+    fprintf(stderr," Number of variables: %d\n",Num_vars);
+  }
+
+
+  /* Get the gold variable info
+   *---------------------------*/
+  Varinfo = (VARINFO *) calloc(Num_vars,sizeof(VARINFO));
+  if(Varinfo == (VARINFO *)NULL) {
+    fprintf(stderr," Problems allocating for Varinfo structure\n");
+    return(Z_ERR);
+  }
+
+
+  var_description = (char **) calloc(Num_vars,sizeof(char *));
+  if(var_description == (char **)NULL) {
+    fprintf(stderr," Problems allocating for var description\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_vars; ++i) {
+      var_description[i] = (char *) calloc(Z_BUFL,sizeof(char));
+      if(var_description[i] == (char *)NULL) {
+        fprintf(stderr," Problems allocating for var description\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  var_filename = (char **) calloc(Num_vars,sizeof(char *));
+  if(var_filename == (char **)NULL) {
+    fprintf(stderr," Problems allocating for var filename\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_vars; ++i) {
+      var_filename[i] = (char *) calloc(Z_BUFL,sizeof(char));
+      if(var_filename[i] == (char *)NULL) {
+        fprintf(stderr," Problems allocating for var filename\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  var_type = (int *) calloc(Num_vars,sizeof(int));
+  if(var_type == (int *)NULL) {
+    fprintf(stderr," Problems allocating for var type\n");
+    return(Z_ERR);
+  }
+
+  var_classify = (int *) calloc(Num_vars,sizeof(int));
+  if(var_classify == (int *)NULL) {
+    fprintf(stderr," Problems allocating for var classify\n");
+    return(Z_ERR);
+  }
+
+  var_complex = (int *) calloc(Num_vars,sizeof(int));
+  if(var_complex == (int *)NULL) {
+    fprintf(stderr," Problems allocating for var complex\n");
+    return(Z_ERR);
+  }
+
+
+  var_ifilename = (char **) calloc(Num_vars,sizeof(char *));
+  if(var_ifilename == (char **)NULL) {
+    fprintf(stderr," Problems allocating for var ifilename\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_vars; ++i) {
+      var_ifilename[i] = (char *) calloc(Z_BUFL,sizeof(char));
+      if(var_ifilename[i] == (char *)NULL) {
+        fprintf(stderr," Problems allocating for var ifilename\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  var_freq = (float *) calloc(Num_vars,sizeof(float));
+  if(var_freq == (float *)NULL) {
+    fprintf(stderr," Problems allocating for var freq\n");
+    return(Z_ERR);
+  }
+
+  var_contran = (int *) calloc(Num_vars,sizeof(int));
+  if(var_contran == (int *)NULL) {
+    fprintf(stderr," Problems allocating for var contran\n");
+    return(Z_ERR);
+  }
+
+  var_timeset = (int *) calloc(Num_vars,sizeof(int));
+  if(var_timeset == (int *)NULL) {
+    fprintf(stderr," Problems allocating for var timeset\n");
+    return(Z_ERR);
+  }
+
+#if (defined GT_USERD_API_100)
+
+  err = USERD_get_gold_variable_info(var_description,
+                                     var_filename,
+                                     var_type,
+                                     var_classify,
+                                     var_complex,
+                                     var_ifilename,
+                                     var_freq,
+                                     var_contran,
+                                     var_timeset);
+#else
+
+  err = USERD_get_variable_info(var_description,
+                                var_filename,
+                                var_type,
+                                var_classify);
+
+#endif
+
+  if(err == Z_ERR) {
+    fprintf(stderr,"Error: getting variable info\n");
+  }
+  else {
+    for(i=0; i<Num_vars; ++i) {
+
+      /* Loading the global
+       * (for use in other routines)
+       *----------------------------*/
+      strncpy(Varinfo[i].description,var_description[i],Z_BUFL);
+      strncpy(Varinfo[i].filename,var_filename[i],Z_BUFL);
+      strncpy(Varinfo[i].ifilename,var_ifilename[i],Z_BUFL);
+      Varinfo[i].type     = var_type[i];
+      Varinfo[i].classify = var_classify[i];
+      Varinfo[i].complex  = var_complex[i];
+      Varinfo[i].freq     = var_freq[i];
+      Varinfo[i].contran  = var_contran[i];
+      Varinfo[i].timeset  = var_timeset[i];
+
+      /* Echo some feedback
+       *-------------------*/
+      fprintf(stderr," For Variable %d:\n",i+1);
+
+      fprintf(stderr,"   var desc:      %s\n",var_description[i]);
+      fprintf(stderr,"   var filename:  %s\n",var_filename[i]);
+
+#if (defined GT_USERD_API_100)
+      if(var_complex[i]) {
+        fprintf(stderr,"   var complex:   TRUE\n");
+        fprintf(stderr,"   var ifilename: %s\n",var_ifilename[i]);
+        fprintf(stderr,"   var freq:      %g\n",var_freq[i]);
+      }
+      else {
+        fprintf(stderr,"   var complex:   FALSE\n");
+      }
+#endif
+
+      if(var_type[i] == Z_CONSTANT) {
+        fprintf(stderr,"   var type:      Z_CONSTANT\n");
+
+#if (defined GT_USERD_API_100)
+        if(var_contran[i]) {
+          fprintf(stderr,"   var contran:  TRUE\n");
+        }
+        else {
+          fprintf(stderr,"   var contran:  FALSE\n");
+        }
+#endif
+
+      }
+      else if(var_type[i] == Z_SCALAR) {
+        fprintf(stderr,"   var type:      Z_SCALAR\n");
+      }
+      else if(var_type[i] == Z_VECTOR) {
+        fprintf(stderr,"   var type:      Z_VECTOR\n");
+      }
+      else if(var_type[i] == Z_TENSOR) {
+        fprintf(stderr,"   var type:      Z_TENSOR\n");
+      }
+      else if(var_type[i] == Z_TENSOR9) {
+        fprintf(stderr,"   var type:      Z_TENSOR9\n");
+      }
+      else {
+        fprintf(stderr,"   Invalid var type\n");
+        return(Z_ERR);
+      }
+
+      if(var_classify[i] == Z_PER_NODE) {
+        fprintf(stderr,"   var classify:  Z_PER_NODE\n");
+      }
+      else if(var_classify[i] == Z_PER_ELEM) {
+        fprintf(stderr,"   var classify:  Z_PER_ELEM\n");
+      }
+      else if(var_classify[i] != Z_CONSTANT) {
+        fprintf(stderr,"   Invalid var classify\n");
+        return(Z_ERR);
+      }
+
+#if (defined GT_USERD_API_100)
+      fprintf(stderr,"   var timeset:   %d\n",var_timeset[i]);
+#endif
+    }
+  }
+
+  /* Free the allocated memory
+   *--------------------------*/
+  for(i=0; i<Num_vars; ++i) {
+    free(var_description[i]);
+    free(var_filename[i]);
+    free(var_ifilename[i]);
+  }
+  free(var_description);
+  free(var_filename);
+  free(var_ifilename);
+  free(var_type);
+  free(var_classify);
+  free(var_complex);
+  free(var_freq);
+  free(var_contran);
+  free(var_timeset);
+
+  return(Z_OK);
+}
+
+
+#if (defined GT_USERD_API_100)
+/*------------------
+ * gold_part_builder
+ *------------------*/
+static int
+gold_part_builder(int geom_time_step)
+{
+  int i, j, k, jj, kk;
+  int err;
+  int geom_timeset;
+  int p, pn;
+  int et, ne;
+  int *elemids;
+  int **conns;
+  int nn;
+  int comp;
+  int bdim[3];
+  int ib[5];
+  int num_ghosts;
+  int num_dims;
+  int cell_type;
+  float mm[6];
+  float **coords;
+  int *nodeids;
+  int *iblanking;
+  int *ghost_flag;
+  short *parent_type;
+  int *parent_num;
+  int num_elems[Z_MAXTYPE];
+  CRD *crds;
+  int bd1,bd2,bd3;
+  int empty_part;
+  int *pdata;
+  int nsid_len;
+  int *nsid_con;
+  int nface_len;
+  int *nface_con;
+  int npf_len;
+  int *npf_con;
+  int maxcheck;
+  int num_failed = 0;
+  int *fail_flags = (int *) NULL;
+  float values[14], vals[10];
+  
+  fprintf(stderr,"\n------------- part_builder --------------\n");
+
+  if(Num_time_sets > 0) {
+    /* Get the timeset used for the geometry
+     *--------------------------------------*/
+    geom_timeset = USERD_get_geom_timeset_number();
+
+    /* Get the number of time steps for this timeset
+     *----------------------------------------------*/
+    Num_time_steps = USERD_get_num_of_time_steps(geom_timeset);
+    if(Num_time_steps < 1) {
+      fprintf(stderr," Error: Number of time steps returned: %d\n",Num_time_steps);
+      fprintf(stderr," (Must be >0 to be okay)\n");
+      return(Z_ERR);
+    }
+    if(geom_time_step > (Num_time_steps - 1)) {
+      geom_time_step = Num_time_steps - 1;
+    }
+
+    /* Set the timeset and step - to first step by default, but
+     * can set it at others using -gts command argument
+     *---------------------------------------------------------*/
+    USERD_set_time_set_and_step(geom_timeset,geom_time_step);
+
+    fprintf(stderr," Using timeset:   %d  (step range is %d through %d)\n",
+            geom_timeset,0,Num_time_steps-1);
+    fprintf(stderr," Using time step: %d\n",geom_time_step);
+  }
+
+  for(p=0; p<Num_parts; ++p) {
+    pn = p+1;
+
+    fprintf(stderr,"\n\n----------------------------------------");
+    fprintf(stderr," Part %d:\n",pn);
+
+    /*-----------------------
+     * For unstructured parts
+     *-----------------------*/
+    if(Pbuild[p].type == Z_UNSTRUCTURED) {
+
+      for(et=0; et<Z_MAXTYPE; ++et) {
+        ne = Pbuild[p].ne[et];
+
+        if(ne > 0) {
+
+          pdata = (int *)calloc(ne*Elem_info[et].con_len,sizeof(int));
+          if(pdata == (int *) NULL) {
+            fprintf(stderr,"Error: allocating conns array\n");
+            return(Z_ERR);
+          }
+          else {
+            conns = (int **) calloc(ne,sizeof(int *));
+            if(conns == (int **) NULL) {
+              fprintf(stderr,"Error: allocating conns array\n");
+              return(Z_ERR);
+            }
+            for(i=0; i<ne; ++i) {
+              conns[i] = pdata;
+              pdata += Elem_info[et].con_len;
+            }
+          }
+
+
+          /* Get the elements
+           *-----------------*/
+          err = USERD_get_part_elements_by_type(pn,et,conns);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting element connectivities\n");
+            return(Z_ERR);
+          }
+
+          if(Element_labels) {
+            elemids = (int *) calloc(ne,sizeof(int));
+            if(elemids == (int *) NULL) {
+              fprintf(stderr,"Error: allocating elemids array\n");
+              return(Z_ERR);
+            }
+          }
+
+          /* Get the element ids - if any
+           *-----------------------------*/
+          if(Element_labels) {
+            err = USERD_get_part_element_ids_by_type(pn,et,elemids);
+            if(err == Z_ERR) {
+              fprintf(stderr,"Error: getting element ids\n");
+              return(Z_ERR);
+            }
+          }
+
+          /* Echo "some" info
+           *-----------------*/
+
+#if (defined GT_USERD_API_202)
+
+          maxcheck = Z_NSIDED;
+
+          /* Nsided elements, if any
+           *------------------------*/
+          if(et == Z_NSIDED ||
+             et == Z_G_NSIDED) {
+
+            nsid_len = 0;
+            for(i=0; i<ne; ++i) {
+              nsid_len += conns[i][0];
+            }
+
+            nsid_con = (int *) calloc(nsid_len,sizeof(int));
+            if(nsid_con == (int *) NULL) {
+              fprintf(stderr,"Error: allocating nsided conn array\n");
+              return(Z_ERR);
+            }
+
+            err = USERD_get_nsided_conn(pn,nsid_con);
+            if(err == Z_ERR) {
+              fprintf(stderr,"Error: getting nsided conn array\n");
+              return(Z_ERR);
+            }
+            
+            /* First element of the type
+             *--------------------------*/
+            i = 0;
+            fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+            if(Element_labels) {
+              fprintf(stderr,"      id: %d\n",elemids[i]);
+            }
+            fprintf(stderr,"      connectivity:");
+            for(j=0; j<conns[i][0]; ++j) {
+              fprintf(stderr," %d",nsid_con[j]);
+            }
+            fprintf(stderr,"\n");
+            
+            /* Last element of the type
+             *-------------------------*/
+            i = ne - 1;
+            if(i > 0) {
+              fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+              if(Element_labels) {
+                fprintf(stderr,"      id: %d\n",elemids[i]);
+              }
+              fprintf(stderr,"      connectivity:");
+              
+              for(j=nsid_len-conns[i][0]; j<nsid_len; ++j) {
+                fprintf(stderr," %d",nsid_con[j]);
+              }
+              fprintf(stderr,"\n");
+            }
+          }
+
+          /* Nfaced elements if any
+           *-----------------------*/
+          if(et == Z_NFACED ||
+             et == Z_G_NFACED) {
+
+            nface_len = 0;
+            for(i=0; i<ne; ++i) {
+              nface_len += conns[i][0];
+            }
+
+            nface_con = (int *) calloc(nface_len,sizeof(int));
+            if(nface_con == (int *) NULL) {
+              fprintf(stderr,"Error: allocating nfaced face array\n");
+              return(Z_ERR);
+            }
+
+            err = USERD_get_nfaced_nodes_per_face(pn,nface_con);
+            if(err == Z_ERR) {
+              fprintf(stderr,"Error: getting nfaced face array array\n");
+              return(Z_ERR);
+            }
+
+            npf_len = 0;
+            for(i=0; i<nface_len; ++i) {
+              npf_len += nface_con[i];
+            }
+
+            npf_con = (int *) calloc(npf_len,sizeof(int));
+            if(npf_con == (int *) NULL) {
+              fprintf(stderr,"Error: allocating nfaced npf array\n");
+              return(Z_ERR);
+            }
+
+            err = USERD_get_nfaced_conn(pn,npf_con);
+            if(err == Z_ERR) {
+              fprintf(stderr,"Error: getting nfaced conn array\n");
+              return(Z_ERR);
+            }
+            
+            /* First element of the type
+             *--------------------------*/
+            jj = 0;
+            kk = 0;
+            for(i=0; i<ne; ++i) {
+
+              if(i == 0 ||
+                 i == ne-1) {
+                fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,
+                        i+1,ne);
+                if(Element_labels) {
+                  fprintf(stderr,"      id: %d\n",elemids[i]);
+                }
+                for(j=0; j<conns[i][0]; ++j) {
+                  fprintf(stderr,"      face %d connectivity:",j+1);
+                  for(k=0; k<nface_con[jj]; ++k) {
+                    fprintf(stderr," %d",npf_con[kk]);
+                    ++kk;
+                  }
+                  fprintf(stderr,"\n");
+                  ++jj;
+                }
+              }
+              else {
+                for(j=0; j<conns[i][0]; ++j) {
+                  for(k=0; k<nface_con[jj]; ++k) {
+                    ++kk;
+                  }
+                  ++jj;
+                }
+              }
+            }
+          }
+#else
+
+          maxcheck = Z_MAXTYPE;
+
+#endif
+
+          /* Regular elements
+           *-----------------*/
+          if(et < maxcheck) {
+
+            /* First element of the type
+             *--------------------------*/
+            i = 0;
+            fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+            if(Element_labels) {
+              fprintf(stderr,"      id: %d\n",elemids[i]);
+            }
+            fprintf(stderr,"      connectivity:");
+            for(j=0; j<Elem_info[et].con_len; ++j) {
+              fprintf(stderr," %d",conns[i][j]);
+            }
+            fprintf(stderr,"\n");
+
+	    /* check the connectivity for negative numbers
+	     * -------------------------------------------*/
+#if defined GT_USERD_API_100
+	    for (i=0;i<ne;i++){
+	      for(j=0; j<Elem_info[et].con_len; ++j) {
+		/* ---------- uncomment to print out connectivity values ---------- */
+/*  		fprintf(stderr," %d",conns[i][j]);  */
+		if (conns[i][j] <= 0 || conns[i][j] > Pbuild[p].nn ) {
+		  fprintf(stderr,"\n****************************\n");
+		  fprintf(stderr,"Connectivity value out of bounds: \n");
+		  fprintf(stderr,"Either less than zero or greater than \n");
+		  fprintf(stderr,"  number of nodes in part!!  \n");
+		  fprintf(stderr,"i = %d   j = %d  conns[i][j] = %d \n",i,j,conns[i][j]);
+		  fprintf(stderr,"****************************\n");
+		}
+	      }
+		/* ---------- uncomment to print out connectivity values ---------- */
+/* 	      fprintf(stderr,"\n"); */
+	    }
+#endif            
+            /* Last element of the type
+             *-------------------------*/
+            i = ne - 1;
+            if(i > 0) {
+              fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+              if(Element_labels) {
+                fprintf(stderr,"      id: %d\n",elemids[i]);
+              }
+              fprintf(stderr,"      connectivity:");
+              for(j=0; j<Elem_info[et].con_len; ++j) {
+                fprintf(stderr," %d",conns[i][j]);
+              }
+              fprintf(stderr,"\n");
+            }
+          }
+  
+          /* Free the allocated memory
+           *--------------------------*/
+          if(NULL != conns) {
+            if(NULL != *conns) {
+              free(*conns);
+              *conns = NULL;
+            }
+            free(conns);
+            conns = NULL;
+          }
+
+          if(Element_labels) {
+            free(elemids);
+          }
+        }
+      }
+
+      /* Get the coords
+       *---------------*/
+      nn = Pbuild[p].nn;
+
+      if(nn > 0) {
+
+        coords = (float **) calloc(3,sizeof(float *));
+        if(coords == (float **) NULL) {
+          fprintf(stderr,"Error: allocating coords array\n");
+          return(Z_ERR);
+        }
+        else {
+          for(i=0; i<3; ++i) {
+            coords[i] = (float *) calloc((nn+1),sizeof(float));
+            if(coords[i] == (float *) NULL) {
+              fprintf(stderr,"Error: allocating coords array\n");
+              return(Z_ERR);
+            }
+          }
+        }
+        
+        if(Node_labels) {
+          nodeids = (int *) calloc((nn+1),sizeof(int));
+          if(nodeids == (int *) NULL) {
+            fprintf(stderr,"Error: allocating nodeids array\n");
+            return(Z_ERR);
+          }
+        }
+
+
+        err = USERD_get_part_coords(pn,coords);
+        if(err == Z_ERR) {
+          fprintf(stderr,"Error: getting unstructured coords\n");
+          return(Z_ERR);
+        }
+
+        if(Node_labels) {
+          err = USERD_get_part_node_ids(pn,nodeids);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting nodeids\n");
+            return(Z_ERR);
+          }
+        }
+
+        /* Echo "some" info
+         *-----------------*/
+
+        /* First node
+         *-----------*/
+        i = 1;
+        fprintf(stderr,"   Node %d of %d:\n",i,nn);
+        if(Node_labels) {
+          fprintf(stderr,"      id: %d\n",nodeids[i]);
+        }
+        fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+                coords[0][i], coords[1][i], coords[2][i]);
+        mm[0] = mm[1] = coords[0][i];
+        mm[2] = mm[3] = coords[1][i];
+        mm[4] = mm[5] = coords[2][i];
+
+
+        /* Last node
+         *----------*/
+        i = nn;
+        if(i > 1) {
+          fprintf(stderr,"   Node %d of %d:\n",i,nn);
+          if(Node_labels) {
+            fprintf(stderr,"      id: %d\n",nodeids[i]);
+          }
+          fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+                  coords[0][i], coords[1][i], coords[2][i]);
+        }
+
+        /* Min and max coordinate values
+         *------------------------------*/
+        for(i=2; i<=nn; ++i) {
+          if(coords[0][i] < mm[0]) {
+            mm[0] = coords[0][i];
+          }
+          if(coords[0][i] > mm[1]) {
+            mm[1] = coords[0][i];
+          }
+          if(coords[1][i] < mm[2]) {
+            mm[2] = coords[1][i];
+          }
+          if(coords[1][i] > mm[3]) {
+            mm[3] = coords[1][i];
+          }
+          if(coords[2][i] < mm[4]) {
+            mm[4] = coords[2][i];
+          }
+          if(coords[2][i] > mm[5]) {
+            mm[5] = coords[2][i];
+          }
+        }
+
+        fprintf(stderr,"   Coordinate ranges:\n");
+        fprintf(stderr,"      min x: %g\n",mm[0]);
+        fprintf(stderr,"      max x: %g\n",mm[1]);
+        fprintf(stderr,"      min y: %g\n",mm[2]);
+        fprintf(stderr,"      max y: %g\n",mm[3]);
+        fprintf(stderr,"      min z: %g\n",mm[4]);
+        fprintf(stderr,"      max z: %g\n",mm[5]);
+
+
+        /* Free the allocated memory
+         *--------------------------*/
+        for(i=0; i<3; ++i) {
+          free(coords[i]);
+        }
+        free(coords);
+        if(Node_labels) {
+          free(nodeids);
+        }
+      }
+    }
+
+
+    /*---------------------
+     * For structured parts
+     *---------------------*/
+    else {
+
+      empty_part = FALSE;
+      if(Pbuild[p].ne[0] == 0 &&
+         Pbuild[p].ne[1] == 0 &&
+         Pbuild[p].ne[2] == 0) {
+        empty_part = TRUE;
+      }
+
+      if(!empty_part) {
+
+        /* Get the block coords
+         *---------------------*/
+        for(comp=0; comp<3; ++comp) {
+          if(Pbuild[p].ne[comp] < 1) {
+            bdim[comp] = 1;
+          }
+          else {
+
+            if(Doing_Structured_Cinching) {
+              bdim[comp] = Pbuild[p].ne[comp];
+
+              /* even */              
+              if((bdim[comp] % 2) == 0) {
+                bdim[comp] = (bdim[comp]/2) + 1;
+              }
+              /* odd */
+              else {
+                bdim[comp] = ((bdim[comp]-1)/2) + 1;
+              }
+            }
+
+            else {
+              bdim[comp] = Pbuild[p].ne[comp];
+            }
+          }
+        }
+
+        nn = bdim[0] * bdim[1] * bdim[2];
+        
+        bd1 = bdim[0]-1;
+        if(bd1 < 1) {
+          bd1 = 1;
+        }
+        bd2 = bdim[1]-1;
+        if(bd2 < 1) {
+          bd2 = 1;
+        }
+        bd3 = bdim[2]-1;
+        if(bd3 < 1) {
+          bd3 = 1;
+        }
+        ne = bd1 * bd2 * bd3;
+        
+        /* Determine cell type
+         *--------------------*/
+        num_dims = 3;
+        for(i=0; i<3; ++i) {
+          if(bdim[i] == 1) {
+            --num_dims;
+          }
+        }
+        if(num_dims == 3) {
+          cell_type = Z_HEX08;
+        }
+        else if(num_dims == 2) {
+          cell_type = Z_QUA04;
+        }
+        else {
+          cell_type = Z_BAR02;
+        }
+        
+        coords = (float **) calloc(num_dims,sizeof(float *));
+        if(coords == (float **) NULL) {
+          fprintf(stderr,"Error: allocating coords array\n");
+          return(Z_ERR);
+        }
+        else {
+          for(i=0; i<num_dims; ++i) {
+            coords[i] = (float *) calloc(nn,sizeof(float));
+            if(coords[i] == (float *) NULL) {
+              fprintf(stderr,"Error: allocating coords array\n");
+              return(Z_ERR);
+            }
+          }
+        }
+        
+        /* Get the coords
+         *---------------*/
+        for(comp=0; comp<num_dims; ++comp) {
+
+          /* For structured cinching, send in one less on each end and stride of 2
+           *----------------------------------------------------------------------*/
+          if(Doing_Structured_Cinching) {
+            err = USERD_set_block_range_and_stride(pn,
+                                                   0, Pbuild[p].ne[0]-1, 2,
+                                                   0, Pbuild[p].ne[1]-1, 2,
+                                                   0, Pbuild[p].ne[2]-1, 2);
+          }
+
+          err = USERD_get_block_coords_by_component(pn,comp,coords[comp]);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting block coords\n");
+            return(Z_ERR);
+          }
+        }
+        
+        
+#if (defined GT_USERD_API_200)
+        
+        if(Node_labels) {
+          nodeids = (int *) calloc(nn,sizeof(int));
+          if(nodeids == (int *) NULL) {
+            fprintf(stderr,"Error: allocating nodeids array\n");
+            return(Z_ERR);
+          }
+        }
+        /* Get the node ids - if any
+         *--------------------------*/
+        if(Node_labels) {
+          err = USERD_get_part_node_ids(pn,nodeids);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting nodeids\n");
+            return(Z_ERR);
+          }
+        }
+#endif
+
+        /* Echo "some" info
+         *-----------------*/
+        
+        /* First node
+         *-----------*/
+        if(nn > 0) {
+          i = 0;
+          fprintf(stderr,"   Node %d of %d:\n",i+1,nn);
+          
+#if (defined GT_USERD_API_200)
+          
+          if(Node_labels) {
+            fprintf(stderr,"      id: %d\n",nodeids[i]);
+          }
+#endif
+          if(num_dims == 3) {
+            fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+                    coords[0][i], coords[1][i], coords[2][i]);
+            mm[0] = mm[1] = coords[0][i];
+            mm[2] = mm[3] = coords[1][i];
+            mm[4] = mm[5] = coords[2][i];
+          }
+          else if(num_dims == 2) {
+            fprintf(stderr,"      x y coordinates: %g %g\n",
+                    coords[0][i], coords[1][i]);
+            mm[0] = mm[1] = coords[0][i];
+            mm[2] = mm[3] = coords[1][i];
+          }
+          else {
+            fprintf(stderr,"      x coordinates: %g\n",
+                    coords[0][i]);
+            mm[0] = mm[1] = coords[0][i];
+          }
+          
+          
+          /* Last node
+           *----------*/
+          i = nn-1;
+          if(i > 1) {
+            fprintf(stderr,"   Node %d of %d:\n",i+1,nn);
+            
+#if (defined GT_USERD_API_200)
+            if(Node_labels) {
+              fprintf(stderr,"      id: %d\n",nodeids[i]);
+            }
+#endif
+            if(num_dims == 3) {
+              fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+                      coords[0][i], coords[1][i], coords[2][i]);
+            }
+            else if(num_dims == 2) {
+              fprintf(stderr,"      x y coordinates: %g %g\n",
+                      coords[0][i], coords[1][i]);
+            }
+            else {
+              fprintf(stderr,"      x coordinates: %g\n",
+                      coords[0][i]);
+            }
+          }
+        }
+        
+        /* Min and max coordinate values
+         *------------------------------*/
+        for(i=1; i<nn; ++i) {
+          if(coords[0][i] < mm[0]) {
+            mm[0] = coords[0][i];
+          }
+          if(coords[0][i] > mm[1]) {
+            mm[1] = coords[0][i];
+          }
+          if(num_dims > 1) {
+            if(coords[1][i] < mm[2]) {
+              mm[2] = coords[1][i];
+            }
+            if(coords[1][i] > mm[3]) {
+              mm[3] = coords[1][i];
+            }
+          }
+          if(num_dims > 2) {
+            if(coords[2][i] < mm[4]) {
+              mm[4] = coords[2][i];
+            }
+            if(coords[2][i] > mm[5]) {
+              mm[5] = coords[2][i];
+            }
+          }
+        }
+        
+        fprintf(stderr,"   Coordinate ranges:\n");
+        fprintf(stderr,"      min x: %g\n",mm[0]);
+        fprintf(stderr,"      max x: %g\n",mm[1]);
+        if(num_dims > 1) {
+          fprintf(stderr,"      min y: %g\n",mm[2]);
+          fprintf(stderr,"      max y: %g\n",mm[3]);
+        }
+        if(num_dims > 2) {
+          fprintf(stderr,"      min z: %g\n",mm[4]);
+          fprintf(stderr,"      max z: %g\n",mm[5]);
+        }
+
+        /* Free the allocated memory - so far
+         *-----------------------------------*/
+        for(i=0; i<num_dims; ++i) {
+          free(coords[i]);
+        }
+        free(coords);
+
+#if (defined GT_USERD_API_200)
+        if(Node_labels) {
+          free(nodeids);
+        }
+#endif
+        
+        /* Get the block iblanking - if any
+         *---------------------------------*/
+        if(Pbuild[p].type == Z_IBLANKED) {
+
+          iblanking = (int *) calloc(nn,sizeof(int));
+          if(iblanking == (int *) NULL) {
+            fprintf(stderr,"Error: allocating iblanking array\n");
+            return(Z_ERR);
+          }
+
+          err = USERD_get_block_iblanking(pn,iblanking);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting block iblanking\n");
+            return(Z_ERR);
+          }
+
+          /* Echo "some" info
+           *-----------------*/
+          ib[Z_EXT]    = 0;
+          ib[Z_INT]    = 0;
+          ib[Z_BND]    = 0;
+          ib[Z_INTBND] = 0;
+          ib[Z_SYM]    = 0;
+          
+          for(i=0; i<nn; ++i) {
+            ++ib[iblanking[i]];
+          }
+
+          fprintf(stderr,"   Iblanking breakdown:\n");
+          fprintf(stderr,"      Number of Z_EXT:    %d\n",ib[Z_EXT]);
+          fprintf(stderr,"      Number of Z_INT:    %d\n",ib[Z_INT]);
+          fprintf(stderr,"      Number of Z_BND:    %d\n",ib[Z_BND]);
+          fprintf(stderr,"      Number of Z_INTBND: %d\n",ib[Z_INTBND]);
+          fprintf(stderr,"      Number of Z_SYM:    %d\n",ib[Z_SYM]);
+          
+          free(iblanking);
+        }
+
+#if (defined GT_USERD_API_200)
+
+        /* Get the ghost flags - if any
+         *-----------------------------*/
+        if(Pbuild[p].ghosts) {
+
+          ghost_flag = (int *) calloc(ne,sizeof(int));
+          if(ghost_flag == (int *) NULL) {
+            fprintf(stderr,"Error: allocating ghost_flag array\n");
+            return(Z_ERR);
+          }
+
+          err = USERD_get_block_ghost_flags(pn,ghost_flag);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting block ghost flags\n");
+            return(Z_ERR);
+          }
+
+          /* Echo "some" info
+           *-----------------*/
+          num_ghosts = 0;
+          
+          for(i=0; i<ne; ++i) {
+            if(ghost_flag[i] > 0) {
+              ++num_ghosts;
+            }
+          }
+          
+          fprintf(stderr,"   Block Ghost flag breakdown:\n");
+          fprintf(stderr,"      %d ghost cells out of %d total cells\n",
+                  num_ghosts,ne);
+          
+          free(ghost_flag);
+        }
+        
+        /* Get the element ids - if any
+         *-----------------------------*/
+        if(Element_labels) {
+
+          elemids = (int *) calloc(ne,sizeof(int));
+          if(elemids == (int *) NULL) {
+            fprintf(stderr,"Error: allocating elemids array\n");
+            return(Z_ERR);
+          }
+
+
+          et = cell_type;
+          err = USERD_get_part_element_ids_by_type(pn,et,elemids);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting element ids\n");
+            return(Z_ERR);
+          }
+
+          /* First element of the type
+           *--------------------------*/
+          i = 0;
+          fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+          fprintf(stderr,"      id: %d\n",elemids[i]);
+          
+          /* Last element of the type
+           *-------------------------*/
+          i = ne - 1;
+          if(i > 0) {
+            fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+            fprintf(stderr,"      id: %d\n",elemids[i]);
+          }
+
+          free(elemids);
+        }
+#endif
+      }
+      else {
+        fprintf(stderr,"   Empty structured part\n");
+      }
+    }
+
+    /* Get border availability
+     *------------------------*/
+    err = USERD_get_border_availability(pn,num_elems);
+    if(err == Z_OK) {
+
+      /* Get border elements - if any
+       *-----------------------------*/
+      for(et=0; et<Z_MAXTYPE; ++et) {
+        ne = num_elems[et];
+        if(ne > 0) {
+
+          conns = (int **) calloc(ne,sizeof(int *));
+          if(conns == (int **) NULL) {
+            fprintf(stderr,"Error: allocating border conns array\n");
+            return(Z_ERR);
+          }
+          else {
+            for(i=0; i<ne; ++i) {
+              conns[i] = (int *) calloc(Elem_info[et].con_len,sizeof(int));
+              if(conns[i] == (int *) NULL) {
+                fprintf(stderr,"Error: allocating border conns array\n");
+                return(Z_ERR);
+              }
+            }
+          }
+
+          parent_type = (short *) calloc(ne,sizeof(short));
+          if(parent_type == (short *) NULL) {
+            fprintf(stderr,"Error: allocating border parent_type array\n");
+            return(Z_ERR);
+          }
+
+          parent_num = (int *) calloc(ne,sizeof(int));
+          if(parent_num == (int *) NULL) {
+            fprintf(stderr,"Error: allocating border parent_num array\n");
+            return(Z_ERR);
+          }
+
+
+          err = USERD_get_border_elements_by_type(pn,
+                                                  et,
+                                                  conns,
+                                                  parent_type,
+                                                  parent_num);
+          if(err == Z_ERR) {
+            fprintf(stderr,"Error: getting border elements\n");
+            return(Z_ERR);
+          }
+
+
+          /* Echo "some" info
+           *-----------------*/
+
+          /* First element of the type
+           *--------------------------*/
+          i = 0;
+          fprintf(stderr,"   %s border element %d of %d:\n",
+                  Elem_info[et].name,i+1,ne);
+          fprintf(stderr,"      Parent type: %s\n",
+                  Elem_info[parent_type[i]].name);
+          fprintf(stderr,"      Parent num:  %d\n",parent_num[i]);
+          fprintf(stderr,"      connectivity:");
+          for(j=0; j<Elem_info[et].con_len; ++j) {
+            fprintf(stderr," %d",conns[i][j]);
+          }
+          fprintf(stderr,"\n");
+
+          /* Last element of the type
+           *-------------------------*/
+          i = ne - 1;
+          if(i > 0) {
+            fprintf(stderr,"   %s border element %d of %d:\n",
+                    Elem_info[et].name,i+1,ne);
+            fprintf(stderr,"      Parent type: %s\n",
+                    Elem_info[parent_type[i]].name);
+            fprintf(stderr,"      Parent num:  %d\n",parent_num[i]);
+            fprintf(stderr,"      connectivity:");
+            for(j=0; j<Elem_info[et].con_len; ++j) {
+              fprintf(stderr," %d",conns[i][j]);
+            }
+            fprintf(stderr,"\n");
+          }
+
+
+          /* Free the allocated memory
+           *--------------------------*/
+          for(i=0; i<ne; ++i) {
+            free(conns[i]);
+          }
+          free(conns);
+          free(parent_type);
+          free(parent_num);
+        }
+      }
+    }
+
+
+#if (defined GT_USERD_API_204)
+    /* See if any rigid body in model
+     *-------------------------------*/
+    if(Any_Rigid_Body_Present) {
+
+#if (defined GT_USERD_API_207)
+      if(USERD_rigidbody_values(pn,values) == Z_OK) {
+        fprintf(stderr,"      Rigid Body values:\n");
+        fprintf(stderr,"        IX = %g\n",values[0]);
+        fprintf(stderr,"        IY = %g\n",values[1]);
+        fprintf(stderr,"        IZ = %g\n",values[2]);
+        fprintf(stderr,"        E0 = %g\n",values[3]);
+        fprintf(stderr,"        E1 = %g\n",values[4]);
+        fprintf(stderr,"        E2 = %g\n",values[5]);
+        fprintf(stderr,"        E3 = %g\n",values[6]);
+        fprintf(stderr,"        XOFF = %g\n",values[7]);
+        fprintf(stderr,"        YOFF = %g\n",values[8]);
+        fprintf(stderr,"        ZOFF = %g\n",values[9]);
+        fprintf(stderr,"        ROT_ORDER = %g\n",values[10]);
+        fprintf(stderr,"        XROT = %g\n",values[11]);
+        fprintf(stderr,"        YROT = %g\n",values[12]);
+        fprintf(stderr,"        ZROT = %g\n",values[13]);
+      }
+#else
+      if(USERD_rigidbody_values(pn,vals) == Z_OK) {
+        fprintf(stderr,"      Rigid Body values:\n");
+        fprintf(stderr,"        IX = %g\n",vals[0]);
+        fprintf(stderr,"        IY = %g\n",vals[1]);
+        fprintf(stderr,"        IZ = %g\n",vals[2]);
+        fprintf(stderr,"        E0 = %g\n",vals[3]);
+        fprintf(stderr,"        E1 = %g\n",vals[4]);
+        fprintf(stderr,"        E2 = %g\n",vals[5]);
+        fprintf(stderr,"        E3 = %g\n",vals[6]);
+        fprintf(stderr,"        XOFF = %g\n",vals[7]);
+        fprintf(stderr,"        YOFF = %g\n",vals[8]);
+        fprintf(stderr,"        ZOFF = %g\n",vals[9]);
+      }
+#endif
+    }
+#endif
+
+  } /* end for p = 0 to Num_parts */
+
+  return(Z_OK);
+}
+
+
+/*----------------
+ * gold_var_loader
+ *----------------*/
+static int
+gold_var_loader(int var_time_step)
+{
+  int i, j;
+  int err;
+  int v, vn;
+  int var_timeset;
+  int p, pn;
+  int et, e1, e2;
+  int num_comps;
+  int num_dims;
+  int nsize;
+  int comp;
+  int bdim[3];
+  int ne;
+  int cell_type;
+  float constant_val;
+  char line1[Z_BUFL];
+  char line2[Z_BUFL];
+  float *values;
+  float minv,maxv;
+  int bd1,bd2,bd3;
+
+
+  fprintf(stderr,"\n--------------- var_loader --------------\n");
+
+  for(v=0; v<Num_vars; ++v) {
+    vn = v + 1;
+
+    if(v > 0) {
+      fprintf(stderr,"\n");
+    }
+    if(Varinfo[v].classify == Z_PER_NODE) {
+      fprintf(stderr," Z_PER_NODE Variable %d:\n",vn);
+    }
+    else {
+      fprintf(stderr," Z_PER_ELEM Variable %d:\n",vn);
+    }
+
+
+    if(Num_time_sets > 0) {
+      /* Get the timeset used for the variable
+       *---------------------------------------*/
+      var_timeset = Varinfo[v].timeset;
+      
+      /* Get the number of time steps for this timeset
+       *----------------------------------------------*/
+      Num_time_steps = USERD_get_num_of_time_steps(var_timeset);
+      if(Num_time_steps < 1) {
+        fprintf(stderr," Error: Number of time steps returned: %d\n",
+                Num_time_steps);
+        fprintf(stderr," (Must be >0 to be okay)\n");
+        return(Z_ERR);
+      }
+      if(var_time_step > (Num_time_steps - 1)) {
+        var_time_step = Num_time_steps - 1;
+      }
+      
+      /* Set the timeset and step - to first step by default, but
+       * can set it at others using -vts command argument
+       *---------------------------------------------------------*/
+      USERD_set_time_set_and_step(var_timeset,var_time_step);
+      
+      fprintf(stderr,"   Using timeset:   %d  (step range is %d through %d)\n",
+              var_timeset,0,Num_time_steps-1);
+      fprintf(stderr,"   Using time step: %d\n",var_time_step);
+    }
+
+
+    /* Constants
+     *----------*/
+    if(Varinfo[v].type == Z_CONSTANT) {
+
+      constant_val = USERD_get_constant_val(vn,FALSE);
+      fprintf(stderr,"   Constant (%s):\n",Varinfo[v].description);
+      fprintf(stderr,"     value: %g\n",constant_val);
+
+      if(Varinfo[v].complex) {
+        constant_val = USERD_get_constant_val(vn,TRUE);
+        fprintf(stderr,"   value (imag): %g\n",constant_val);
+      }
+    }
+
+    /* Scalars, Vectors, Tensors
+     *--------------------------*/
+    else {
+
+      /* Get the var description line
+       *-----------------------------*/
+      err = USERD_get_descrip_lines(Z_VARI,vn,FALSE,line1,line2);
+      if(err == Z_OK) {
+        fprintf(stderr,"   Desc line: %s\n",line1);
+      }
+      else {
+        fprintf(stderr,"Error: getting var description line\n");
+        return(Z_ERR);
+      }
+
+      if(Varinfo[v].complex) {
+        err = USERD_get_descrip_lines(Z_VARI,vn,TRUE,line1,line2);
+        if(err == Z_OK) {
+          fprintf(stderr,"   Desc line (imag): %s\n",line1);
+        }
+        else {
+          fprintf(stderr,"Error: getting var description line (imag)\n");
+          return(Z_ERR);
+        }
+      }
+
+
+      /* Get the values by component
+       *-----------------------------*/
+      if(Varinfo[v].type == Z_SCALAR) {
+        num_comps = 1;
+      }
+      else if(Varinfo[v].type == Z_VECTOR) {
+        num_comps = 3;
+      }
+      else if(Varinfo[v].type == Z_TENSOR) {
+        num_comps = 6;
+      }
+      else if(Varinfo[v].type == Z_TENSOR9) {
+        num_comps = 9;
+      }
+
+
+      /* Per_Node
+       *---------*/
+      if(Varinfo[v].classify == Z_PER_NODE) {
+
+        for(p=0; p<Num_parts; ++p) {
+          pn = p + 1;
+
+          if(Pbuild[p].type == Z_UNSTRUCTURED) {
+            nsize = Pbuild[p].nn;
+          }
+          else {
+            for(comp=0; comp<3; ++comp) {
+              if(Pbuild[p].ne[comp] < 1) {
+                bdim[comp] = 1;
+              }
+              else {
+
+                if(Doing_Structured_Cinching) {
+                  bdim[comp] = Pbuild[p].ne[comp];
+                  
+                  /* even */              
+                  if((bdim[comp] % 2) == 0) {
+                    bdim[comp] = (bdim[comp]/2) + 1;
+                  }
+                  /* odd */
+                  else {
+                    bdim[comp] = ((bdim[comp]-1)/2) + 1;
+                  }
+                }
+                
+                else {
+                  bdim[comp] = Pbuild[p].ne[comp];
+                }
+              }
+            }
+            nsize = bdim[0] * bdim[1] * bdim[2];
+
+            /* For structured cinching, send in one less on each end and stride of 2
+             *----------------------------------------------------------------------*/
+            if(Doing_Structured_Cinching) {
+              err = USERD_set_block_range_and_stride(pn,
+                                                     0, Pbuild[p].ne[0]-1, 2,
+                                                     0, Pbuild[p].ne[1]-1, 2,
+                                                     0, Pbuild[p].ne[2]-1, 2);
+            }
+          }
+
+
+          fprintf(stderr,"   For part %d, with %d nodes:\n",pn,nsize);
+
+          if(nsize > 0) {
+            values = (float *) calloc((nsize+1),sizeof(float));
+            if(values == (float *) NULL) {
+              fprintf(stderr,"Error: alocating variable values\n");
+              return(Z_ERR);
+            }
+
+            for(comp=0; comp<num_comps; ++comp) {
+
+              err = USERD_get_var_by_component(vn,
+                                               pn,
+                                               Varinfo[v].type,
+                                               0,
+                                               FALSE,
+                                               comp,
+                                               values);
+              if(err == Z_UNDEF) {
+                fprintf(stderr,"  Variable not defined on this part\n");
+              }
+
+
+              /* For the component, show 1st node, last node, min, max values
+               *-------------------------------------------------------------*/
+              minv = maxv = values[1];
+              for(i=2; i<=nsize; ++i) {
+                if(values[i] < minv) {
+                  minv = values[i];
+                }
+                if(values[i] > maxv) {
+                  maxv = values[i];
+                }
+              }
+              
+              fprintf(stderr,"     For component %d: \n",comp);
+              fprintf(stderr,"       node %10d value:   %g\n",1,values[1]);
+              fprintf(stderr,"       node %10d value:   %g\n",nsize,values[nsize]);
+              fprintf(stderr,"       min value:               %g\n",minv);
+              fprintf(stderr,"       max value:               %g\n",maxv);
+
+              if(Varinfo[v].complex) {
+                err = USERD_get_var_by_component(vn,
+                                                 pn,
+                                                 Varinfo[v].type,
+                                                 0,
+                                                 FALSE,
+                                                 comp,
+                                                 values);
+                if(err == Z_UNDEF) {
+                  fprintf(stderr,"  Variable not defined on this part\n");
+                }
+                
+                /* For the component, show 1st node, last node, min, max values
+                 *-------------------------------------------------------------*/
+                minv = maxv = values[1];
+                for(i=2; i<=nsize; ++i) {
+                  if(values[i] < minv) {
+                    minv = values[i];
+                  }
+                  if(values[i] > maxv) {
+                    maxv = values[i];
+                  }
+                }
+                
+                fprintf(stderr,"     For component %d (imag): \n",comp);
+                fprintf(stderr,"       node %10d value:   %g\n",1,values[1]);
+                fprintf(stderr,"       node %10d value:   %g\n",nsize,values[nsize]);
+                fprintf(stderr,"       min value:               %g\n",minv);
+                fprintf(stderr,"       max value:               %g\n",maxv);
+              }
+            }
+            free(values);
+          }
+        }
+      }
+
+      /* Per_Elem
+       *---------*/
+      else {
+        for(p=0; p<Num_parts; ++p) {
+          pn = p + 1;
+
+          if(Pbuild[p].type != Z_UNSTRUCTURED) {
+
+            for(comp=0; comp<3; ++comp) {
+              if(Pbuild[p].ne[comp] < 1) {
+                bdim[comp] = 1;
+              }
+              else {
+                if(Doing_Structured_Cinching) {
+                  bdim[comp] = Pbuild[p].ne[comp];
+                  
+                  /* even */              
+                  if((bdim[comp] % 2) == 0) {
+                    bdim[comp] = (bdim[comp]/2) + 1;
+                  }
+                  /* odd */
+                  else {
+                    bdim[comp] = ((bdim[comp]-1)/2) + 1;
+                  }
+                }
+                
+                else {
+                  bdim[comp] = Pbuild[p].ne[comp];
+                }
+              }
+            }
+
+            bd1 = bdim[0]-1;
+            if(bd1 < 1) {
+              bd1 = 1;
+            }
+            bd2 = bdim[1]-1;
+            if(bd2 < 1) {
+              bd2 = 1;
+            }
+            bd3 = bdim[2]-1;
+            if(bd3 < 1) {
+              bd3 = 1;
+            }
+            nsize = bd1 * bd2 * bd3;
+
+
+            /* Determine cell type
+             *--------------------*/
+            num_dims = 3;
+            for(i=0; i<3; ++i) {
+              if(bdim[i] == 1) {
+                --num_dims;
+              }
+            }
+            if(num_dims == 3) {
+              cell_type = Z_HEX08;
+            }
+            else if(num_dims == 2) {
+              cell_type = Z_QUA04;
+            }
+            else {
+              cell_type = Z_BAR02;
+            }
+          }
+
+          if(Pbuild[p].type == Z_UNSTRUCTURED) {
+            e1 = 0;
+            e2 = Z_MAXTYPE-1;
+          }
+          else {
+            e1 = e2 = cell_type;
+
+
+            /* For structured cinching, send in one less on each end and stride of 2
+             *----------------------------------------------------------------------*/
+            if(Doing_Structured_Cinching) {
+              err = USERD_set_block_range_and_stride(pn,
+                                                     0, Pbuild[p].ne[0]-1, 2,
+                                                     0, Pbuild[p].ne[1]-1, 2,
+                                                     0, Pbuild[p].ne[2]-1, 2);
+            }
+          }
+
+          for(et=e1; et<=e2; ++et) {
+
+            if(Pbuild[p].type == Z_UNSTRUCTURED) {
+              nsize = Pbuild[p].ne[et];
+            }
+
+            if(nsize > 0) {
+
+              fprintf(stderr,"   For part %d, with %d elems of type %s:\n",
+                      pn,nsize,Elem_info[et].name);
+
+
+              values = (float *) calloc((nsize+1),sizeof(float));
+              if(values == (float *) NULL) {
+                fprintf(stderr,"Error: alocating variable values\n");
+                return(Z_ERR);
+              }
+              
+              for(comp=0; comp<num_comps; ++comp) {
+                
+                err = USERD_get_var_by_component(vn,
+                                                 pn,
+                                                 Varinfo[v].type,
+                                                 et,
+                                                 FALSE,
+                                                 comp,
+                                                 values);
+                if(err == Z_UNDEF) {
+                  fprintf(stderr,"  Variable not defined on this part\n");
+                }
+                
+                /* For the component, show 1st elem, last elem, min, max values
+                 *-------------------------------------------------------------*/
+                minv = maxv = values[1];
+                for(i=2; i<=nsize; ++i) {
+                  if(values[i] < minv) {
+                    minv = values[i];
+                  }
+                  if(values[i] > maxv) {
+                    maxv = values[i];
+                  }
+                }
+                
+                fprintf(stderr,"     For component %d: \n",comp);
+                fprintf(stderr,"       elem %10d value:  %g\n",1,values[1]);
+                fprintf(stderr,"       elem %10d value:  %g\n",nsize,values[nsize]);
+                fprintf(stderr,"       min value:              %g\n",minv);
+                fprintf(stderr,"       max value:              %g\n",maxv);
+                
+                if(Varinfo[v].complex) {
+                  err = USERD_get_var_by_component(vn,
+                                                   pn,
+                                                   Varinfo[v].type,
+                                                   et,
+                                                   FALSE,
+                                                   comp,
+                                                   values);
+                  if(err == Z_UNDEF) {
+                    fprintf(stderr,"  Variable not defined on this part\n");
+                  }
+                  
+                  /* For the component, show 1st elem, last elem, min, max values
+                   *-------------------------------------------------------------*/
+                  minv = maxv = values[1];
+                  for(i=2; i<=nsize; ++i) {
+                    if(values[i] < minv) {
+                      minv = values[i];
+                    }
+                    if(values[i] > maxv) {
+                      maxv = values[i];
+                    }
+                  }
+                  
+                  fprintf(stderr,"     For component %d (imag): \n",comp);
+                  fprintf(stderr,"       elem %10d value:  %g\n",1,values[1]);
+                  fprintf(stderr,"       elem %10d value:  %g\n",nsize,values[nsize]);
+                  fprintf(stderr,"       min value:              %g\n",minv);
+                  fprintf(stderr,"       max value:              %g\n",maxv);
+                  
+                }
+              }
+              free(values);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return(Z_OK);
+}
+
+#else
+
+/*-------------
+ * part_builder
+ *-------------*/
+static int
+part_builder(int geom_time_step)
+{
+  int i, j;
+  int err;
+  int p, pn;
+  int et, ne;
+  int *elemids[Z_MAXTYPE];
+  int **conns[Z_MAXTYPE];
+  int nn;
+  int comp;
+  int bdim[3];
+  int ib[5];
+  int num_dims;
+  int cell_type;
+  float mm[6];
+  float **coords;
+  int *nodeids;
+  int *iblanking;
+  CRD *crds;
+  int bd1,bd2,bd3;
+
+
+  fprintf(stderr,"\n------------- part_builder --------------\n");
+
+
+  if(Num_time_steps > 1) {
+    if(geom_time_step > (Num_time_steps - 1)) {
+      geom_time_step = Num_time_steps - 1;
+    }
+
+    /* Set the time step - to first step by default, but
+     * can set it at others using -gts command argument
+     *---------------------------------------------------*/
+    USERD_set_time_step(geom_time_step);
+    
+    fprintf(stderr," Using time step: %d  (where range is %d through %d\n",
+            geom_time_step,0,Num_time_steps-1);
+  }
+
+
+  /* Get the global coords
+   *----------------------*/
+  nn = USERD_get_number_of_global_nodes();
+
+  if(nn > 0) {
+
+    crds = (CRD *) calloc(nn,sizeof(CRD));
+    if(crds == (CRD *) NULL) {
+      fprintf(stderr,"Error: allocating crds array\n");
+      return(Z_ERR);
+    }
+        
+    if(Node_labels) {
+      nodeids = (int *) calloc(nn,sizeof(int));
+      if(nodeids == (int *) NULL) {
+        fprintf(stderr,"Error: allocating nodeids array\n");
+        return(Z_ERR);
+      }
+    }
+    
+    
+    err = USERD_get_global_coords(crds);
+    if(err == Z_ERR) {
+      fprintf(stderr,"Error: getting unstructured coords\n");
+      return(Z_ERR);
+    }
+
+    if(Node_labels) {
+      err = USERD_get_global_node_ids(nodeids);
+      if(err == Z_ERR) {
+        fprintf(stderr,"Error: getting nodeids\n");
+        return(Z_ERR);
+      }
+    }
+
+    /* Echo "some" info
+     *-----------------*/
+
+    /* First node
+     *-----------*/
+    i = 0;
+    fprintf(stderr,"   Node %d of %d:\n",i+1,nn);
+    if(Node_labels) {
+      fprintf(stderr,"      id: %d\n",nodeids[i]);
+    }
+    fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+            crds[i].xyz[0], crds[i].xyz[1], crds[i].xyz[2]);
+    mm[0] = mm[1] = crds[i].xyz[0];
+    mm[2] = mm[3] = crds[i].xyz[1];
+    mm[4] = mm[5] = crds[i].xyz[2];
+
+
+    /* Last node
+     *----------*/
+    i = nn-1;
+    if(i > 0) {
+      fprintf(stderr,"   Node %d of %d:\n",i+1,nn);
+      if(Node_labels) {
+        fprintf(stderr,"      id: %d\n",nodeids[i]);
+      }
+      fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+              crds[i].xyz[0], crds[i].xyz[1], crds[i].xyz[2]);
+    }
+    
+    /* Min and max coordinate values
+     *------------------------------*/
+    for(i=1; i<nn; ++i) {
+      if(crds[i].xyz[0] < mm[0]) {
+        mm[0] = crds[i].xyz[0];
+      }
+      if(crds[i].xyz[0] > mm[1]) {
+        mm[1] = crds[i].xyz[0];
+      }
+      if(crds[i].xyz[1] < mm[2]) {
+        mm[2] = crds[i].xyz[1];
+      }
+      if(crds[i].xyz[1] > mm[3]) {
+        mm[3] = crds[i].xyz[1];
+      }
+      if(crds[i].xyz[2] < mm[4]) {
+        mm[4] = crds[i].xyz[2];
+      }
+      if(crds[i].xyz[2] > mm[5]) {
+        mm[5] = crds[i].xyz[2];
+      }
+    }
+
+    fprintf(stderr,"   Global coordinate ranges:\n");
+    fprintf(stderr,"      min x: %g\n",mm[0]);
+    fprintf(stderr,"      max x: %g\n",mm[1]);
+    fprintf(stderr,"      min y: %g\n",mm[2]);
+    fprintf(stderr,"      max y: %g\n",mm[3]);
+    fprintf(stderr,"      min z: %g\n",mm[4]);
+    fprintf(stderr,"      max z: %g\n",mm[5]);
+
+
+    /* Free the allocated memory
+     *--------------------------*/
+    free(crds);
+    if(Node_labels) {
+      free(nodeids);
+    }
+  }
+
+
+
+  for(p=0; p<Num_parts; ++p) {
+    pn = p+1;
+
+    fprintf(stderr,"\n");
+    fprintf(stderr," Part %d:\n",pn);
+
+    /*-----------------------
+     * For unstructured parts
+     *-----------------------*/
+    if(Pbuild[p].type == Z_UNSTRUCTURED) {
+
+      for(et=0; et<Z_MAXTYPE; ++et) {
+        ne = Pbuild[p].ne[et];
+
+        if(ne > 0) {
+
+          conns[et] = (int **) calloc(ne,sizeof(int *));
+          if(conns[et] == (int **) NULL) {
+            fprintf(stderr,"Error: allocating conns array\n");
+            return(Z_ERR);
+          }
+          else {
+            for(i=0; i<ne; ++i) {
+              conns[et][i] = (int *) calloc(Elem_info[et].con_len,sizeof(int));
+              if(conns[et][i] == (int *) NULL) {
+                fprintf(stderr,"Error: allocating conns array\n");
+                return(Z_ERR);
+              }
+            }
+          }
+
+          if(Element_labels) {
+            elemids[et] = (int *) calloc(ne,sizeof(int));
+            if(elemids[et] == (int *) NULL) {
+              fprintf(stderr,"Error: allocating elemids array\n");
+              return(Z_ERR);
+            }
+          }
+        }
+      }
+
+      /* Get the elements
+       *-----------------*/
+      err = USERD_get_element_connectivities_for_part(pn,conns);
+      if(err == Z_ERR) {
+        fprintf(stderr,"Error: getting element connectivities\n");
+        return(Z_ERR);
+      }
+      
+      /* Get the element ids - if any
+       *-----------------------------*/
+      if(Element_labels) {
+        err = USERD_get_element_ids_for_part(pn,elemids);
+        if(err == Z_ERR) {
+          fprintf(stderr,"Error: getting element ids\n");
+          return(Z_ERR);
+        }
+      }
+
+      /* Echo "some" info
+       *-----------------*/
+      for(et=0; et<Z_MAXTYPE; ++et) {
+        ne = Pbuild[p].ne[et];
+
+        if(ne > 0) {
+
+          /* First element of the type
+           *--------------------------*/
+          i = 0;
+          fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+          if(Element_labels) {
+            fprintf(stderr,"      id: %d\n",elemids[et][i]);
+          }
+          fprintf(stderr,"      connectivity:");
+          for(j=0; j<Elem_info[et].con_len; ++j) {
+            fprintf(stderr," %d",conns[et][i][j]);
+          }
+          fprintf(stderr,"\n");
+
+          /* Last element of the type
+           *-------------------------*/
+          i = ne - 1;
+          if(i > 0) {
+            fprintf(stderr,"   %s Element %d of %d:\n",Elem_info[et].name,i+1,ne);
+            if(Element_labels) {
+              fprintf(stderr,"      id: %d\n",elemids[et][i]);
+            }
+            fprintf(stderr,"      connectivity:");
+            for(j=0; j<Elem_info[et].con_len; ++j) {
+              fprintf(stderr," %d",conns[et][i][j]);
+            }
+            fprintf(stderr,"\n");
+          }
+        }
+      }
+
+      /* Free the allocated memory
+       *--------------------------*/
+      for(et=0; et<Z_MAXTYPE; ++et) {
+        ne = Pbuild[p].ne[et];
+
+        if(ne > 0) {
+          for(i=0; i<ne; ++i) {
+            free(conns[et][i]);
+          }
+          free(conns[et]);
+
+          if(Element_labels) {
+            free(elemids[et]);
+          }
+        }
+      }
+    }
+
+
+    /*---------------------
+     * For structured parts
+     *---------------------*/
+    else {
+
+      /* Get the block coords
+       *---------------------*/
+      for(comp=0; comp<3; ++comp) {
+        if(Pbuild[p].ne[comp] < 1) {
+          bdim[comp] = 1;
+        }
+        else {
+          bdim[comp] = Pbuild[p].ne[comp];
+        }
+      }
+      nn = bdim[0] * bdim[1] * bdim[2];
+
+      bd1 = bdim[0]-1;
+      if(bd1 < 1) {
+        bd1 = 1;
+      }
+      bd2 = bdim[1]-1;
+      if(bd2 < 1) {
+        bd2 = 1;
+      }
+      bd3 = bdim[2]-1;
+      if(bd3 < 1) {
+        bd3 = 1;
+      }
+      ne = bd1 * bd2 * bd3;
+
+
+      /* Determine cell type
+       *--------------------*/
+      num_dims = 3;
+      for(i=0; i<3; ++i) {
+        if(bdim[i] == 1) {
+          --num_dims;
+        }
+      }
+      if(num_dims == 3) {
+        cell_type = Z_HEX08;
+      }
+      else if(num_dims == 2) {
+        cell_type = Z_QUA04;
+      }
+      else {
+        cell_type = Z_BAR02;
+      }
+
+      coords = (float **) calloc(num_dims,sizeof(float *));
+      if(coords == (float **) NULL) {
+        fprintf(stderr,"Error: allocating coords array\n");
+        return(Z_ERR);
+      }
+      else {
+        for(i=0; i<num_dims; ++i) {
+          coords[i] = (float *) calloc(nn,sizeof(float));
+          if(coords[i] == (float *) NULL) {
+            fprintf(stderr,"Error: allocating coords array\n");
+            return(Z_ERR);
+          }
+        }
+      }
+        
+      /* Get the coords
+       *---------------*/
+      for(comp=0; comp<num_dims; ++comp) {
+        err = USERD_get_block_coords_by_component(pn,comp,coords[comp]);
+        if(err == Z_ERR) {
+          fprintf(stderr,"Error: getting block coords\n");
+          return(Z_ERR);
+        }
+      }
+      
+
+      /* Echo "some" info
+       *-----------------*/
+
+      /* First node
+       *-----------*/
+      if(nn > 0) {
+        i = 0;
+        fprintf(stderr,"   Node %d of %d:\n",i+1,nn);
+        
+        if(num_dims == 3) {
+          fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+                  coords[0][i], coords[1][i], coords[2][i]);
+          mm[0] = mm[1] = coords[0][i];
+          mm[2] = mm[3] = coords[1][i];
+          mm[4] = mm[5] = coords[2][i];
+        }
+        else if(num_dims == 2) {
+          fprintf(stderr,"      x y coordinates: %g %g\n",
+                  coords[0][i], coords[1][i]);
+          mm[0] = mm[1] = coords[0][i];
+          mm[2] = mm[3] = coords[1][i];
+        }
+        else {
+          fprintf(stderr,"      x coordinates: %g\n",
+                  coords[0][i]);
+          mm[0] = mm[1] = coords[0][i];
+        }
+
+        
+        /* Last node
+         *----------*/
+        i = nn-1;
+        if(i > 1) {
+          fprintf(stderr,"   Node %d of %d:\n",i+1,nn);
+          
+          if(num_dims == 3) {
+            fprintf(stderr,"      x y z coordinates: %g %g %g\n",
+                    coords[0][i], coords[1][i], coords[2][i]);
+          }
+          else if(num_dims == 2) {
+            fprintf(stderr,"      x y coordinates: %g %g\n",
+                    coords[0][i], coords[1][i]);
+          }
+          else {
+            fprintf(stderr,"      x coordinates: %g\n",
+                    coords[0][i]);
+          }
+        }
+      }
+
+      /* Min and max coordinate values
+       *------------------------------*/
+      for(i=2; i<=nn; ++i) {
+        if(coords[0][i] < mm[0]) {
+          mm[0] = coords[0][i];
+        }
+        if(coords[0][i] > mm[1]) {
+          mm[1] = coords[0][i];
+        }
+        if(num_dims > 1) {
+          if(coords[1][i] < mm[2]) {
+            mm[2] = coords[1][i];
+          }
+          if(coords[1][i] > mm[3]) {
+            mm[3] = coords[1][i];
+          }
+        }
+        if(num_dims > 2) {
+          if(coords[2][i] < mm[4]) {
+            mm[4] = coords[2][i];
+          }
+          if(coords[2][i] > mm[5]) {
+            mm[5] = coords[2][i];
+          }
+        }
+      }
+      
+      fprintf(stderr,"   Coordinate ranges:\n");
+      fprintf(stderr,"      min x: %g\n",mm[0]);
+      fprintf(stderr,"      max x: %g\n",mm[1]);
+      if(num_dims > 1) {
+        fprintf(stderr,"      min y: %g\n",mm[2]);
+        fprintf(stderr,"      max y: %g\n",mm[3]);
+      }
+      if(num_dims > 2) {
+        fprintf(stderr,"      min z: %g\n",mm[4]);
+        fprintf(stderr,"      max z: %g\n",mm[5]);
+      }
+
+      /* Free the allocated memory - so far
+       *-----------------------------------*/
+      for(i=0; i<num_dims; ++i) {
+        free(coords[i]);
+      }
+      free(coords);
+
+
+      /* Get the block iblanking - if any
+       *---------------------------------*/
+      if(Pbuild[p].type == Z_IBLANKED) {
+
+        iblanking = (int *) calloc(nn,sizeof(int));
+        if(iblanking == (int *) NULL) {
+          fprintf(stderr,"Error: allocating iblanking array\n");
+          return(Z_ERR);
+        }
+
+        err = USERD_get_block_iblanking(pn,iblanking);
+        if(err == Z_ERR) {
+          fprintf(stderr,"Error: getting block iblanking\n");
+          return(Z_ERR);
+        }
+
+        /* Echo "some" info
+         *-----------------*/
+        ib[Z_EXT]    = 0;
+        ib[Z_INT]    = 0;
+        ib[Z_BND]    = 0;
+        ib[Z_INTBND] = 0;
+        ib[Z_SYM]    = 0;
+
+        for(i=0; i<nn; ++i) {
+          ++ib[iblanking[i]];
+        }
+
+        fprintf(stderr,"   Iblanking breakdown:\n");
+        fprintf(stderr,"      Number of Z_EXT:    %d\n",ib[Z_EXT]);
+        fprintf(stderr,"      Number of Z_INT:    %d\n",ib[Z_INT]);
+        fprintf(stderr,"      Number of Z_BND:    %d\n",ib[Z_BND]);
+        fprintf(stderr,"      Number of Z_INTBND: %d\n",ib[Z_INTBND]);
+        fprintf(stderr,"      Number of Z_SYM:    %d\n",ib[Z_SYM]);
+
+        free(iblanking);
+      }
+    }
+  }
+
+  return(Z_OK);
+}
+
+
+/*-----------
+ * var_loader
+ *-----------*/
+static int
+var_loader(int var_time_step)
+{
+  int i, j, k;
+  int err;
+  int v, vn;
+  int var_timeset;
+  int p, pn;
+  int et, e1, e2;
+  int num_comps;
+  int num_dims;
+  int nsize;
+  int comp;
+  int bdim[3];
+  int ne;
+  int cell_type;
+  float constant_val;
+  char line1[Z_BUFL];
+  char line2[Z_BUFL];
+  float *values;
+  float *tvalues;
+  float minv[3],maxv[3];
+  int bd1,bd2,bd3;
+
+
+  fprintf(stderr,"\n--------------- var_loader --------------\n");
+
+  if(Num_time_steps > 1 && v == 0) {
+    if(var_time_step > (Num_time_steps - 1)) {
+      var_time_step = Num_time_steps - 1;
+    }
+    
+    /* Set the time step - to first step by default, but
+     * can set it at others using -vts command argument
+     *---------------------------------------------------------*/
+    USERD_set_time_step(var_time_step);
+    
+    fprintf(stderr," Using time step: %d  (where range is %d through %d)\n\n",
+            var_time_step,0,Num_time_steps-1);
+  }
+
+  for(v=0; v<Num_vars; ++v) {
+    vn = v + 1;
+
+    if(v > 0) {
+      fprintf(stderr,"\n");
+    }
+    if(Varinfo[v].classify == Z_PER_NODE) {
+      fprintf(stderr," Z_PER_NODE Variable %d:\n",vn);
+    }
+    else {
+      fprintf(stderr," Z_PER_ELEM Variable %d:\n",vn);
+    }
+
+    /* Constants
+     *----------*/
+    if(Varinfo[v].type == Z_CONSTANT) {
+
+      constant_val = USERD_get_constant_value(vn);
+      fprintf(stderr,"   Constant (%s):\n",Varinfo[v].description);
+      fprintf(stderr,"     value: %g\n",constant_val);
+    }
+
+
+    /* Scalars, Vectors, Tensors
+     *--------------------------*/
+    else {
+
+      /* Get the var description line
+       *-----------------------------*/
+      err = USERD_get_description_lines(Z_VARI,vn,line1,line2);
+      if(err == Z_OK) {
+        fprintf(stderr,"   Desc line: %s\n",line1);
+      }
+      else {
+        fprintf(stderr,"Error: getting var description line\n");
+        return(Z_ERR);
+      }
+
+
+      /* Get the values by component
+       *-----------------------------*/
+      if(Varinfo[v].type == Z_SCALAR) {
+        num_comps = 1;
+      }
+      else if(Varinfo[v].type == Z_VECTOR) {
+        num_comps = 3;
+      }
+      else if(Varinfo[v].type == Z_TENSOR) {
+        num_comps = 6;
+      }
+      else if(Varinfo[v].type == Z_TENSOR9) {
+        num_comps = 9;
+      }
+
+
+      /* Per_Node
+       *---------*/
+      if(Varinfo[v].classify == Z_PER_NODE) {
+
+        for(p=0; p<Num_parts; ++p) {
+          pn = p + 1;
+
+          if(Pbuild[p].type == Z_UNSTRUCTURED) {
+            nsize = Pbuild[p].nn;
+          }
+          else {
+            for(comp=0; comp<3; ++comp) {
+              if(Pbuild[p].ne[comp] < 1) {
+                bdim[comp] = 1;
+              }
+              else {
+                bdim[comp] = Pbuild[p].ne[comp];
+              }
+            }
+            nsize = bdim[0] * bdim[1] * bdim[2];
+          }
+
+
+          fprintf(stderr,"   For part %d, with %d nodes:\n",pn,nsize);
+
+          if(nsize > 0) {
+            values = (float *) calloc((num_comps * nsize),sizeof(float));
+            if(values == (float *) NULL) {
+              fprintf(stderr,"Error: alocating variable values\n");
+              return(Z_ERR);
+            }
+
+            if(num_comps == 1) {
+
+              if(Pbuild[p].type == Z_UNSTRUCTURED) {
+                err = USERD_get_scalar_values(vn,
+                                              pn,
+                                              0,
+                                              values);
+                if(err == Z_ERR) {
+                  fprintf(stderr,"Error: getting scalar values\n");
+                  return(Z_ERR);
+                }
+              }
+              else {
+                err = USERD_get_block_scalar_values(pn,
+                                                    vn,
+                                                    values);
+                if(err == Z_ERR) {
+                  fprintf(stderr,"Error: getting block scalar values\n");
+                  return(Z_ERR);
+                }
+              }
+
+              /* For the component, show 1st node, last node, min, max values
+               *-------------------------------------------------------------*/
+              minv[0] = maxv[0] = values[0];
+              for(i=0; i<nsize; ++i) {
+                if(values[i] < minv[0]) {
+                  minv[0] = values[i];
+                }
+                if(values[i] > maxv[0]) {
+                  maxv[0] = values[i];
+                }
+              }
+              
+              fprintf(stderr,"       node %10d value: %g\n",1,values[0]);
+              fprintf(stderr,"       node %10d value: %g\n",nsize,values[nsize-1]);
+              fprintf(stderr,"       min value:             %g\n",minv[0]);
+              fprintf(stderr,"       max value:             %g\n",maxv[0]);
+
+            }
+
+            else if(num_comps == 3) {
+
+              if(Pbuild[p].type == Z_UNSTRUCTURED) {
+                err = USERD_get_vector_values(vn,
+                                              pn,
+                                              0,
+                                              values);
+                if(err == Z_ERR) {
+                  fprintf(stderr,"Error: getting vector values\n");
+                  return(Z_ERR);
+                }
+              }
+              else {
+
+                tvalues = (float *) calloc(nsize,sizeof(float));
+                if(tvalues == (float *) NULL) {
+                  fprintf(stderr,"Error: alocating tvalues array\n");
+                  return(Z_ERR);
+                }
+
+                for(i=0; i<3; ++i) {
+                  err = USERD_get_block_vector_values_by_component(pn,
+                                                                   vn,
+                                                                   i,
+                                                                   tvalues);
+                  if(err == Z_ERR) {
+                    fprintf(stderr,"Error: getting vector values\n");
+                    return(Z_ERR);
+                  }
+                  for(j=0; j<nsize; ++j) {
+                    k = j*3 + i;
+                    values[k] = tvalues[j];
+                  }
+                }
+                free(tvalues);
+              }
+
+              /* For the component, show 1st node, last node, min, max values
+               *-------------------------------------------------------------*/
+              minv[0] = maxv[0] = values[0];
+              minv[1] = maxv[1] = values[1];
+              minv[2] = maxv[2] = values[2];
+              for(i=0; i<nsize; ++i) {
+                j = i*3;
+                for(k=0; k<3; ++k) {
+                  if(values[j+k] < minv[k]) {
+                    minv[k] = values[j+k];
+                  }
+                  if(values[j+k] > maxv[k]) {
+                    maxv[k] = values[j+k];
+                  }
+                }
+              }
+              
+              fprintf(stderr,"       node %10d values: %g %g %g\n",1,
+                      values[0],values[1],values[2]);
+              fprintf(stderr,"       node %10d values: %g %g %g\n",nsize,
+                      values[3*nsize-3],values[3*nsize-2],values[3*nsize-1]);
+              fprintf(stderr,"       min values:             %g %g %g\n",
+                      minv[0],minv[1],minv[2]);
+              fprintf(stderr,"       max values:             %g %g %g\n",
+                      maxv[0],maxv[1],maxv[2]);
+
+            }
+            free(values);
+          }
+        }
+      }
+
+      /* Per_Elem
+       *---------*/
+      else {
+        for(p=0; p<Num_parts; ++p) {
+          pn = p + 1;
+
+          if(Pbuild[p].type != Z_UNSTRUCTURED) {
+
+            for(comp=0; comp<3; ++comp) {
+              if(Pbuild[p].ne[comp] < 1) {
+                bdim[comp] = 1;
+              }
+              else {
+                bdim[comp] = Pbuild[p].ne[comp];
+              }
+            }
+            bd1 = bdim[0]-1;
+            if(bd1 < 1) {
+              bd1 = 1;
+            }
+            bd2 = bdim[1]-1;
+            if(bd2 < 1) {
+              bd2 = 1;
+            }
+            bd3 = bdim[2]-1;
+            if(bd3 < 1) {
+              bd3 = 1;
+            }
+            nsize = bd1 * bd2 * bd3;
+
+
+            /* Determine cell type
+             *--------------------*/
+            num_dims = 3;
+            for(i=0; i<3; ++i) {
+              if(bdim[i] == 1) {
+                --num_dims;
+              }
+            }
+            if(num_dims == 3) {
+              cell_type = Z_HEX08;
+            }
+            else if(num_dims == 2) {
+              cell_type = Z_QUA04;
+            }
+            else {
+              cell_type = Z_BAR02;
+            }
+          }
+
+          if(Pbuild[p].type == Z_UNSTRUCTURED) {
+            e1 = 0;
+            e2 = Z_MAXTYPE-1;
+          }
+          else {
+            e1 = e2 = cell_type;
+          }
+
+          for(et=e1; et<=e2; ++et) {
+
+            if(Pbuild[p].type == Z_UNSTRUCTURED) {
+              nsize = Pbuild[p].ne[et];
+            }
+
+            if(nsize > 0) {
+
+              fprintf(stderr,"   For part %d, with %d elems of type %s:\n",
+                      pn,nsize,Elem_info[et].name);
+
+              values = (float *) calloc((num_comps * nsize),sizeof(float));
+              if(values == (float *) NULL) {
+                fprintf(stderr,"Error: alocating variable values\n");
+                return(Z_ERR);
+              }
+
+              if(num_comps == 1) {
+                if(Pbuild[p].type == Z_UNSTRUCTURED) {
+                  err = USERD_get_scalar_values(vn,
+                                                pn,
+                                                et,
+                                                values);
+                  if(err == Z_ERR) {
+                    fprintf(stderr,"Error: getting scalar values\n");
+                    return(Z_ERR);
+                  }
+                }
+                else {
+                  err = USERD_get_block_scalar_values(pn,
+                                                      vn,
+                                                      values);
+                  if(err == Z_ERR) {
+                    fprintf(stderr,"Error: getting block scalar values\n");
+                    return(Z_ERR);
+                  }
+                }
+
+                /* For the component, show 1st node, last node, min, max values
+                 *-------------------------------------------------------------*/
+                minv[0] = maxv[0] = values[0];
+                for(i=1; i<nsize; ++i) {
+                  if(values[i] < minv[0]) {
+                    minv[0] = values[i];
+                  }
+                  if(values[i] > maxv[0]) {
+                    maxv[0] = values[i];
+                  }
+                }
+                
+                fprintf(stderr,"       elem %10d value: %g\n",1,values[0]);
+                fprintf(stderr,"       elem %10d value: %g\n",nsize,values[nsize-1]);
+                fprintf(stderr,"       min value:             %g\n",minv[0]);
+                fprintf(stderr,"       max value:             %g\n",maxv[0]);
+                
+              }
+
+              else if(num_comps == 3) {
+
+                if(Pbuild[p].type == Z_UNSTRUCTURED) {
+                  err = USERD_get_vector_values(vn,
+                                                pn,
+                                                et,
+                                                values);
+                  if(err == Z_ERR) {
+                    fprintf(stderr,"Error: getting vector values\n");
+                    return(Z_ERR);
+                  }
+                }
+                else {
+                  
+                  tvalues = (float *) calloc(nsize,sizeof(float));
+                  if(tvalues == (float *) NULL) {
+                    fprintf(stderr,"Error: alocating tvalues array\n");
+                    return(Z_ERR);
+                  }
+                  
+                  for(i=0; i<3; ++i) {
+                    err = USERD_get_block_vector_values_by_component(pn,
+                                                                     vn,
+                                                                     i,
+                                                                     tvalues);
+                    if(err == Z_ERR) {
+                      fprintf(stderr,"Error: getting vector values\n");
+                      return(Z_ERR);
+                    }
+                    for(j=0; j<nsize; ++j) {
+                      k = j*3 + i;
+                      values[k] = tvalues[j];
+                    }
+                  }
+                  free(tvalues);
+                }
+
+                /* For the component, show 1st node, last node, min, max values
+                 *-------------------------------------------------------------*/
+                minv[0] = maxv[0] = values[0];
+                minv[1] = maxv[1] = values[1];
+                minv[2] = maxv[2] = values[2];
+                for(i=1; i<=nsize; ++i) {
+                  j = i*3;
+                  for(k=0; k<3; ++k) {
+                    if(values[j+k] < minv[k]) {
+                      minv[k] = values[j+k];
+                    }
+                    if(values[j+k] > maxv[k]) {
+                      maxv[k] = values[j+k];
+                    }
+                  }
+                }
+                
+                fprintf(stderr,"       elem %10d values: %g %g %g\n",1,
+                        values[0],values[1],values[2]);
+                fprintf(stderr,"       elem %10d values: %g %g %g\n",nsize,
+                        values[3*nsize-3],values[3*nsize-2],values[3*nsize-1]);
+                fprintf(stderr,"       min values:             %g %g %g\n",
+                        minv[0],minv[1],minv[2]);
+                fprintf(stderr,"       max values:             %g %g %g\n",
+                        maxv[0],maxv[1],maxv[2]);
+                
+              }
+              free(values);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return(Z_OK);
+}
+
+#endif
+
+
+#if (defined GT_USERD_API_202)
+
+
+/*---------------
+ * materials_info
+ *---------------*/
+static int
+materials_info( void )
+{
+  int i,j;
+  int err;
+  int   *num_materials;
+  int   *msids;
+  char **msname;
+  int   *mids;
+  char **mdesc;
+
+
+  fprintf(stderr,"\n------------- materials info --------------\n");
+
+  /* Get the number of variables
+   *----------------------------*/
+  Num_materials_sets = USERD_get_number_of_material_sets();
+  if(Num_materials_sets < 0) {
+    fprintf(stderr,"Error: getting the number of material sets\n");
+    return(Z_ERR);
+  }
+  else {
+    if(Num_materials_sets == 0) {
+      fprintf(stderr," No materials sets in the model\n");
+      return (Z_OK);
+    }
+    else if(Num_materials_sets > 1) {
+      fprintf(stderr," Number of materials sets: %d\n",Num_materials_sets);
+      fprintf(stderr," Currently, EnSight 7.6 only supports 1 material set\n");
+      return(Z_ERR);
+    }
+    else {
+      fprintf(stderr," Number of materials sets: %d\n",Num_materials_sets);
+    }
+  }
+
+  /* Get the material set index list and names
+   *------------------------------------------*/
+  msids = (int *) calloc(Num_materials_sets,sizeof(int));
+  if(msids == (int *)NULL) {
+    fprintf(stderr," Problems allocating for material set ids\n");
+    return(Z_ERR);
+  }
+
+  num_materials = (int *) calloc(Num_materials_sets,sizeof(int));
+  if(num_materials == (int *)NULL) {
+    fprintf(stderr," Problems allocating for material set num materials\n");
+    return(Z_ERR);
+  }
+
+  msname = (char **) calloc(Num_materials_sets,sizeof(char *));
+  if(msname == (char **)NULL) {
+    fprintf(stderr," Problems allocating for material set names\n");
+    return(Z_ERR);
+  }
+  else {
+    for(i=0; i<Num_materials_sets; ++i) {
+      msname[i] = (char *) calloc(Z_BUFL,sizeof(char));
+      if(msname[i] == (char *)NULL) {
+        fprintf(stderr," Problems allocating for material set names\n");
+        return(Z_ERR);
+      }
+    }
+  }
+
+  err = USERD_get_matf_set_info(msids,msname);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Error: getting material set info\n");
+  }
+  else {
+    for(i=0; i<Num_materials_sets; ++i) {
+
+      /* Echo some feedback
+       *-------------------*/
+      fprintf(stderr," For Material set %d:\n",i+1);
+
+      fprintf(stderr,"   id:   %d\n",msids[i]);
+      fprintf(stderr,"   name: %s\n",msname[i]);
+
+      num_materials[i] = USERD_get_number_of_materials(i);
+      if(num_materials[i] < 0) {
+        fprintf(stderr,"Error: getting the number of materials in set %d\n",i);
+        return (Z_ERR);
+      }
+      else if(num_materials[i] == 0) {
+        fprintf(stderr," No materials in Materials set %d\n",i);
+        return (Z_OK);
+      }
+      else {
+        mids = (int *) calloc(num_materials[i],sizeof(int));
+        if(mids == (int *)NULL) {
+          fprintf(stderr," Problems allocating for material ids\n");
+          return(Z_ERR);
+        }
+        
+        mdesc = (char **) calloc(num_materials[i],sizeof(char *));
+        if(mdesc == (char **)NULL) {
+          fprintf(stderr," Problems allocating for material desc\n");
+          return(Z_ERR);
+        }
+        else {
+          for(j=0; j<num_materials[i]; ++j) {
+            mdesc[j] = (char *) calloc(Z_BUFL,sizeof(char));
+            if(mdesc[j] == (char *)NULL) {
+              fprintf(stderr," Problems allocating for material desc\n");
+              return(Z_ERR);
+            }
+          }
+        }
+
+        err = USERD_get_matf_var_info(i,mids,mdesc);
+        if(err == Z_ERR) {
+          fprintf(stderr,"Error: getting material info\n");
+        }
+        else {
+
+          for(j=0; j<num_materials[i]; ++j) {
+            /* Echo some feedback
+             *-------------------*/
+            fprintf(stderr,"   For Material %d:\n",j+1);
+            
+            fprintf(stderr,"     index:       %d\n",mids[j]);
+            fprintf(stderr,"     description: %s\n",mdesc[j]);
+          }
+        }
+      }
+    }
+  }
+
+  /* Free the allocated memory
+   *--------------------------*/
+  for(i=0; i<Num_materials_sets; ++i) {
+    free(msname[i]);
+
+    for(j=0; j<num_materials[i]; ++j) {
+      free(mdesc[j]);
+    }
+  }
+  free(msname);
+  free(msids);
+  free(num_materials);
+  free(mdesc);
+  free(mids);
+
+  return(Z_OK);
+}
+
+
+/*----------------------
+ * gold_materials_loader
+ *----------------------*/
+static int
+gold_materials_loader(int geom_time_step)
+{
+  int i, j, k, ms, nn;
+  int err, err1, err2;
+  int geom_timeset;
+  int p, pn;
+  int et, e1, e2;
+  int num_dims;
+  int comp;
+  int bdim[3];
+  int ne;
+  int cell_type;
+  int bd1,bd2,bd3;
+  int *ivals;
+  float *fvals;
+  int do_num;
+  int mixed_present;
+  int matf_size, matfv_size;
+
+
+  fprintf(stderr,"\n-------------- materials_loader --------------\n");
+
+  if(Num_time_sets > 0) {
+    /* Get the timeset used for the geometry
+     *--------------------------------------*/
+    geom_timeset = USERD_get_geom_timeset_number();
+    
+    /* Get the number of time steps for this timeset
+     *----------------------------------------------*/
+    Num_time_steps = USERD_get_num_of_time_steps(geom_timeset);
+    if(Num_time_steps < 1) {
+      fprintf(stderr," Error: Num time steps returned: %d\n",Num_time_steps);
+      fprintf(stderr," (Must be >0 to be okay)\n");
+      return(Z_ERR);
+    }
+    if(geom_time_step > (Num_time_steps - 1)) {
+      geom_time_step = Num_time_steps - 1;
+    }
+
+    /* Set the timeset and step - to first step by default, but
+     * can set it at others using -gts command argument
+     *---------------------------------------------------------*/
+    USERD_set_time_set_and_step(geom_timeset,geom_time_step);
+    
+    fprintf(stderr," Using timeset:   %d  (step range is %d through %d)\n",
+            geom_timeset,0,Num_time_steps-1);
+    fprintf(stderr," Using time step: %d\n",geom_time_step);
+  }
+
+  for(ms=0; ms<Num_materials_sets; ++ms) {
+    fprintf(stderr,"\n");
+    fprintf(stderr," Materials Set %d:\n",ms+1);
+
+    for(p=0; p<Num_parts; ++p) {
+      pn = p+1;
+
+      fprintf(stderr,"\n");
+      fprintf(stderr,"   Part %d:\n",pn);
+
+      /*-----------------------
+       * For unstructured parts
+       *-----------------------*/
+      if(Pbuild[p].type == Z_UNSTRUCTURED) {
+
+        e1 = 0;
+        e2 = Z_MAXTYPE;
+      }
+      else {
+        for(comp=0; comp<3; ++comp) {
+          if(Pbuild[p].ne[comp] < 1) {
+            bdim[comp] = 1;
+          }
+          else {
+            bdim[comp] = Pbuild[p].ne[comp];
+          }
+        }
+        nn = bdim[0] * bdim[1] * bdim[2];
+        
+        bd1 = bdim[0]-1;
+        if(bd1 < 1) {
+          bd1 = 1;
+        }
+        bd2 = bdim[1]-1;
+        if(bd2 < 1) {
+          bd2 = 1;
+        }
+        bd3 = bdim[2]-1;
+        if(bd3 < 1) {
+          bd3 = 1;
+        }
+        ne = bd1 * bd2 * bd3;
+        
+        /* Determine cell type
+         *--------------------*/
+        num_dims = 3;
+        for(i=0; i<3; ++i) {
+          if(bdim[i] == 1) {
+            --num_dims;
+          }
+        }
+        if(num_dims == 3) {
+          cell_type = Z_HEX08;
+        }
+        else if(num_dims == 2) {
+          cell_type = Z_QUA04;
+        }
+        else {
+          cell_type = Z_BAR02;
+        }
+
+        e1 = cell_type;
+        e2 = cell_type + 1;
+      }
+
+
+      for(et=e1; et<e2; ++et) {
+
+        if(Pbuild[p].type == Z_UNSTRUCTURED) {
+          ne = Pbuild[p].ne[et];
+        }
+
+        if(ne > 0) {
+
+          /* Get the material ids, if any
+           *-----------------------------*/
+          err = USERD_size_matf_data(ms,
+                                     pn,
+                                     et,
+                                     Z_MAT_INDEX,
+                                     &matf_size);
+          if(err == Z_OK && matf_size > 0) {
+
+              
+            /* Go get the material ids
+             *------------------------*/
+            ivals = (int *) calloc(matf_size,sizeof(int));
+            if(ivals == (int *)NULL) {
+              fprintf(stderr," Problems allocating for material ids\n");
+              return(Z_ERR);
+            }
+            err = USERD_load_matf_data(ms,
+                                       pn,
+                                       et,
+                                       Z_MAT_INDEX,
+                                       ivals,
+                                       fvals);
+            if(err == Z_OK) {
+              if(matf_size < 20) {
+                fprintf(stderr,"     Printing all mat ids for %s elements\n",
+                        Elem_info[et].name);
+                do_num = matf_size;
+              }
+              else {
+                fprintf(stderr,"     Printing first 20 mat ids for %s elements\n",
+                        Elem_info[et].name);
+                do_num = 20;
+              }
+
+              /* See if any mixed materials
+               *---------------------------*/
+              mixed_present = FALSE;
+              for(k=0; k<matf_size; ++k) {
+                if(ivals[k] < 0) {
+                  mixed_present = TRUE;
+                  break;
+                }
+              }
+
+              /* Feedback
+               *---------*/
+              for(k=0; k<do_num; ++k) {
+                fprintf(stderr,"       mat id[%d] = %d\n",k,ivals[k]);
+              }
+              free(ivals);
+            }
+            else {
+              fprintf(stderr,"     Trouble getting mat ids for %s elements\n",
+                      Elem_info[et].name);
+              free(ivals);
+              return(Z_ERR);
+            }
+          }
+          else {
+            fprintf(stderr,"     %s elements have no material ids\n",
+                    Elem_info[et].name);
+          }
+
+
+          /* Get the mixed material ids, if any
+           *-----------------------------------*/
+          if(mixed_present) {
+            err1 = USERD_size_matf_data(ms,
+                                        pn,
+                                        et,
+                                        Z_MIX_INDEX,
+                                        &matf_size);
+            err2 = USERD_size_matf_data(ms,
+                                        pn,
+                                        et,
+                                        Z_MIX_VALUE,
+                                        &matfv_size);
+            
+            if(err1 == Z_OK &&
+               err2 == Z_OK &&
+               matf_size > 0 &&
+               matfv_size > 0) {
+                
+              /* Go get the material ids
+               *------------------------*/
+              ivals = (int *) calloc(matf_size,sizeof(int));
+              if(ivals == (int *)NULL) {
+                fprintf(stderr," Problems allocating for mixed material ids\n");
+                return(Z_ERR);
+              }
+              fvals = (float *) calloc(matfv_size,sizeof(float));
+              if(fvals == (float *)NULL) {
+                fprintf(stderr," Problems allocating for mixed material values\n");
+                return(Z_ERR);
+              }
+              
+              err1 = USERD_load_matf_data(ms,
+                                          pn,
+                                          et,
+                                          Z_MIX_INDEX,
+                                          ivals,
+                                          fvals);
+              
+              err2 = USERD_load_matf_data(ms,
+                                          pn,
+                                          et,
+                                          Z_MIX_VALUE,
+                                          ivals,
+                                          fvals);
+              if(err1 == Z_OK &&
+                 err2 == Z_OK) {
+                if(matf_size < 20) {
+                  fprintf(stderr,"     Printing all mixed mat ids for %s elements\n",
+                          Elem_info[et].name);
+                  do_num = matf_size;
+                }
+                else {
+                  fprintf(stderr,"     Printing first 20 mixed mat ids for %s elements\n",
+                          Elem_info[et].name);
+                  do_num = 20;
+                }
+                for(k=0; k<do_num; ++k) {
+                  fprintf(stderr,"       mixed mat id[%d] = %d\n",k,ivals[k]);
+                }
+                free(ivals);
+                
+                if(matfv_size < 20) {
+                  fprintf(stderr,"     Printing all mixed mat values for %s elements\n",
+                          Elem_info[et].name);
+                  do_num = matfv_size;
+                }
+                else {
+                  fprintf(stderr,"     Printing first 20 mixed mat values for %s elements\n",
+                          Elem_info[et].name);
+                  do_num = 20;
+                }
+                for(k=0; k<do_num; ++k) {
+                  fprintf(stderr,"       mixed mat val[%d] = %f\n",k,fvals[k]);
+                }
+                free(fvals);
+              }
+              else {
+                fprintf(stderr,"     Trouble getting mixed mat ids or vals for %s elements\n",
+                        Elem_info[et].name);
+                free(ivals);
+                free(fvals);
+                return(Z_ERR);
+              }
+            }
+            else {
+              fprintf(stderr,"     Trouble getting mixed mat sizes for %s elements\n",
+                      Elem_info[et].name);
+              return(Z_ERR);
+            }
+          }
+          else {
+            fprintf(stderr,"       (%s elements have no mixed material ids)\n",
+                    Elem_info[et].name);
+          }
+        }
+      }
+    }
+  }
+  return(Z_OK);
+}
+
+#endif
+
+
+/*--------------
+ * entity_querys
+ *--------------*/
+static int
+entity_querys(int var_time_step)
+{
+  int i, j;
+  int err;
+  int v, vn;
+  int var_timeset;
+  int p, pn;
+  int et, e1, e2;
+  int num_comps;
+  int num_dims;
+  int nsize;
+  int comp;
+  int bdim[3];
+  int ne;
+  int cell_type;
+  char line1[Z_BUFL];
+  char line2[Z_BUFL];
+  float qvals[3];
+  int bd1,bd2,bd3;
+
+
+  fprintf(stderr,"\n-------------- entity_querys ------------\n");
+  fprintf(stderr,"       (scalar & vector variables only)    \n");
+  fprintf(stderr,"\n");
+
+#if (defined USERD_API_100)
+
+  if(Num_time_steps > 1) {
+    /* Get the number of time steps for this timeset
+     *----------------------------------------------*/
+    if(var_time_step > (Num_time_steps - 1)) {
+      var_time_step = Num_time_steps - 1;
+    }
+        
+    /* Set the time step - to first step by default, but
+     * can set it at others using -vts command argument
+     *---------------------------------------------------------*/
+    USERD_set_time_step(var_time_step);
+    
+    fprintf(stderr," Using time step: %d  (where range is %d through %d)\n\n",
+            var_time_step,0,Num_time_steps-1);
+  }
+#endif
+
+  for(v=0; v<Num_vars; ++v) {
+    vn = v + 1;
+
+    /* Scalar or vectors only
+     *-----------------------*/
+    if(Varinfo[v].type == Z_SCALAR || Varinfo[v].type == Z_VECTOR) {
+
+
+      if(Varinfo[v].classify == Z_PER_NODE) {
+        fprintf(stderr," Z_PER_NODE Variable %d:\n",vn);
+      }
+      else {
+        fprintf(stderr," Z_PER_ELEM Variable %d:\n",vn);
+      }
+
+#if (defined GT_USERD_API_100)
+
+      if(Num_time_sets > 0) {
+        /* Get the timeset used for the variable
+         *---------------------------------------*/
+        var_timeset = Varinfo[v].timeset;
+        
+        /* Get the number of time steps for this timeset
+         *----------------------------------------------*/
+        Num_time_steps = USERD_get_num_of_time_steps(var_timeset);
+        if(Num_time_steps < 1) {
+          fprintf(stderr," Error: Number of time steps returned: %d\n",
+                  Num_time_steps);
+          fprintf(stderr," (Must be >0 to be okay)\n");
+          return(Z_ERR);
+        }
+        if(var_time_step > (Num_time_steps - 1)) {
+          var_time_step = Num_time_steps - 1;
+        }
+
+        /* Set the timeset and step - to first step by default, but
+         * can set it at others using -vts command argument
+         *---------------------------------------------------------*/
+        USERD_set_time_set_and_step(var_timeset,var_time_step);
+        
+        fprintf(stderr,"   Using timeset:   %d  (step range is %d through %d)\n",
+                var_timeset,0,Num_time_steps-1);
+        fprintf(stderr,"   Using time step: %d\n",var_time_step);
+      }
+#endif
+
+      
+      /* Get the var description line
+       *-----------------------------*/
+#if (defined GT_USERD_API_100)
+      err = USERD_get_descrip_lines(Z_VARI,vn,FALSE,line1,line2);
+      if(err == Z_OK) {
+        fprintf(stderr,"   Desc line: %s\n",line1);
+      }
+      else {
+        fprintf(stderr,"Error: getting var description line\n");
+        return(Z_ERR);
+      }
+
+      if(Varinfo[v].complex) {
+        err = USERD_get_descrip_lines(Z_VARI,vn,TRUE,line1,line2);
+        if(err == Z_OK) {
+          fprintf(stderr,"   Desc line (imag): %s\n",line1);
+        }
+        else {
+          fprintf(stderr,"Error: getting var description line (imag)\n");
+          return(Z_ERR);
+        }
+      }
+#else
+
+      err = USERD_get_description_lines(Z_VARI,vn,line1,line2);
+      if(err == Z_OK) {
+        fprintf(stderr,"   Desc line: %s\n",line1);
+      }
+      else {
+        fprintf(stderr,"Error: getting var description line\n");
+        return(Z_ERR);
+      }
+
+#endif
+
+      /* Get the values by component
+       *-----------------------------*/
+      if(Varinfo[v].type == Z_SCALAR) {
+        num_comps = 1;
+      }
+      else if(Varinfo[v].type == Z_VECTOR) {
+        num_comps = 3;
+      }
+
+      /* Per_Node
+       *---------*/
+      if(Varinfo[v].classify == Z_PER_NODE) {
+
+        for(p=0; p<Num_parts; ++p) {
+          pn = p + 1;
+
+          if(Pbuild[p].type == Z_UNSTRUCTURED) {
+            nsize = Pbuild[p].nn;
+          }
+          else {
+            for(comp=0; comp<3; ++comp) {
+              if(Pbuild[p].ne[comp] < 1) {
+                bdim[comp] = 1;
+              }
+              else {
+                bdim[comp] = Pbuild[p].ne[comp];
+              }
+            }
+            nsize = bdim[0] * bdim[1] * bdim[2];
+          }
+
+
+
+          if(nsize > 0) {
+
+            fprintf(stderr,"   For part %d, using node %d:\n",pn,nsize);
+
+#if (defined GT_USERD_API_100)
+            err = USERD_get_var_value_at_specific(vn,
+                                                  nsize,
+                                                  pn,
+                                                  0,
+                                                  var_time_step,
+                                                  qvals,
+                                                  FALSE);
+#else
+            err = USERD_get_variable_value_at_specific(vn,
+                                                       nsize,
+                                                       pn,
+                                                       0,
+                                                       var_time_step,
+                                                       qvals);
+#endif
+            if(err == Z_NOT_IMPLEMENTED) {
+              fprintf(stderr,"  Node and element queries not implemented\n");
+              return(Z_OK);
+            }
+            else if(err == Z_ERR) {
+              fprintf(stderr,"     Could not get value\n");
+            }
+            else {
+
+              /* For the component, show 1st node, last node, min, max values
+               *-------------------------------------------------------------*/
+              if(Varinfo[v].type == Z_SCALAR) {
+                fprintf(stderr,"     Scalar value is: %g\n",qvals[0]);
+              }
+              else {
+                fprintf(stderr,"     Vector values are: %g %g %g\n",
+                        qvals[0],qvals[1],qvals[2]);
+              }
+
+#if (defined GT_USERD_API_100)
+              if(Varinfo[v].complex) {
+
+                err = USERD_get_var_value_at_specific(vn,
+                                                      nsize,
+                                                      pn,
+                                                      0,
+                                                      var_time_step,
+                                                      qvals,
+                                                      TRUE);
+
+                if(err == Z_ERR) {
+                  fprintf(stderr,"     Could not get imag value\n");
+                }
+                else {
+
+                  /* For the component, show 1st node, last node, min, max values
+                   *-------------------------------------------------------------*/
+                  if(Varinfo[v].type == Z_SCALAR) {
+                    fprintf(stderr,"     Scalar value (imag) is: %g\n",qvals[0]);
+                  }
+                  else {
+                    fprintf(stderr,"     Vector values (imag) are: %g %g %g\n",
+                            qvals[0],qvals[1],qvals[2]);
+                  }
+                }
+              }
+#endif
+
+            }
+          }
+        }
+      }
+
+      /* Per_Elem
+       *---------*/
+      else {
+        for(p=0; p<Num_parts; ++p) {
+          pn = p + 1;
+
+          if(Pbuild[p].type != Z_UNSTRUCTURED) {
+
+            for(comp=0; comp<3; ++comp) {
+              if(Pbuild[p].ne[comp] < 1) {
+                bdim[comp] = 1;
+              }
+              else {
+                bdim[comp] = Pbuild[p].ne[comp];
+              }
+            }
+            bd1 = bdim[0]-1;
+            if(bd1 < 1) {
+              bd1 = 1;
+            }
+            bd2 = bdim[1]-1;
+            if(bd2 < 1) {
+              bd2 = 1;
+            }
+            bd3 = bdim[2]-1;
+            if(bd3 < 1) {
+              bd3 = 1;
+            }
+            nsize = bd1 * bd2 * bd3;
+
+
+            /* Determine cell type
+             *--------------------*/
+            num_dims = 3;
+            for(i=0; i<3; ++i) {
+              if(bdim[i] == 1) {
+                --num_dims;
+              }
+            }
+            if(num_dims == 3) {
+              cell_type = Z_HEX08;
+            }
+            else if(num_dims == 2) {
+              cell_type = Z_QUA04;
+            }
+            else {
+              cell_type = Z_BAR02;
+            }
+          }
+
+          if(Pbuild[p].type == Z_UNSTRUCTURED) {
+            e1 = 0;
+            e2 = Z_MAXTYPE-1;
+          }
+          else {
+            e1 = e2 = cell_type;
+          }
+
+          for(et=e1; et<=e2; ++et) {
+
+            if(Pbuild[p].type == Z_UNSTRUCTURED) {
+              nsize = Pbuild[p].ne[et];
+            }
+
+            if(nsize > 0) {
+
+
+              fprintf(stderr,"   For part %d, using elem %d of type %s:\n",
+                      pn,nsize,Elem_info[et].name);
+
+
+#if (defined GT_USERD_API_100)
+              err = USERD_get_var_value_at_specific(vn,
+                                                    nsize,
+                                                    pn,
+                                                    et,
+                                                    var_time_step,
+                                                    qvals,
+                                                    FALSE);
+#else
+            err = USERD_get_variable_value_at_specific(vn,
+                                                       nsize,
+                                                       pn,
+                                                       et,
+                                                       var_time_step,
+                                                       qvals);
+#endif
+
+              if(err == Z_NOT_IMPLEMENTED) {
+                fprintf(stderr,"  Node and element queries not implemented\n");
+                return(Z_OK);
+              }
+              else if(err == Z_ERR) {
+                fprintf(stderr,"     Could not get value\n");
+              }
+              else {
+                if(Varinfo[v].type == Z_SCALAR) {
+                  fprintf(stderr,"     Scalar value is: %g\n",qvals[0]);
+                }
+                else {
+                  fprintf(stderr,"     Vector values are: %g %g %g\n",
+                          qvals[0],qvals[1],qvals[2]);
+                }
+                
+#if (defined GT_USERD_API_100)
+                if(Varinfo[v].complex) {
+
+                  err = USERD_get_var_value_at_specific(vn,
+                                                        nsize,
+                                                        pn,
+                                                        et,
+                                                        var_time_step,
+                                                        qvals,
+                                                        TRUE);
+                  if(err == Z_ERR) {
+                    fprintf(stderr,"     Could not get imag value\n");
+                  }
+                  else {
+                    if(Varinfo[v].type == Z_SCALAR) {
+                      fprintf(stderr,"     Scalar value (imag) is: %g\n",qvals[0]);
+                    }
+                    else {
+                      fprintf(stderr,"     Vector values (imag) are: %g %g %g\n",
+                              qvals[0],qvals[1],qvals[2]);
+                    }
+                  }                  
+                }
+#endif
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return(Z_OK);
+}
+
+
+/*--------------
+ * exercise_bkup
+ *--------------*/
+static int
+exercise_bkup( void )
+{
+  int err;
+  FILE *arcfile;
+
+  fprintf(stderr,"\n------------ exercise_archive -----------\n");
+
+  arcfile = fopen("test.arc","wb");
+  if(arcfile == (FILE *)NULL) {
+    fprintf(stderr,"Error: opening test archive file\n");
+    return(Z_ERR);
+  }
+  err = USERD_bkup(arcfile,Z_SAVE_ARCHIVE);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Error: saving to test archive file\n");
+    return(Z_ERR);
+  }
+  fclose(arcfile);
+
+  arcfile = fopen("test.arc","rb");
+  err = USERD_bkup(arcfile,Z_REST_ARCHIVE);
+  if(err == Z_ERR) {
+    fprintf(stderr,"Error: restoring from test archive file\n");
+    return(Z_ERR);
+  }
+
+  fprintf(stderr," Archive test completed\n");
+
+  fclose(arcfile);
+  
+  return(Z_OK);
+}
+
+/* -------------------------------------------------------
+ *  threshold_operator1 & 2 can be one of the following
+ *    Z_ELE_FAILED_NONE,           - disables checking
+ *     Z_ELE_FAILED_GREATER,        - greater than
+ *     Z_ELE_FAILED_LESS,           - less than
+ *     Z_ELE_FAILED_EQUAL,          - equal
+ *     Z_ELE_FAILED_NOT_EQUAL,      - not equal
+ *     Z_ELE_FAILED_MANY            - not used
+ *
+ * logic_criteria2
+ *      Z_ELE_FAILED_LOGIC_NONE,
+ *      Z_ELE_FAILED_LOGIC_AND,
+ *      Z_ELE_FAILED_LOGIC_OR,
+ *      Z_ELE_FAILED_LOGIC_MANY
+ *
+ * ------------------------------------------------------ */
+int load_fail_defaults(void) 
+{
+  int check_for_failed = FALSE; 
+  int cri1 = 0;                 /* Criteria1 ELE_FAILED_GREATER, etc */
+  int cri2 = 0;       
+  int  logic_cri2 = 0;        /* Logic for criteria 2  ELE_FAILED_LOGIC_NONE, AND, etc */
+  float val1 = 0.0;           /* failure threshold 1 */
+  float  val2= 0.0;           /* failure threshold 2 */
+  char failed_var_name[Z_MXVARIABLEDESC]={EOS};
+  
+  check_for_failed =  USERD_get_uns_failed_params( failed_var_name, 
+						   &val1, &val2, &cri1, &cri2,
+						   &logic_cri2 );
+  fprintf(stderr,"\n------------- failed element info -------------\n");
+  if (check_for_failed == TRUE) {
+    fprintf(stderr," Failed element criteria info \n");
+    fprintf(stderr," Variable name = %s\n",failed_var_name);
+    fprintf(stderr," Criteria 1 = %d\n",cri1);
+    fprintf(stderr," Criteria 2 = %d\n",cri1);
+    fprintf(stderr," Logic criteria = %d\n",logic_cri2);
+    fprintf(stderr," Value 1 = %f\n",val1);
+    fprintf(stderr," Value 2 = %f\n",val2);
+  } else {
+    fprintf(stderr," No Failed elements\n");
+  }
+  return(Z_OK);
+}  
+
+
+/* End of File */
diff --git a/applications/test/ensightFoamReader/udr_checker.c b/applications/test/ensightFoamReader/udr_checker.c
new file mode 120000
index 0000000000..2e9390c310
--- /dev/null
+++ b/applications/test/ensightFoamReader/udr_checker.c
@@ -0,0 +1 @@
+udr_checker-80.c
\ No newline at end of file
diff --git a/applications/test/extendedStencil/testExtendedStencil.C b/applications/test/extendedStencil/testExtendedStencil.C
index b8db2b89bf..876576b29e 100644
--- a/applications/test/extendedStencil/testExtendedStencil.C
+++ b/applications/test/extendedStencil/testExtendedStencil.C
@@ -34,7 +34,7 @@ Description
 #include "fvMesh.H"
 #include "volFields.H"
 #include "Time.H"
-#include "mapDistribute.H"
+//#include "mapDistribute.H"
 #include "OFstream.H"
 #include "meshTools.H"
 //#include "FECCellToFaceStencil.H"
diff --git a/applications/test/findCell-octree/findSubSet.C b/applications/test/findCell-octree/findSubSet.C
deleted file mode 100644
index e538efac20..0000000000
--- a/applications/test/findCell-octree/findSubSet.C
+++ /dev/null
@@ -1,229 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "IStringStream.H"
-
-#include "myBoundBox.H"
-#include "myBoundBoxList.H"
-#include "octree.H"
-#include "octreeData.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-
-
-int main(int argc, char *argv[])
-{
-    argList::validOptions.insert("x1", "X1");
-    argList::validOptions.insert("y1", "Y1");
-    argList::validOptions.insert("z1", "Z1");
-
-    argList::validOptions.insert("x2", "X2");
-    argList::validOptions.insert("y2", "Y2");
-    argList::validOptions.insert("z2", "Z2");
-
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    // Calculate BB of all cells
-
-
-    myBoundBoxList allBb(mesh.nCells());
-
-    const pointField& allPoints = mesh.points();
-
-     vectorField bbMin(mesh.nCells());
-     bbMin = vector(GREAT, GREAT, GREAT);
-     vectorField bbMax(mesh.nCells());
-     bbMax = vector(-GREAT, -GREAT, -GREAT);
-
-     const labelListList& pCells = mesh.pointCells();
-
-     forAll(pCells, pointi)
-     {
-         const point& vertCoord = allPoints[pointi];
-
-         const labelList& cells = pCells[pointi];
-
-         forAll(cells, celli)
-         {
-             label cellNum = cells[celli];
-
-             bbMin[cellNum].x() = min(bbMin[cellNum].x(), vertCoord.x());
-             bbMin[cellNum].y() = min(bbMin[cellNum].y(), vertCoord.y());
-             bbMin[cellNum].z() = min(bbMin[cellNum].z(), vertCoord.z());
-
-             bbMax[cellNum].x() = max(bbMax[cellNum].x(), vertCoord.x());
-             bbMax[cellNum].y() = max(bbMax[cellNum].y(), vertCoord.y());
-             bbMax[cellNum].z() = max(bbMax[cellNum].z(), vertCoord.z());
-         }
-     }
-
-
-    forAll(allBb, celli)
-    {
-        allBb[celli] = myBoundBox(bbMin[celli], bbMax[celli]);
-    }
-
-
-    myBoundBox meshBb(allPoints);
-
-    scalar typDim = meshBb.minDim()/111;
-
-    myBoundBox shiftedBb
-    (
-        meshBb.min(),
-        point
-        (
-            meshBb.max().x() + typDim,
-            meshBb.max().y() + typDim,
-            meshBb.max().z() + typDim
-        )
-    );
-
-
-    Info<< "Mesh" << endl;
-    Info<< "   bounding box     :" << shiftedBb << endl;
-    Info<< "   typical dimension:" << shiftedBb.typDim() << endl;
-
-
-    /*
-     * Now we have allBb and shiftedBb
-     */
-
-
-
-    // Construct table of subset of cells
-
-    labelList cellIndices(10);
-
-    cellIndices[0] = 1433;
-    cellIndices[1] = 1434;
-    cellIndices[2] = 1435;
-    cellIndices[3] = 1436;
-    cellIndices[4] = 1437;
-    cellIndices[5] = 1438;
-    cellIndices[6] = 1439;
-    cellIndices[7] = 1440;
-    cellIndices[8] = 1441;
-    cellIndices[9] = 1442;
-
-    // Get the corresponding bounding boxes
-
-    forAll(cellIndices, i)
-    {
-        allBb[i] = allBb[cellIndices[i]];
-    }
-    allBb.setSize(cellIndices.size());
-    
-
-
-    // Wrap indices and mesh information into helper object
-    octreeData shapes(mesh, cellIndices);
-
-    octree oc
-    (
-        shiftedBb,  // overall bounding box
-        shapes,     // all information needed to do checks on cells
-        allBb,      // bounding boxes of cells
-        10.0        // maximum ratio of cubes v.s. cells
-    );
-
-//    scalar x1(readScalar(IStringStream(args.options()["x1"])()));
-//    scalar y1(readScalar(IStringStream(args.options()["y1"])()));
-//    scalar z1(readScalar(IStringStream(args.options()["z1"])()));
-
-//    scalar x2(readScalar(IStringStream(args.options()["x2"])()));
-//    scalar y2(readScalar(IStringStream(args.options()["y2"])()));
-//    scalar z2(readScalar(IStringStream(args.options()["z2"])()));
-
-
-
-    label nFound = 0;
-
-    scalar x = -5.0;
-    for(int i = 0; i < 100; i++)
-    {
-        scalar y = -7.0;
-        for(int j = 0; j < 10; j++)
-        {
-            scalar z = -12.0;
-            for (int k = 0; k < 10; k++)
-            {
-                point sample(x, y, z);
-
-                label index = oc.find(sample);
-
-                // Convert index into shapes back into cellindex.
-                label cell;
-                if (index != -1)
-                {
-                    cell = cellIndices[index];
-                }
-                else
-                {
-                    cell = -1;
-                }
-                Info<< "Point:" << sample
-                    << " is in cell " << cell << "(octree)  "
-                    << mesh.findCell(sample) << "(linear)"
-                    << endl;
-
-                z += 1.2;
-            }
-            y += 0.9;
-        }
-        x += 0.1;
-    }
-
-
-    Info<< "nFound=" << nFound << endl;
-
-    Info<< "End\n" << endl;
-
-
-    Info<< "Statistics:" << endl
-        << "  nCells   :" << allBb.size() << endl
-        << "  nNodes   :" << oc.nNodes() << endl
-        << "  nLeaves  :" << oc.nLeaves() << endl
-        << "  nEntries :" << oc.nEntries() << endl
-        << "  Cells per leaf :"
-        << oc.nEntries()/oc.nLeaves()
-        << endl
-        << "  Every cell in  :"
-        << oc.nEntries()/allBb.size() << " cubes"
-        << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/fvSolutionCombine/Make/files b/applications/test/fvSolutionCombine/Make/files
new file mode 100644
index 0000000000..e16d69f14d
--- /dev/null
+++ b/applications/test/fvSolutionCombine/Make/files
@@ -0,0 +1,3 @@
+fvSolutionCombine.C
+
+EXE = $(FOAM_USER_APPBIN)/fvSolutionCombine
diff --git a/applications/test/fvSolutionCombine/Make/options b/applications/test/fvSolutionCombine/Make/options
new file mode 100644
index 0000000000..fa15f12452
--- /dev/null
+++ b/applications/test/fvSolutionCombine/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+EXE_LIBS = \
+    -lfiniteVolume
diff --git a/applications/test/fvSolutionCombine/fvSolutionCombine.C b/applications/test/fvSolutionCombine/fvSolutionCombine.C
new file mode 100644
index 0000000000..1d9f1017c0
--- /dev/null
+++ b/applications/test/fvSolutionCombine/fvSolutionCombine.C
@@ -0,0 +1,229 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+    fvSolutionCombine
+
+Description
+    Simple utility for combining fvSolution solution entries.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "wordRe.H"
+#include "OSspecific.H"
+
+using namespace Foam;
+
+// check for identical dictionary content, regardless of the order
+bool checkDictionaryContent(const dictionary& dict1, const dictionary& dict2)
+{
+    // trivial cases first
+    if (&dict1 == &dict2)
+    {
+        return true;
+    }
+    else if (dict1.size() != dict2.size())
+    {
+        return false;
+    }
+
+
+    forAllConstIter(dictionary, dict1, iter1)
+    {
+        const entry* entryPtr = dict2.lookupEntryPtr
+        (
+            iter1().keyword(),
+            false,
+            false
+        );
+
+        if (!entryPtr)
+        {
+            return false;
+        }
+
+        const entry& entry1 = iter1();
+        const entry& entry2 = *entryPtr;
+
+        bool ok = false;
+        if (entry1.isDict())
+        {
+            if (entry2.isDict())
+            {
+                ok = checkDictionaryContent(entry1.dict(), entry2.dict());
+            }
+        }
+        else
+        {
+            ok = (entry1 == entry2);
+        }
+
+
+        if (!ok)
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noParallel();
+    argList::validOptions.insert("rewrite", "");
+    argList::validOptions.insert("show", "");
+    argList args(argc, argv);
+
+    Time runTime(args.rootPath(), args.caseName());
+
+    const word dictName("fvSolution");
+
+    bool optRewrite = args.optionFound("rewrite");
+    bool optShow = args.optionFound("show");
+
+    IOdictionary solutionDict
+    (
+        IOobject
+        (
+            dictName,
+            "system",
+            runTime,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+
+    if (!solutionDict.found("solvers"))
+    {
+        Info<<"no solvers entry found in : " << dictName << endl;
+        return 2;
+    }
+
+    if (optRewrite && solutionDict.instance() != "system")
+    {
+        Info<<"instance is not 'system' "
+            "- disabling rewrite for this file" << nl;
+        optRewrite = false;
+    }
+
+    dictionary& solverDict = solutionDict.subDict("solvers");
+
+    wordList names = solverDict.toc();
+    wordList oldNames = names;
+
+    bool changed = false;
+    for (label orig = 0; orig < names.size()-1; ++orig)
+    {
+        // skip patterns or entries that have already been done
+        if (names[orig].empty() || wordRe::isPattern(names[orig]))
+        {
+            continue;
+        }
+
+        const dictionary& dict1 = solverDict.subDict(names[orig]);
+
+        for (label check = orig+1; check < names.size(); ++check)
+        {
+            // skip patterns or entries that have already been done
+            if (names[check].empty() || wordRe::isPattern(names[check]))
+            {
+                continue;
+            }
+
+            const dictionary& dict2 = solverDict.subDict(names[check]);
+
+            // check for identical content
+            if (checkDictionaryContent(dict1, dict2))
+            {
+                names[orig] += "|" + names[check];
+                names[check].clear();
+                changed = true;
+            }
+        }
+    }
+
+    if (changed)
+    {
+        forAll(names, nameI)
+        {
+            if (names[nameI].empty())
+            {
+                solverDict.remove(oldNames[nameI]);
+                Info<<"  #remove " << oldNames[nameI];
+            }
+            else
+            {
+                Info<< "  " << oldNames[nameI];
+
+                if (names[nameI] != oldNames[nameI])
+                {
+                    // make "(abc|def)" pattern
+                    keyType renamed( "(" + names[nameI] + ")", true);
+
+                    solverDict.changeKeyword(oldNames[nameI], renamed);
+
+                    Info<< " -> " << renamed;
+                }
+            }
+            Info<< endl;
+        }
+
+        if (optRewrite)
+        {
+            mvBak(solutionDict.objectPath(), "orig");
+            Info<< "Backup to .orig" << nl
+                << "Writing " << solutionDict.objectPath() << nl << endl;
+
+            solutionDict.regIOobject::write();
+        }
+        else if (optShow)
+        {
+            IOobject::writeDivider(Info);
+            solutionDict.dictionary::write(Info, false);
+        }
+        else
+        {
+            Info<< "\nFile not rewritten" << endl;
+        }
+    }
+    else
+    {
+        Info<< "no changes" << endl;
+    }
+
+    Info<< "Done\n" << endl;
+
+    return changed ? 0 : 1;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/parallel/parallelTest.C b/applications/test/parallel/parallelTest.C
index bf8440ece6..6120de31a5 100644
--- a/applications/test/parallel/parallelTest.C
+++ b/applications/test/parallel/parallelTest.C
@@ -23,19 +23,23 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    icoFoam
+    parallelTest
 
 Description
-    Incompressible laminar CFD code.
+    Test for various parallel routines.
 
 \*---------------------------------------------------------------------------*/
 
+#include "List.H"
+#include "mapDistribute.H"
 #include "argList.H"
 #include "Time.H"
 #include "IPstream.H"
 #include "OPstream.H"
 #include "vector.H"
 #include "IOstreams.H"
+#include "Random.H"
+#include "Tuple2.H"
 
 using namespace Foam;
 
@@ -47,6 +51,99 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 
+
+    // Test mapDistribute
+    // ~~~~~~~~~~~~~~~~~~
+
+    if (false)
+    {
+        Random rndGen(43544*Pstream::myProcNo());
+
+        // Generate random data.
+        List<Tuple2<label, List<scalar> > > complexData(100);
+        forAll(complexData, i)
+        {
+            complexData[i].first() = rndGen.integer(0, Pstream::nProcs()-1);
+            complexData[i].second().setSize(3);
+            complexData[i].second()[0] = 1;
+            complexData[i].second()[1] = 2;
+            complexData[i].second()[2] = 3;
+        }
+
+        // Send all ones to processor indicated by .first()
+
+
+        // Count how many to send
+        labelList nSend(Pstream::nProcs(), 0);
+        forAll(complexData, i)
+        {
+            label procI = complexData[i].first();
+            nSend[procI]++;
+        }
+
+        // Sync how many to send
+        labelListList allNTrans(Pstream::nProcs());
+        allNTrans[Pstream::myProcNo()] = nSend;
+        combineReduce(allNTrans, mapDistribute::listEq());
+
+        // Collect items to be sent
+        labelListList sendMap(Pstream::nProcs());
+        forAll(sendMap, procI)
+        {
+            sendMap[procI].setSize(nSend[procI]);
+        }
+        nSend = 0;
+        forAll(complexData, i)
+        {
+            label procI = complexData[i].first();
+            sendMap[procI][nSend[procI]++] = i;
+        }
+
+        // Collect items to be received
+        labelListList recvMap(Pstream::nProcs());
+        forAll(recvMap, procI)
+        {
+            recvMap[procI].setSize(allNTrans[procI][Pstream::myProcNo()]);
+        }
+
+        label constructSize = 0;
+        // Construct with my own elements first
+        forAll(recvMap[Pstream::myProcNo()], i)
+        {
+            recvMap[Pstream::myProcNo()][i] = constructSize++;
+        }
+        // Construct from other processors
+        forAll(recvMap, procI)
+        {
+            if (procI != Pstream::myProcNo())
+            {
+                forAll(recvMap[procI], i)
+                {
+                    recvMap[procI][i] = constructSize++;
+                }
+            }
+        }
+
+
+
+        // Construct distribute map (destructively)
+        mapDistribute map(constructSize, sendMap.xfer(), recvMap.xfer());
+
+        // Distribute complexData
+        mapDistribute::distribute
+        (
+            Pstream::nonBlocking,
+            List<labelPair>(),
+            map.constructSize(),
+            map.subMap(),
+            map.constructMap(),
+            complexData
+        );
+
+        Pout<< "complexData:" << complexData << endl;
+    }
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Perr<< "\nStarting transfers\n" << endl;
@@ -60,13 +157,13 @@ int main(int argc, char *argv[])
             {
                 Perr<< "slave sending to master "
                     << Pstream::masterNo() << endl;
-                OPstream toMaster(Pstream::masterNo());
+                OPstream toMaster(Pstream::blocking, Pstream::masterNo());
                 toMaster << data;
             }
 
             Perr<< "slave receiving from master " 
                 << Pstream::masterNo() << endl;
-            IPstream fromMaster(Pstream::masterNo());
+            IPstream fromMaster(Pstream::blocking, Pstream::masterNo());
             fromMaster >> data;
 
             Perr<< data << endl;
@@ -81,7 +178,7 @@ int main(int argc, char *argv[])
             )
             {
                 Perr << "master receiving from slave " << slave << endl;
-                IPstream fromSlave(slave);
+                IPstream fromSlave(Pstream::blocking, slave);
                 fromSlave >> data;
 
                 Perr<< data << endl;
@@ -95,7 +192,7 @@ int main(int argc, char *argv[])
             )
             {
                 Perr << "master sending to slave " << slave << endl;
-                OPstream toSlave(slave);
+                OPstream toSlave(Pstream::blocking, slave);
                 toSlave << data;
             }
         }
diff --git a/applications/test/passiveParticle/Make/files b/applications/test/passiveParticle/Make/files
new file mode 100644
index 0000000000..1a93cde7a3
--- /dev/null
+++ b/applications/test/passiveParticle/Make/files
@@ -0,0 +1,4 @@
+
+passiveParticleTest.C
+
+EXE = $(FOAM_USER_APPBIN)/passiveParticleTest
diff --git a/applications/test/passiveParticle/Make/options b/applications/test/passiveParticle/Make/options
new file mode 100644
index 0000000000..ca03416955
--- /dev/null
+++ b/applications/test/passiveParticle/Make/options
@@ -0,0 +1,8 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude
+
+EXE_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
+    -llagrangian
diff --git a/applications/test/passiveParticle/passiveParticleTest.C b/applications/test/passiveParticle/passiveParticleTest.C
new file mode 100644
index 0000000000..15ba56f4fa
--- /dev/null
+++ b/applications/test/passiveParticle/passiveParticleTest.C
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+    testPassiveParticle
+
+Description
+    Test cloud of passive particles.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "passiveParticleCloud.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    argList::validArgs.append("cloudName");
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    runTime.functionObjects().off();
+
+    const word cloudName(args.additionalArgs()[0]);
+
+    {
+        // Start with empty cloud
+        passiveParticleCloud particles
+        (
+            mesh,
+            cloudName,
+            IDLList<passiveParticle>()
+        );
+        Pout<< "Starting particles:" << particles.size() << endl;
+
+        Pout<< "Adding a particle." << endl;
+        particles.addParticle(new passiveParticle(particles, vector::zero, -1));
+
+        forAllConstIter(passiveParticleCloud, particles, iter)
+        {
+            Pout<< "    " << iter().position() << " cell:" << iter().cell()
+                << " origProc:" << iter().origProc()
+                << " origId:" << iter().origId()
+                << endl;
+        }
+
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+            << nl << endl;
+
+        runTime++;
+        Pout<< "Writing particles to time " << runTime.timeName() << endl;
+        particles.write();
+    }
+
+    {
+        Pout<< "Rereading particles from time " << runTime.timeName()
+            << endl;
+        passiveParticleCloud particles(mesh, cloudName);
+        Pout<< "Reread particles:" << particles.size() << endl;
+
+        forAllConstIter(passiveParticleCloud, particles, iter)
+        {
+            Pout<< "    " << iter().position() << " cell:" << iter().cell()
+                << " origProc:" << iter().origProc()
+                << " origId:" << iter().origId()
+                << endl;
+        }
+    }
+
+
+    Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+        << nl << endl;
+
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/tokenizeTest/Make/files b/applications/test/tokenizeTest/Make/files
new file mode 100644
index 0000000000..c2db390007
--- /dev/null
+++ b/applications/test/tokenizeTest/Make/files
@@ -0,0 +1,3 @@
+tokenizeTest.C
+
+EXE = $(FOAM_USER_APPBIN)/tokenizeTest
diff --git a/applications/test/tokenizeTest/Make/options b/applications/test/tokenizeTest/Make/options
new file mode 100644
index 0000000000..42da6e3418
--- /dev/null
+++ b/applications/test/tokenizeTest/Make/options
@@ -0,0 +1,7 @@
+/*
+  check for consistent behaviour with non-optimized code
+  */
+
+EXE_INC = \
+    -DFULLDEBUG -g -O0
+
diff --git a/applications/test/tokenizeTest/tokenizeTest.C b/applications/test/tokenizeTest/tokenizeTest.C
new file mode 100644
index 0000000000..99bc599984
--- /dev/null
+++ b/applications/test/tokenizeTest/tokenizeTest.C
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+
+Description
+    Test the tokenizing of various things
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "IOobject.H"
+#include "IOstreams.H"
+#include "IFstream.H"
+#include "IStringStream.H"
+#include "cpuTime.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noParallel();
+    argList::validArgs.insert("string .. stringN");
+    argList::validOptions.insert("file", "name");
+    argList::validOptions.insert("repeat", "count");
+
+    argList args(argc, argv, false, true);
+
+    label repeat = 1;
+    args.optionReadIfPresent<label>("repeat", repeat);
+
+    cpuTime timer;
+
+    for (label count = 0; count < repeat; ++count)
+    {
+        forAll(args.additionalArgs(), argI)
+        {
+            const string& rawArg = args.additionalArgs()[argI];
+            if (count == 0)
+            {
+                Info<< "input string: " << rawArg << nl;
+            }
+
+            IStringStream is(rawArg);
+
+            while (is.good())
+            {
+                token tok(is);
+                if (count == 0)
+                {
+                    Info<< "token: " << tok.info() << endl;
+                }
+            }
+
+            if (count == 0)
+            {
+                Info<< nl;
+                IOobject::writeDivider(Info);
+            }
+        }
+    }
+
+    Info<< "tokenized args " << repeat << " times in "
+        << timer.cpuTimeIncrement() << " s\n\n";
+
+    if (args.optionFound("file"))
+    {
+        for (label count = 0; count < repeat; ++count)
+        {
+            IFstream is(args.option("file"));
+
+            if (count == 0)
+            {
+                Info<< "tokenizing file: " << args.option("file") << nl;
+            }
+
+            while (is.good())
+            {
+                token tok(is);
+                if (count == 0)
+                {
+                    Info<< "token: " << tok.info() << endl;
+                }
+            }
+
+            if (count == 0)
+            {
+                Info<< nl;
+                IOobject::writeDivider(Info);
+            }
+        }
+
+        Info<< "tokenized file " << repeat << " times in "
+            << timer.cpuTimeIncrement() << " s\n\n";
+    }
+
+    return 0;
+}
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/Make/options b/applications/utilities/mesh/advanced/refineHexMesh/Make/options
index 376f4dff51..baa7b45f00 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/Make/options
+++ b/applications/utilities/mesh/advanced/refineHexMesh/Make/options
@@ -7,4 +7,5 @@ EXE_INC = \
 EXE_LIBS = \
     -ldynamicMesh \
     -lmeshTools \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/mesh/advanced/removeFaces/Make/options b/applications/utilities/mesh/advanced/removeFaces/Make/options
index 4acbc2cd2e..63c5dc5d78 100644
--- a/applications/utilities/mesh/advanced/removeFaces/Make/options
+++ b/applications/utilities/mesh/advanced/removeFaces/Make/options
@@ -6,4 +6,5 @@ EXE_INC = \
 EXE_LIBS = \
     -lmeshTools \
     -ldynamicMesh \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index 47ec7f9137..f4bf559009 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -908,10 +908,10 @@ int main(int argc, char *argv[])
             runTime.constant(),
             runTime
         ),
-        foamPoints,
-        foamFaces,
-        foamOwner,
-        foamNeighbour
+        xferMove<pointField>(foamPoints),
+        xferMove<faceList>(foamFaces),
+        xferCopy<labelList>(foamOwner),
+        xferMove<labelList>(foamNeighbour)
     );
 
     // Create patches. Use patch types to determine what Foam types to generate.
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/Make/options b/applications/utilities/mesh/conversion/polyDualMesh/Make/options
index dc318df998..f3d9c89aac 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/Make/options
+++ b/applications/utilities/mesh/conversion/polyDualMesh/Make/options
@@ -5,5 +5,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -ldynamicMesh \
     -lmeshTools
diff --git a/applications/utilities/mesh/generation/blockMesh/createMergeList.C b/applications/utilities/mesh/generation/blockMesh/createMergeList.C
index 551b9eec67..b46317652d 100644
--- a/applications/utilities/mesh/generation/blockMesh/createMergeList.C
+++ b/applications/utilities/mesh/generation/blockMesh/createMergeList.C
@@ -30,7 +30,7 @@ License
 
 Foam::labelList Foam::blockMesh::createMergeList()
 {
-    Info<< nl << "Creating merge list " << flush;
+    Info<< nl << "Creating merge list" << flush;
 
     labelList MergeList(nPoints_, -1);
 
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C b/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C
index 6a2d41a83e..9329c33f6d 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C
+++ b/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C
@@ -107,7 +107,7 @@ autoPtr<curvedEdge> curvedEdge::New(const pointField& points, Istream& is)
         FatalErrorIn("curvedEdge::New(const pointField&, Istream&)")
             << "Unknown curvedEdge type " << curvedEdgeType << endl << endl
             << "Valid curvedEdge types are" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << abort(FatalError);
     }
 
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C
index 967481cff9..e511ef9082 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C
@@ -47,7 +47,7 @@ Foam::autoPtr<Foam::extrudeModel> Foam::extrudeModel::New
             << extrudeModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid extrudeModel types are :" << nl
-            << dictionaryConstructorTablePtr_->toc() << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 6f086523dd..9a0825ac91 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -203,8 +203,8 @@ int main(int argc, char *argv[])
         IOobject
         (
             "abc",                      // dummy name
-            //mesh.time().constant(),     // instance
-            mesh.time().findInstance("triSurface", word::null),// instance
+            mesh.time().constant(),     // instance
+            //mesh.time().findInstance("triSurface", word::null),// instance
             "triSurface",               // local
             mesh.time(),                // registry
             IOobject::MUST_READ,
diff --git a/applications/utilities/mesh/manipulation/createBaffles/Make/options b/applications/utilities/mesh/manipulation/createBaffles/Make/options
index d4ab8c1b6b..f7e0c60fed 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/Make/options
+++ b/applications/utilities/mesh/manipulation/createBaffles/Make/options
@@ -6,4 +6,5 @@ EXE_INC = \
 EXE_LIBS = \
     -ldynamicMesh \
     -lmeshTools \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatchDict b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
index 2ab9a8b3cc..9704392a10 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatchDict
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatchDict
@@ -53,18 +53,18 @@ patches
         name sidePatches;
 
         // Type of new patch
-	dictionary
-	{
+        dictionary
+        {
             type cyclic;
 
-	    // Optional: explicitly set transformation tensor.
+            // Optional: explicitly set transformation tensor.
             // Used when matching and synchronising points.
             //transform translational;
             //separationVector (-2289 0 0);
-	    transform rotational;
-	    rotationAxis (1 0 0);
+            transform rotational;
+            rotationAxis (1 0 0);
             rotationCentre (0 0 0);
-	}
+        }
 
         // How to construct: either from 'patches' or 'set'
         constructFrom patches;
@@ -80,10 +80,10 @@ patches
         name bottom;
 
         // Type of new patch
-	dictionary
-	{
+        dictionary
+        {
             type wall;
-	}
+        }
 
         constructFrom set;
 
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options
index 792a51bf7f..523fc41d30 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options
@@ -5,5 +5,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lmeshTools \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Make/options b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
index 8a7e5d1674..a8d7971b3b 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
@@ -8,4 +8,5 @@ EXE_LIBS = \
     -lmeshTools \
     -ldynamicMesh \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -ldecompositionMethods
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options b/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options
index 9b8c3dea8c..da1b9c5016 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options
@@ -5,5 +5,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -ldynamicMesh \
     -lmeshTools
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/Make/options b/applications/utilities/mesh/manipulation/stitchMesh/Make/options
index 98adec69d3..ac523b8282 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/stitchMesh/Make/options
@@ -1,9 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude 
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -ldynamicMesh \
     -lmeshTools \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 859ddf20a2..a5adac74e8 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -105,6 +105,8 @@ int main(int argc, char *argv[])
 
     Foam::argList::validOptions.insert("overwrite", "");
 
+    Foam::argList::validOptions.insert("toleranceDict", "file with tolerances");
+
 #   include "setRootCase.H"
 #   include "createTime.H"
     runTime.functionObjects().off();
@@ -168,6 +170,22 @@ int main(int argc, char *argv[])
             << "If this is not the case use the -partial option" << nl << endl;
     }
 
+    // set up the tolerances for the sliding mesh
+    dictionary slidingTolerances;
+    if (args.options().found("toleranceDict")) 
+    {
+        IOdictionary toleranceFile(
+            IOobject(
+                args.options()["toleranceDict"],
+                runTime.constant(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE                 
+            )
+        );
+        slidingTolerances += toleranceFile;
+    }
+
     // Check for non-empty master and slave patches
     checkPatch(mesh.boundaryMesh(), masterPatchName);
     checkPatch(mesh.boundaryMesh(), slavePatchName);
@@ -320,6 +338,11 @@ int main(int argc, char *argv[])
                 true                    // couple/decouple mode
             )
         );
+        static_cast<slidingInterface&>(stitcher[0]).setTolerances
+        (
+            slidingTolerances,
+            true
+        );
     }
 
 
diff --git a/applications/utilities/mesh/manipulation/transformPoints/Make/options b/applications/utilities/mesh/manipulation/transformPoints/Make/options
index fa15f12452..16eb624bec 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/Make/options
+++ b/applications/utilities/mesh/manipulation/transformPoints/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
index cd48777de1..02d0e1e956 100644
--- a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
+++ b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
@@ -33,6 +33,7 @@ Description
 
 #include "argList.H"
 #include "IFstream.H"
+#include "IOobject.H"
 #include "dictionary.H"
 
 using namespace Foam;
@@ -42,13 +43,19 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::noBanner();
+    argList::noParallel();
     argList::validArgs.clear();
     argList::validArgs.append("inputDict");
     argList args(argc, argv);
 
-    IFstream dictStream(args.additionalArgs()[0]);
-    dictionary inputDict(dictStream);
-    Info<< inputDict << endl;
+    const string& dictName = args.additionalArgs()[0];
+
+    Info<<"//\n// expansion of dictionary " << dictName << "\n//\n";
+
+    dictionary(IFstream(dictName)()).write(Info, false);
+
+    IOobject::writeDivider(Info);
 
     return 0;
 }
diff --git a/applications/utilities/miscellaneous/foamFormatConvert/Make/options b/applications/utilities/miscellaneous/foamFormatConvert/Make/options
index 10105d2d8a..b2bc2047e3 100644
--- a/applications/utilities/miscellaneous/foamFormatConvert/Make/options
+++ b/applications/utilities/miscellaneous/foamFormatConvert/Make/options
@@ -6,5 +6,5 @@ EXE_INC = \
 EXE_LIBS = \
     -lmeshTools \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -llagrangian
-
diff --git a/applications/utilities/miscellaneous/patchSummary/Make/options b/applications/utilities/miscellaneous/patchSummary/Make/options
index fa15f12452..16eb624bec 100644
--- a/applications/utilities/miscellaneous/patchSummary/Make/options
+++ b/applications/utilities/miscellaneous/patchSummary/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/options b/applications/utilities/parallelProcessing/decomposePar/Make/options
index 4b1adfd7ba..a1b8151fdd 100644
--- a/applications/utilities/parallelProcessing/decomposePar/Make/options
+++ b/applications/utilities/parallelProcessing/decomposePar/Make/options
@@ -6,6 +6,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -ldecompositionMethods \
     -llagrangian \
     -lmeshTools
diff --git a/applications/utilities/parallelProcessing/reconstructPar/Make/options b/applications/utilities/parallelProcessing/reconstructPar/Make/options
index 6aa54bb838..b041c31836 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/Make/options
+++ b/applications/utilities/parallelProcessing/reconstructPar/Make/options
@@ -4,5 +4,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -llagrangian \
     -lmeshTools
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/Make/options b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/Make/options
index fa15f12452..16eb624bec 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/writeFluentFields.C b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/writeFluentFields.C
deleted file mode 100644
index 8e3a74ec23..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/writeFluentFields.C
+++ /dev/null
@@ -1,65 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-    writeFluentFields
-
-\*---------------------------------------------------------------------------*/
-
-#include "error.H"
-
-#include "writeFluentFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-#define volTypeField volScalarField
-#define TypeField scalarField
-#define nTypeComponents 1
-
-#include "writeFluentTypeField.C"
-
-#undef nTypeComponents
-#undef TypeField
-#undef volTypeField
-
-
-#define volTypeField volVectorField
-#define TypeField vectorField
-#define nTypeComponents 3
-
-#include "writeFluentTypeField.C"
-
-#undef nTypeComponents
-#undef TypeField
-#undef volTypeField
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/foamCalc/Make/options b/applications/utilities/postProcessing/foamCalc/Make/options
index dbe9ddc048..a49fb12041 100644
--- a/applications/utilities/postProcessing/foamCalc/Make/options
+++ b/applications/utilities/postProcessing/foamCalc/Make/options
@@ -4,4 +4,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lfoamCalcFunctions
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options
index b40ecb51d7..1e936c1d5d 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options
@@ -12,6 +12,7 @@ EXE_INC = \
 
 LIB_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -llagrangian \
     -lmeshTools \
     $(GLIBS)
diff --git a/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/Make/options b/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/Make/options
index 670c68424b..7dd2c76c8b 100644
--- a/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/Make/options
@@ -5,4 +5,5 @@ EXE_INC = \
 
 LIB_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     $(GLIBS)
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/Make/options b/applications/utilities/postProcessing/graphics/ensightFoamReader/Make/options
index 7a5a2e9b1c..8d21a9eae4 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/Make/options
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/Make/options
@@ -7,5 +7,6 @@ EXE_INC = \
 LIB_LIBS = \
     -lOpenFOAM \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -llagrangian \
     $(PROJECT_LIBS)
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_2.05 b/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_2.05
new file mode 100644
index 0000000000..b92bb1c988
--- /dev/null
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_2.05
@@ -0,0 +1,4543 @@
+README_USERD_2.05
+=================
+--------------------------------------
+EnSight User Defined Reader Capability   ===> (API 2.05)
+--------------------------------------
+A user defined reader capability is included in EnSight which can allow
+otherwise unsupported structured or unstructured data to be read.  The user
+defined reader capability utilizes dynamic shared libraries composed of
+routines defined in this document but produced by you, the user, (or some
+third party). This capability is currently available for dec, ibm, hp, sgi,
+sun, linux, alpha linux, and NT servers.
+
+You should refer to beginning of README_USERD_2.0  and/or README_1.0_to_2.0
+for a discussion of the differences between API 1.0 and API 2.*.
+
+***>> API 2.05 additional capabilities (beyond API 2.04):
+Routines to handle material species.
+    USERD_get_number_of_species
+    USERD_get_matsp_info
+
+Routines to handle variable extraction parameters after a read, and then
+update the variables accordingly.  Similar to the extra GUI capabilities
+(which are processed before a read).  (Can actually be added to pre-2.05 readers)
+    USERD_get_var_extract_gui_numbers
+    USERD_get_var_extract_gui_defaults
+    USERD_set_var_extract_gui_data
+
+Routines to obtain rigid body values from a reader.
+(Routines were added - EnSight is now using for Nastran and STL readers
+                       with Dynasty rigid body motion data file)
+    USERD_rigidbody_existence
+    USERD_rigidbody_values
+
+Routine that lets reader know when EnSight is getting the right side of a time
+interval for variable interpolation between steps.  Not generally needed for
+most readers - however, may be needed for those that implement rigid body, and
+wish to cache left and right timespan information for interpolation within the
+reader itself.  (Can actually be added to pre-2.05 readers)
+    USERD_set_right_side
+
+
+***>> API 2.04 additional capabilities (beyond API 2.03):
+Routines to handle failed elements.  Basically 
+a.One routine to return a flag indicating the existence of 
+  failed elements in at least one part in at least one 
+  timestep in the model.  
+b.A second routine to return a matrix of flags indexed by part and
+  element type indicating which parts and element types have failed
+  elements at the current time step.
+c.Finally a third routine to return an array of flags for a given
+  part and element type that is number of elements of that type long
+  indicating which elements have failed, and which have not failed.
+
+
+***>> API 2.03 additional capabilities (beyond API 2.01):
+1. Routines to handle materials
+2. Routines to handle nsided and nfaced elements
+3. Modified routine to handle structured ranges
+
+
+****************************************************************************
+Note: The dummy_gold reader, the Ensight Gold example reader, the
+      ABAQUS_ODB reader and the LS-DYNA reader have been moved to 
+      this 2.04 API level.
+****************************************************************************
+
+
+The process for producing a user defined reader is:
+---------------------------------------------------
+1. Write code for all pertinent routines in the library (Unless someone else
+   has done this for you).
+
+        This is of course where the work is done by the user.  The word
+        "pertinent" is used because depending on the nature of the data, some
+        of the routines in the library may be dummy routines.
+
+        The source code for a dummy_gold library and for various other
+        working or sample libraries is copied from the installation CD during
+        installation.  These will be located in directories under:
+
+        $CEI_HOME/ensight76/user_defined_src/readers
+
+        examples:
+        --------
+        Basic dummy_gold routines provide skeleton for a new reader
+          $CEI_HOME/ensight76/user_defined_src/readers/dummy_gold
+
+        Sample library which reads unstructured binary EnSight Gold data
+          $CEI_HOME/ensight76/user_defined_src/readers/ensight_gold
+
+        You may find it useful to place your library source in this area as
+        well, but are not limited to this location.
+
+ * ===>	The descriptions of each library routine and the order that the
+        routines are called, which is provided in this file, along with
+        the example libraries, should make it possible for you to produce
+        code for your own data reader.	
+
+
+2. Produce the dynamic shared library.
+
+   This is a compiling and loading process which varies according to
+   the type of machine you are on.  In the user-defined-reader source
+   tree we have tried to isolate the machine dependent parts of the
+   build process using a set of files in the 'config' directory.  In this
+   directory there is a configuration file for each platform on which
+   EnSight is supported.  Before you can compile the installed readers
+   you should run the script called 'init' in the config directory.
+
+      i.e.  (for UNIX)
+            cd config
+            ./init sgi_6.5_n64
+            cd ..
+            make
+
+   If you are compiling for Windows NT, there are two options.  If you
+   have the Cygwin GNU utilities installed, you can use GNU make as for
+   Unix.  Otherwise, there is a script called makeall.cmd which will
+   build all of the readers using nmake.  The Makefiles in each reader
+   directory will work using either make or nmake.
+
+      i.e.  (WIN32 Cygwin)                 (using nmake)
+            cd config                      cd config
+            sh init win32                  cp win32 config
+            cd ..                          cd ..
+                                           mkdir lib
+            make                           makeall.cmd
+
+   If you have platform-specific portions of code in your reader, the
+   build system defines a set of flags which can be used within
+   #ifdef ... #endif regions in your source, as shown in the table
+   below.
+
+   Because the readers are now dynamically opened by EnSight, you may
+   have to include dependent libraries on your link-line to avoid having
+   unresolved symbols.  If you are having problems with a reader, start
+   ensight as "ensight7 -readerdbg" and you will get feedback on any
+   problems encountered in loading a reader.  If there are unresolved
+   symbols, you need to find the library which contains the missing
+   symbols and link it into your reader by adding it to the example
+   link commands below.
+
+   If you choose to use a different build environment for your reader,
+   you should take care to use compatible compilation flags to ensure
+   compatibilty with the EnSight executables, most notably on the SGI
+   and HP-UX 11.0 platforms, which should use the following flags:
+
+      sgi_6.2_o32: -mips2
+      sgi_6.2_n64: -mips4 -64
+      sgi_6.5_n32: -mips3
+      sgi_6.5_n64: -mips4 -64
+       hp_11.0_32: +DA2.0
+       hp_11.0_64: +DA2.0W
+
+    ______________________________________________________________________
+   | MACHINE | OS flag               |  SHARED LIBRARY NAME PRODUCED      |
+   |  TYPE   |------------------------------------------------------------|
+   |         |         LD COMMAND USED IN MAKEFILE                        |
+    ======================================================================
+    ______________________________________________________________________
+   | sgi     | -DSGI                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -shared -all -o libuserd-X.so libuserd-X.o              |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | hp      | -DHP                  |  libuserd-X.sl                     |
+   |         |------------------------------------------------------------|
+   |         | ld -b -o libuserd-X.sl libuserd-X.o                        |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | sun     | -DSUN                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -G -o libuserd-X.so libuserd-X.o                        |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | dec     | -DDEC                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -shared -all -o libuserd-X.so libuserd-X.o -lc          |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | linux   | -DLINUX               |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -shared -o libuserd-X.so libuserd-X.o -lc               |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | alpha   | -DALINUX              |  libuserd-X.so                     |
+   | linux   |------------------------------------------------------------|
+   |         | ld -shared -o libuserd-X.so libuserd-X.o -lc               |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | ibm     | -DIBM                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -G -o libuserd-X.so libuserd-X.o -bnoentry -bexpall -lc |
+    ----------------------------------------------------------------------
+
+   Once you have created your library, you should place it in a directory
+   of your choice or in the standard reader location:
+
+      $CEI_HOME/ensight76/machines/$CEI_ARCH/lib_readers
+
+   For example, if you created a reader for "mydata", you should create
+   the reader libuserd-mydata.so and place the file in your own reader
+   directory (see section 3 below) or in the standard location:
+
+      $CEI_HOME/ensight76/machines/$CEI_ARCH/lib_readers/libuserd-mydata.so
+
+
+3. By default EnSight will load all readers found in the directory:
+
+      $CEI_HOME/ensight76/machines/$CEI_ARCH/lib_readers
+
+   Files with names "libuserd-X.so" (where X is a name unique to the reader)
+   are assumed to be user-defined readers.
+
+   There are two methods which can be used to supplement the default
+   behavior.
+
+   (1) A feature which is useful for site-level or user-level configuration
+       is the optional environment variable $ENSIGHT7_READER.  This
+       variable directs EnSight to load all readers in the specified reader
+       directory (you should probably specify a full path) before loading
+       the built-in readers.  If the same reader exists in both directories
+       (as determined by the name returned by USERD_get_name_of_reader(),
+       NOT by the filename), the locally configured reader will take
+       precedence.
+
+   (2) A useful feature for end-users is the use of the libuserd-devel
+       reader.  EnSight will search for a reader named libuserd-devel.so
+       (.sl for HP or .dll for NT).  This reader can exist anywhere in the
+       library path (see below) of the user.  This is useful for an
+       individual actively developing a reader because the existence of a
+       libuserd-devel library will take precedence over any other library
+       which returns the same name from USERD_get_name_of_reader().
+
+   As an example, a site may install commonly used readers in a common
+   location, and users can set the ENSIGHT7_READER variable to access them:
+
+      setenv ENSIGHT7_READER /usr/local/lib/e7readers
+  
+   A user working on a new reader may compile the reader and place it in
+   a directory specified by the library path:
+
+      cp libuserd-myreader.so ~/lib/libuserd-devel.so
+      setenv <librarypath> ~/lib:$<librarypath>
+
+   The user is responsible for correctly configuring the library path
+   variable in order to make use of the libuserd-devel feature.  The
+   library environment variables used are:
+
+        Machine type    Environment variable to set
+        ------------    ---------------------------
+        sgi             LD_LIBRARY_PATH
+        dec             LD_LIBRARY_PATH
+        sun             LD_LIBRARY_PATH
+        linux           LD_LIBRARY_PATH
+        alpha linux     LD_LIBRARY_PATH
+        hp              SHLIB_PATH
+        ibm             LIBPATH
+
+As always, EnSight support is available if you need it.
+
+-------------------------------
+Quick Index of Library Routines
+-------------------------------
+
+Generally Needed for UNSTRUCTURED data
+--------------------------------------
+USERD_get_part_coords                 part's node coordinates
+USERD_get_part_node_ids               part's node ids
+USERD_get_part_elements_by_type       part's element connectivites
+USERD_get_part_element_ids_by_type    part's element ids
+
+
+Generally Needed for BLOCK data
+--------------------------------------
+USERD_get_block_coords_by_component   block coordinates
+USERD_get_block_iblanking             block iblanking values
+USERD_get_ghosts_in_block_flag        block ghost cell existence?
+USERD_get_block_ghost_flags           block ghost cell flags
+
+  These routines, which formerly were only for unstructured data, will now
+  also be called for structured data if you specify that ids will be given
+  in the USERD_get_node_label_status and USERD_get_element_label_status rotuines
+  ------------------------------------------------------------------------------ 
+  USERD_get_part_node_ids               part's node ids
+  USERD_get_part_element_ids_by_type    part's element ids
+
+
+Generally needed for either or both kinds of data
+-------------------------------------------------
+USERD_get_name_of_reader              name of reader for GUI
+USERD_get_reader_version              provide reader version number
+USERD_get_reader_descrip              provide GUI more description (optional)
+
+USERD_set_filenames                   filenames entered in GUI
+USERD_set_server_number               server which of how many
+
+USERD_get_number_of_timesets          number of timesets
+USERD_get_timeset_description         description of timeset
+USERD_get_geom_timeset_number         timeset # to use for geom
+
+USERD_get_num_of_time_steps           number of time steps
+USERD_get_sol_times                   solution time values
+USERD_set_time_set_and_step           current timeset and time step
+
+USERD_get_gold_part_build_info        Gets the info needed for part building process
+USERD_get_changing_geometry_status    changing geometry?
+USERD_get_node_label_status           node labels?
+USERD_get_element_label_status        element labels?
+USERD_get_model_extents               provide model bounding extents
+USERD_get_number_of_files_in_dataset  number of files in model
+USERD_get_dataset_query_file_info     info about each model file
+USERD_get_descrip_lines               file associated description lines
+USERD_get_number_of_model_parts       number of model parts
+USERD_get_part_build_info             part/block type/descrip etc.
+USERD_get_maxsize_info                part/block allocation maximums
+USERD_get_ghosts_in_model_flag        model contains ghost cells?
+USERD_get_nsided_conn                 Gets the element connectivities for nsided
+                                        elements. (utilizes the number of nodes
+                                        per element obtained in
+                                        USERD_get_part_elements_by_type)
+USERD_get_nfaced_nodes_per_face       Gets the number of nodes per face for nfaced
+                                        elements (utilizes the number of faces
+                                        per element obtained in
+                                        USERD_get_part_elements_by_type)
+USERD_get_nfaced_conn                 Gets the element connectivities for nfaced
+                                        elements (utilizes the number of nodes
+                                        per face obtained in
+                                        USERD_get_nfaced_nodes_per_face)
+
+
+USERD_get_border_availability         part border provided?
+USERD_get_border_elements_by_type     part border conn and parent info
+
+USERD_get_number_of_variables         number of variables
+USERD_get_gold_variable_info          variable type/descrip etc.
+USERD_get_var_by_component            part or block variable values
+USERD_get_constant_val                constant variable's value
+USERD_get_var_value_at_specific       node's or element's variable value over time
+USERD_stop_part_building              cleanup after part build routine
+
+USERD_get_number_of_material_sets     Gets the number of material sets
+USERD_get_matf_set_info               Gets the material set indices and names
+USERD_get_number_of_materials         Gets the number of materials
+USERD_get_matf_var_info               Gets the material indices and descriptions
+USERD_size_matf_data                  Gets the length of either the
+                                        material ids list,
+                                        mixed-material ids list, or
+                                        mixed-material values list
+USERD_load_matf_data                  Gets the material ids list,
+                                        mixed-material ids list, or
+                                        mixed-material values list
+
+USERD_bkup                            archive routine
+
+USERD_exit_routine                    cleanup upon exit routine
+
+
+---------------------------
+Optional Extra GUI Info
+Adds Toggle(s), Pulldown(s) Field(s)
+that can be used for additonal input
+---------------------------
+USERD_get_extra_gui_numbers          Gets the number of toggles, pulldowns and fields
+USERD_get_extra_gui_defaults         Gets the default values for the GUI members
+USERD_set_extra_gui_data             Returns the answers provided by the user
+
+USERD_rigidbody_existence            Returns whether rigid body transformation
+                                       data exists for the model.
+USERD_rigidbody_values               Returns the euler and location values for a
+                                       given part
+
+USERD_set_right_side                 Simply informs the reader when the time set
+                                     is for the right side of a time span during
+                                     variable interpolation between time steps.
+
+New at 2.04
+-----------
+
+/* ----------------------------------------------------------
+ *
+ *  Failure criteria in LS-DYNA 
+ *  if fail flag == threshold_val1 (0.0) then element fails
+ *    logic_criteria2 not used
+ *    threshold_val2 not used
+ *    threshold_operator2 not used
+ *  Return (Z_ERR) if this is not used.
+ * Return Z_OK if failed element feature should be used
+ *
+ *  threshold_operator1 & 2 can be one of the following
+ *    Z_ELE_FAILED_NONE,           - disables checking
+ *     Z_ELE_FAILED_GREATER,        - greater than
+ *     Z_ELE_FAILED_LESS,           - less than
+ *     Z_ELE_FAILED_EQUAL,          - equal
+ *     Z_ELE_FAILED_NOT_EQUAL,      - not equal
+ *     Z_ELE_FAILED_MANY            - not used
+ *
+ * logic_criteria2
+ *      Z_ELE_FAILED_LOGIC_NONE,
+ *      Z_ELE_FAILED_LOGIC_AND,
+ *      Z_ELE_FAILED_LOGIC_OR,
+ *      Z_ELE_FAILED_LOGIC_MANY
+ *
+ * ---------------------------------------------------------- */
+
+int USERD_get_uns_failed_params(
+                char *fail_var_name,           /* variable name to be used in failure
+                                            must be scalar, per elem      */
+                float *threshold_val1,     /* number to compare for failure */
+                float *threshold_val2,     /* number to compare for failure */
+                int *threshold_operator1,   /* Z_GREATER_THAN, Z_LESS_THAN,
+                                            Z_EQUAL_TO */
+                int *threshold_operator2,   /* Z_GREATER_THAN, Z_LESS_THAN,
+                                            Z_EQUAL_TO */
+		int *logic_criteria2
+
+
+-------------------------
+Order Routines are called
+-------------------------
+
+The various main operations are given basically in the order they will
+be performed.  Within each operation, the order the routines will be
+called is given.  
+
+1. Setting name in the gui, and specifying one or two input fields
+
+        USERD_get_name_of_reader
+        USERD_get_reader_descrip        (optional)
+        USERD_get_extra_gui_numbers     (optional)
+	USERD_get_extra_gui_defaults    (optional)
+
+2. Getting the reader version (also distinguishes between API's)
+
+        USERD_get_reader_version
+
+3. Setting filenames and getting timeset and time info
+
+        USERD_set_server_number
+	USERD_set_extra_gui_data        (optional)
+        USERD_set_filenames
+        USERD_get_number_of_timesets
+        USERD_get_geom_timeset_number
+
+        for each timeset:
+          USERD_get_timeset_description
+          USERD_get_num_of_time_steps
+          USERD_get_sol_times
+
+        USERD_set_time_set_and_step
+
+4. Gathering info for part builder
+
+        USERD_set_time_set_and_step
+        USERD_get_changing_geometry_status
+        USERD_get_node_label_status
+        USERD_get_element_label_status
+        USERD_get_number_of_files_in_dataset
+        USERD_get_dataset_query_file_info
+        USERD_get_descrip_lines                 (for geometry)
+        USERD_get_number_of_model_parts
+        USERD_get_uns_failed_model_flag  
+        USERD_get_gold_part_build_info
+        USERD_get_uns_failed_etype_flags
+        USERD_get_ghosts_in_model_flag
+        USERD_get_maxsize_info
+        USERD_get_get_ghosts_in_block_flag      (if any ghost cells in model)
+        USERD_get_model_extents     OR          (for model extents)
+             USERD_get_part_coords  AND/OR
+             USERD_get_block_coords_by_component
+
+5. Gathering Variable info
+
+        USERD_get_number_of_variables
+        USERD_get_gold_variable_info
+              
+6. Part building (per part created)
+
+        both unstructured and structured:
+        --------------------------------
+        USERD_set_time_set_and_step
+
+        if unstructured part:
+        --------------------
+        USERD_get_part_element_ids_by_type
+        USERD_get_part_elements_by_type
+
+        If any nsided elements:
+
+          USERD_get_nsided_conn
+
+        If any nfaced elements:
+
+          USERD_get_nfaced_nodes_per_face
+          USERD_get_nfaced_conn
+
+        USERD_get_part_coords
+        USERD_get_part_node_ids
+        USERD_get_uns_failed_elist_flags
+
+        else if structured part:
+        -----------------------
+        USERD_get_block_iblanking
+        USERD_get_block_coords_by_component
+        USERD_get_block_ghost_flags          (If ghost cells in part)
+        USERD_get_part_node_ids              (If node ids given)
+        USERD_get_part_element_ids_by_type   (If element ids given)
+
+        both again:
+        ----------
+        USERD_get_border_availability        (If border representation
+        USERD_get_border_elements_by_type     is selected)
+
+        USERD_stop_part_building      (only once when part builder
+                                       dialog is closed)
+
+7. Loading Variables
+          
+        constants:
+        ---------
+        USERD_set_time_set_and_step
+        USERD_get_constant_val
+          
+        scalars/vectors/tensors:
+        ------------------------
+        USERD_get_descrip_lines
+        USERD_set_time_set_and_step
+        USERD_get_var_by_component
+
+8. Changing geometry
+
+        changing coords only (per part):
+        --------------------
+        USERD_set_time_set_and_step
+        USERD_get_descrip_lines
+        USERD_get_part_coords
+	USERD_get_uns_failed_model_flag
+	USERD_get_uns_failed_etype_flags
+	USERD_get_uns_failed_elist_flags
+        USERD_get_block_coords_by_component
+
+        changing connectivity (per part):
+        ---------------------
+        USERD_set_time_set_and_step
+        USERD_get_descrip_lines
+        USERD_get_number_of_model_parts
+        USERD_get_uns_failed_model_flag
+        USERD_get_gold_part_build_info
+        USERD_get_uns_failed_etype_flags
+        USERD_get_ghosts_in_model_flag
+        USERD_get_get_ghosts_in_block_flag      (if any ghost cells in model)
+        USERD_get_model_extents   OR
+           USERD_get_part_coords  AND/OR
+           USERD_get_block_coords_by_component
+        USERD_get_part_element_ids_by_type
+        USERD_get_part_elements_by_type
+        USERD_get_part_coords
+        USERD_get_part_node_ids
+        USERD_get_uns_failed_elist_flags
+        USERD_get_block_iblanking
+        USERD_get_block_coords_by_component
+        USERD_get_block_ghost_flags          (If ghost cells in part)
+        USERD_get_part_node_ids              (If node ids given)
+        USERD_get_part_element_ids_by_type   (If element ids given)
+
+        USERD_get_border_availability        (If border representation
+        USERD_get_border_elements_by_type     is selected)
+
+  
+9. Node or Element queries over time
+
+        USERD_get_var_value_at_specific
+
+10. To see if materials in the model
+
+        USERD_get_number_of_material_sets
+        USERD_get_matf_set_info
+
+        If any material sets in the model (calls these once per material set):
+          USERD_get_number_of_materials
+          USERD_get_matf_var_info
+
+        For each elment type of each part containing material ids, calls:
+          USERD_size_matf_data
+          USERD_load_matf_data
+
+        If there are any elements with mixed materials, when a domain or
+        interface is created, calls these again per part:
+
+          USERD_size_matf_data
+          USERD_load_matf_data
+
+11. To modify the variable extraction parameters and have the variables
+    update accordingly.
+
+        USERD_get_var_extract_gui_numbers
+        USERD_get_var_extract_gui_defaults
+        USERD_set_var_extract_gui_data
+
+
+
+-----------------------
+Detailed Specifications
+-----------------------
+
+Include files:
+--------------
+The following header file is required in any file containing these library
+routines. 
+
+       #include "global_extern.h"
+
+And it references:
+
+       #include "global_extern_proto.h"
+
+
+
+*******************************************************************************
+****************************** Special Note ***********************************
+*******************************************************************************
+
+Make sure you use the proper define in the global_extern.h header file, namely:
+#define USERD_API_204
+
+Also, Make sure the api version in the USERD_get_reader_version routine is set
+to "2.04" or larger.
+
+Make sure your reader has access to the global_extern_proto.h   This is a new
+file which is accessed from the new global_extern.h
+
+*******************************************************************************
+*******************************************************************************
+
+
+Basis of arrays:
+---------------
+Unless explicitly stated otherwise, all arrays are zero based - in true C
+fashion.
+
+
+Global variables:
+----------------
+You will generally need to have a few global variables which are shared by
+the various library routines. The detailed specifications below have assumed
+the following are available.  (Their names describe their purpose, and they
+will be used in helping describe the details of the routines below).
+
+static int Numparts_available         = 0;
+static int Num_unstructured_parts     = 0;
+static int Num_structured_blocks      = 0;
+
+/* Note: Numparts_available = Num_unstructured_parts + Num_structured_blocks */
+
+static int Num_timesets               = 1;
+static int Current_timeset            = 1;
+static int Geom_timeset_number        = 1;
+
+static int Num_time_steps[Z_MAXSETS]  = 1;
+static int Current_time_step          = 0;
+static int Num_variables              = 0;
+static int Num_dataset_files          = 0;
+
+static int Server_Number              = 1;    Which server of
+static int Tot_Servers                = 1;    the total number of servers
+
+
+
+_________________________________________
+-----------------------------------------
+Library Routines (in alphabetical order):
+_________________________________________
+-----------------------------------------
+
+--------------------------------------------------------------------
+USERD_bkup
+
+   Description:
+   -----------
+   This routine is called during the EnSight archive process.  You can
+   use it to save or restore info relating to your user defined reader.
+
+   Specification:
+   -------------
+   int USERD_bkup(FILE *archive_file,
+                  int backup_type)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  archive_file         = The archive file pointer
+
+   (IN)  backup_type          = Z_SAVE_ARCHIVE for saving archive
+                                Z_REST_ARCHIVE for restoring archive
+
+   Notes:
+   -----
+   * Since EnSight's archive file is saved in binary form, you should
+     also do any writing to it or reading from it in binary.
+
+   * You should archive any variables, which will be needed for
+     future operations, that will not be read or computed again
+     before they will be needed.  These are typically global
+     variables.
+
+   * Make sure that the number of bytes that you write on a save and
+     the number of bytes that you read on a restore are identical!!
+
+   * If any of the variables you save are allocated arrays, you must
+     do the allocations before restoring into them.
+
+--------------------------------------------------------------------
+USERD_exit_routine
+
+   Description:
+   -----------
+   This routine is called as EnSight is exiting. It can be used to clean
+   up anything needed - such as removing temporary files, etc. - or can simply
+   be a dummy.
+
+   Specification:
+   -------------
+   void USERD_exit_routine( void )
+
+   Arguments:
+   ---------
+   none
+
+--------------------------------------------------------------------
+USERD_get_block_coords_by_component
+
+   Description:
+   -----------
+   Get the coordinates of a given structured block, a component at a time.
+
+   Specification:
+   -------------
+   int USERD_get_block_coords_by_component(int block_number,
+                                           int which_component,
+                                           float *coord_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  block_number            = The block part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  which_component         = Z_COMPX if x component wanted
+                                 = Z_COMPY if y component wanted
+                                 = Z_COMPZ if z component wanted
+
+   (OUT) coord_array             = 1D array containing x,y, or z
+                                   coordinate component of each node
+
+                                  (Array will have been allocated
+                                   i*j*k for the block long)
+
+   Notes:
+   -----
+   * Not called unless Num_structured_blocks is > 0
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_block_iblanking
+
+   Description:
+   -----------
+   Get the iblanking value at each node of a block (if the block is
+   iblanked).
+
+   Specification:
+   -------------
+   int USERD_get_block_iblanking(int block_number,
+                                 int *iblank_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  block_number            = The block part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) iblank_array            = 1D array containing iblank value
+                                   for each node.
+
+                                  (Array will have been allocated
+                                   i*j*k for the block long)
+
+          possible values are:   Z_EXT     = exterior
+                                 Z_INT     = interior
+                                 Z_BND     = boundary
+                                 Z_INTBND  = internal boundary
+                                 Z_SYM     = symmetry plane
+
+   Notes:
+   -----
+   * Not called unless Num_structured_blocks is > 0  and you have
+     some iblanked blocks
+
+   * Will be based on Current_time_step
+
+
+
+----------------------------------------------------------------------
+USERD_get_block_ghost_flags
+
+   Description:
+   -----------
+   Get the ghost_flags value at each element of a block containing ghost cells.
+
+   Specification:
+   -------------
+   int USERD_get_block_ghost_flags(int block_number,
+                                   int *ghost_flags)
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  block_number            = The block number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) ghost_flags             = 1D array containing ghost flag value
+                                     for each block cell.
+  
+                                    (Array will have been allocated
+                                     (i-1)*(j-1)*(k-1) for the block long)
+  
+            possible values are:    0  = non-ghost cell  (normal cell)
+                                   >0  = ghost cell
+  
+    Notes:
+    -----
+    * This routine is new in the 2.01 API
+
+    * This will be based on Current_time_step
+  
+    * Only called for structured "block" parts that have some ghost cells
+      as indicated by the USERD_get_ghost_in_block_flag.  The model must
+      of course also have been indicated to have some ghost cells in the
+      USERD_get_ghost_in_model_flag routine.
+  
+    * It is sufficient to set the value to be 1 to flag as a ghost cell,
+      but the value can be any non-zero value, so you could use it to
+      indicate which block or which server (for Server-of-server use) the
+      cell is actually in.
+
+
+
+--------------------------------------------------------------------
+USERD_get_border_availability
+
+   Description:
+   -----------
+   Finds out if border elements are provided by the reader for the
+   desired part, or will need to be computed internally by EnSight.
+
+   Specification:
+   -------------
+   int USERD_get_border_availability(int part_number,
+                                     int number_of_elements[Z_MAXTYPE])
+
+   Returns:
+   -------
+   Z_OK  if border elements will be provided by the reader.
+          (number_of_elements array will be loaded and
+           USERD_get_border_elements_by_type will be called)
+
+   Z_ERR if border elements are not available - thus EnSight must compute.
+          (USERD_get_border_elements_by_type will not be called)
+
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) number_of_elements     = 2D array containing number of
+                                  each type of border element in
+                                  the part.
+                                  ------------
+                                  Possible types are:
+
+                                Z_POINT   =  point
+                                Z_BAR02   =  2-noded bar
+                                Z_BAR03   =  3-noded bar
+                                Z_TRI03   =  3-noded triangle
+                                Z_TRI06   =  6-noded triangle
+                                Z_QUA04   =  4-noded quadrilateral
+                                Z_QUA08   =  8-noded quadrilateral
+
+   Notes:
+   -----
+   * Only called if border representation is used.
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_border_elements_by_type
+
+   Description:
+   -----------
+   Provides border element connectivity and parent information. 
+
+   Specification:
+   -------------
+   int USERD_get_border_elements_by_type(int part_number,
+                                         int element_type,
+                                         int **conn_array,
+                                         short *parent_element_type,
+                                         int *parent_element_num)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number           = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  element_type          = One of the following (See global_extern.h)
+                                 Z_POINT    node point element
+                                 Z_BAR02    2 node bar
+                                 Z_BAR03    3 node bar
+                                 Z_TRI03    3 node triangle
+                                 Z_TRI06    6 node triangle
+                                 Z_QUA04    4 node quad
+                                 Z_QUA08    8 node quad
+
+   (OUT) conn_array            = 2D array containing connectivity
+                                 of each border element of the type.
+
+                                (Array will have been allocated
+                                 num_of_elements of the type by
+                                 connectivity length of the type)
+
+                       ex) If number_of_elements[Z_TRI03] = 25
+                              number_of_elements[Z_QUA04] = 100
+                              number_of_elements[Z_QUA08] = 30
+                           as obtained in:
+                            USERD_get_border_availability
+
+                           Then the allocated dimensions available
+                           for this routine will be:
+                              conn_array[25][3]   when called with Z_TRI03
+
+                              conn_array[100][4]  when called with Z_QUA04
+
+                              conn_array[30][8]   when called with Z_QUA08
+
+   (OUT) parent_element_type   = 1D array containing element type of the
+                                 parent element (the one that the border
+                                 element is a face/edge of).
+
+                                (Array will have been allocated
+                                 num_of_elements of the type long)
+
+   (OUT) parent_element_num   = 1D array containing element number of the
+                                 parent element (the one that the border
+                                 element is a face/edge of).
+
+                                (Array will have been allocated
+                                 num_of_elements of the type long)
+
+   
+   Notes:
+   -----
+   * Not called unless USERD_get_border_availability returned Z_OK
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_changing_geometry_status
+
+   Description:
+   -----------
+   Gets the changing geometry status for the model
+
+   Specification:
+   -------------
+   int USERD_get_changing_geometry_status( void )
+
+   Returns:
+   -------
+   Z_STATIC        if geometry does not change
+   Z_CHANGE_COORDS if changing coordinates only
+   Z_CHANGE_CONN   if changing connectivity
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * EnSight does not support changing number of parts.  But the
+     coords and/or the connectivity of the parts can change.  Note that
+     a part is allowed to be empty (number of nodes and elements equal
+     to zero).
+
+
+--------------------------------------------------------------------
+USERD_get_constant_val
+
+   Description:
+   -----------
+   Get the value of a constant at a time step
+
+   Specification:
+   -------------
+   float USERD_get_constant_value(int which_var,
+                                  int imag_data)
+
+   Returns:
+   -------
+   Value of the requested constant variable
+
+   Arguments:
+   ---------
+   (IN)  which_var            = The variable number
+
+   (IN)  imag_data            = TRUE if want imaginary data value.
+                                FALSE if want real data value.
+
+   Notes:
+   -----
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_dataset_query_file_info
+
+   Description:
+   -----------
+   Get the information about files in the dataset.  Used for the
+   dataset query option within EnSight.
+
+   Specification:
+   -------------
+   int USERD_get_dataset_query_file_info(Z_QFILES *qfiles)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) qfiles   = Structure containing information about each file
+                    of the dataset. The Z_QFILES structure is defined
+                    in the global_extern.h file
+
+                   (The structure will have been allocated
+                    Num_dataset_files long, with 10 description
+                    lines per file).
+
+      qfiles[].name        = The name of the file
+                             (Z_MAXFILENP is the dimensioned length
+                              of the name)
+
+      qfiles[].sizeb       = The number of bytes in the file
+                             (Typically obtained with a call to the
+                              "stat" system routine) (Is a long)
+
+      qfiles[].timemod     = The time the file was last modified 
+                             (Z_MAXTIMLEN is the dimensioned length
+                              of this string)
+                             (Typically obtained with a call to the
+                              "stat" system routine)
+
+      qfiles[].num_d_lines = The number of description lines you
+                              are providing from the file. Max = 10
+
+      qfiles[].f_desc[]    = The description line(s) per file,
+                              qfiles[].num_d_lines of them
+                              (Z_MAXFILENP is the allocated length of
+                               each line)
+
+   Notes:
+   -----
+   * If Num_dataset_files is 0, this routine will not be called.
+     (See USERD_get_number_of_files_in_dataset)
+
+
+--------------------------------------------------------------------
+USERD_get_descrip_lines
+
+   Description:
+   -----------
+   Get two description lines associated with geometry per time step,
+   or one description line associated with a variable per time step.
+
+   Specification:
+   -------------
+   int USERD_get_descrip_lines(int which_type,
+                               int which_var,
+                               int imag_data,
+                               char line1[Z_BUFL],
+                               char line2[Z_BUFL])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  which_type           = Z_GEOM for geometry (2 lines)
+                              = Z_VARI for variable (1 line)
+
+   (IN)  which_var            = If it is a variable, which one.
+                                Ignored if geometry type.
+
+   (IN)  imag_data            = TRUE if want imaginary data file.
+                                FALSE if want real data file.
+
+   (OUT) line1                = The 1st geometry description line,
+                                or the variable description line.
+
+   (OUT) line2                = The 2nd geometry description line
+                                Not used if variable type.
+
+   Notes:
+   -----
+   * Will be based on Current_time_step
+
+   * These are the lines EnSight can echo to the screen in
+     annotation mode.
+
+
+
+--------------------------------------------------------------------
+USERD_get_element_label_status
+
+   Description:
+   -----------
+   Answers the question as to whether element labels will be provided.
+
+   Specification:
+   -------------
+   int USERD_get_element_label_status( void )
+
+   Returns:
+   -------
+   TRUE        if element labels will be provided
+   FALSE       if element labels will NOT be provided
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * element lables are needed in order to do any element querying, or
+     element labeling on-screen within EnSight.
+
+   * Prior to API 2.01:
+     -----------------
+       For unstructured parts, you can read them from your file if
+       available, or can assign them, etc. They need to be unique
+       per part, and are often unique per model.
+
+       API 1.0:
+         USERD_get_element_ids_for_part is used to obtain the ids,
+         on a part by part basis, if TRUE status is returned here.
+
+       API 2.0:
+         USERD_get_part_element_ids_by_type is used to obtain the ids,
+         on a per part, per type basis, if TRUE status is returned here.
+
+       For structured parts, EnSight will assign ids if you return a
+         status of TRUE here.  You cannot assign them youself!!
+
+   * Starting at API 2.01:
+     --------------------
+       For both unstructured and structured parts, you can read them
+       from your file if available, or can assign them, etc. They need
+       to be unique per part, and are often unique per model (especially
+       if you are dealing with a decomposed dataset).
+
+       USERD_get_part_element_ids_by_type is used to obtain the ids,
+       on an element type by part basis, if TRUE status is returned here.
+
+   * Will call USERD_get_part_element_ids_by_type for each type of
+     of each part if this routine returns TRUE.
+--------------------------------------------------------------------
+USERD_get_geom_timeset_number -
+
+   Description:
+   -----------
+    Gets the timeset number to be used for geometry
+
+   Specification:
+   -------------
+   int USERD_get_geom_timeset_number( void )
+
+   Returns:
+   -------
+   Geom_timeset_number = The timeset number that will be used for geometry.   
+                         For example, if USERD_get_number_of timesets
+                         returns 2, the valid timeset numbers would be
+                         1 or 2.
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   *  If your model is static, which you indicated by returning a zero
+      in USERD_get_number_of_timesets, you can return a zero here as well.
+
+
+
+--------------------------------------------------------------------
+USERD_get_gold_part_build_info
+
+   Description:
+   -----------
+   Gets the info needed for the part building process.
+
+   Specification:
+   -------------
+   int USERD_get_gold_part_build_info(int *part_id,
+                                      int *part_types,
+                                      char *part_description[Z_BUFL],
+                                      int *number_of_nodes,
+                                      int *number_of_elements[Z_MAXTYPE],
+                                      int *ijk_dimensions[9],
+                                      int *iblanking_options[6])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+    (OUT) part_id                = Array containing the external part
+                                   ids for each of the model parts.
+
+                                   IMPORTANT:
+                                    Parts numbers must be >= 1, because
+                                    of the way they are used in the GUI
+
+               *******************************************
+                The ids provided here are the numbers by
+                which the parts will be referred to in the
+                GUI (if possible). They are basically
+                labels as far as you are concerned.
+
+                Note: The part numbers you pass to routines
+                which receive a part_number or block_number
+                or which_part as an argument are the 1-based
+                table index of the parts!
+
+                example:  If Numparts_available = 3
+
+                          Table index        part_id
+                          -----------        -------
+                           1                  13
+                           2                  57
+                           3                  125
+
+                           ^                   ^
+                           |                   |
+                           |                    These are placed in:
+                           |                      part_id[0] = 13
+                           |                      part_id[1] = 57
+                           |                      part_id[2] = 125
+                           |                    for GUI labeling purposes.
+                           |
+                            These implied table indices are the part_number,
+                            block_number, or which_part numbers that you would
+                            pass to routines like:
+
+                           USERD_get_part_coords(int part_number,...
+                           USERD_get_part_node_ids(int part_number,...
+                           USERD_get_part_elements_by_type(int part_number,...
+                           USERD_get_part_element_ids_by_type(int part_number,...
+                           USERD_get_block_coords_by_component(int block_number,...
+                           USERD_get_block_iblanking(int block_number,...
+                           USERD_get_block_ghost_flags(int block_number,...
+                           USERD_get_ghosts_in_block_flag(int block_number)
+                           USERD_get_border_availability(int part_number,...
+                           USERD_get_border_elements_by_type(int part_number,...
+                           USERD_get_var_by_component(int which_variable,
+                                                      int which_part,...
+                           USERD_get_var_value_at_specific(int which_var,
+                                                           int which_node_or_elem,
+                                                           int which_part,...
+               ********************************************
+
+                                    (Array will have been allocated
+                                     Numparts_available long)
+
+   (OUT) part_types             = Array containing one of the
+                                  following for each model part:
+
+                                       Z_UNSTRUCTURED or
+                                       Z_STRUCTURED  or
+                                       Z_IBLANKED
+
+                                  (Array will have been allocated
+                                   Numparts_available long)
+
+   (OUT) part_description       = Array containing a description
+                                  for each of the model parts
+
+                                  (Array will have been allocated
+                                   Numparts_available by Z_BUFL
+                                   long)
+
+   (OUT) number_of_nodes        = Number of unstructured nodes in the part
+ 
+                                   (Array will have been allocated
+                                    Numparts_available long)
+
+   (OUT) number_of_elements     = 2D array containing number of
+                                  each type of element for each
+                                  unstructured model part.
+                                  ------------
+                                  Possible types are:
+
+                                Z_POINT   =  point
+                                Z_BAR02   =  2-noded bar
+                                Z_BAR03   =  3-noded bar
+                                Z_TRI03   =  3-noded triangle
+                                Z_TRI06   =  6-noded triangle
+                                Z_QUA04   =  4-noded quadrilateral
+                                Z_QUA08   =  8-noded quadrilateral
+                                Z_TET04   =  4-noded tetrahedron
+                                Z_TET10   = 10-noded tetrahedron
+                                Z_PYR05   =  5-noded pyramid
+                                Z_PYR13   = 13-noded pyramid
+                                Z_PEN06   =  6-noded pentahedron
+                                Z_PEN15   = 15-noded pentahedron
+                                Z_HEX08   =  8-noded hexahedron
+                                Z_HEX20   = 20-noded hexahedron
+
+                                Z_G_POINT =  ghost node point element
+                                Z_G_BAR02 =  2 node ghost bar
+                                Z_G_BAR03 =  3 node ghost bar
+                                Z_G_TRI03 =  3 node ghost triangle
+                                Z_G_TRI06 =  6 node ghost triangle
+                                Z_G_QUA04 =  4 node ghost quad
+                                Z_G_QUA08 =  8 node ghost quad
+                                Z_G_TET04 =  4 node ghost tetrahedron
+                                Z_G_TET10 = 10 node ghost tetrahedron
+                                Z_G_PYR05 =  5 node ghost pyramid
+                                Z_G_PYR13 = 13 node ghost pyramid
+                                Z_G_PEN06 =  6 node ghost pentahedron
+                                Z_G_PEN15 = 15 node ghost pentahedron
+                                Z_G_HEX08 =  8 node ghost hexahedron
+                                Z_G_HEX20 = 20 node ghost hexahedron
+
+                               (Ignored unless Z_UNSTRUCTURED type)
+
+                                  (Array will have been allocated
+                                   Numparts_available by
+                                   Z_MAXTYPE long)
+
+   (OUT) ijk_dimensions         = 2D array containing ijk dimension info
+                                  for structured blocks
+
+                                  For Z_UNSTRUCTURED - is ignored
+
+                                  For Z_STRUCTURED or Z_IBLANKED
+
+        Prior to version 2.03:
+        ----------------------
+                                   (Array will have been allocated
+                                    Numparts_available by 3 long)
+
+                              ijk_dimensions[][0] = I dimension
+                              ijk_dimensions[][1] = J dimension
+                              ijk_dimensions[][2] = K dimension
+
+
+        Starting at version 2.03:
+        ------------------------
+                                   (Array will have been allocated
+                                    Numparts_available by 9 long)
+
+                              There are two ways to do this:
+                              ------------------------------
+                              1. The simple one, without ranges.
+
+                                   This is good for all structured models
+                                   that will NOT be used in EnSight's
+                                   Server of Servers
+
+                                   Simply provide the ijk dimensions in the
+                                   first three slots and place a -1 in
+                                   the 4th slot.  (The remaining slots will
+                                   be ignored).
+
+                              Thus,
+                              ijk_dimensions[][0] = I dimension of block
+                              ijk_dimensions[][1] = J dimension of block
+                              ijk_dimensions[][2] = K dimension of block
+                              ijk_dimensions[][3] = -1
+
+                        (J planes)
+                            4 *-------*-------*
+                              |       |       |    ijk_dimension[0][0] = 3
+                              |       |       |    ijk_dimension[0][1] = 4
+                              |       |       |    ijk_dimension[0][2] = 1
+                            3 *-------*-------*
+                              |       |       |    ijk_dimension[0][4] = -1
+                              |       |       |
+                              |       |       |
+                            2 *-------*-------*
+                              |       |       |
+                              |       |       |
+                              |       |       |
+                            1 *-------*-------*
+                              1       2       3  (I planes)
+
+
+
+                              2. Using ranges.
+
+                                  This one can be used anytime, but MUST
+                                  be used if EnSight's Server of Servers
+                                  is to be used!
+
+                                  The first 3 slots contain the ijk dimension
+                                  of the complete block (of which this may be
+                                  a portion).  The last 6 slots contain the
+                                  ijk min and max ranges within the complete.
+
+                              Thus,
+                              ijk_dimensions[][0] = I dim of complete block
+                              ijk_dimensions[][1] = J dim of complete block
+                              ijk_dimensions[][2] = K dim of complete block
+
+                              ijk_dimensions[][3] = Imin of portion (1-based)
+                              ijk_dimensions[][4] = Imax of portion (1-based)
+                              ijk_dimensions[][5] = Jmin of portion (1-based)
+                              ijk_dimensions[][6] = Jmax of portion (1-based)
+                              ijk_dimensions[][7] = Kmin of portion (1-based)
+                              ijk_dimensions[][8] = Kmax of portion (1-based)
+
+
+                              example1: (Model has one part, a simple 2D block,
+                                         and want whole thing)
+
+                        (J planes)
+                            4 *-------*-------*
+                              |       |       |    ijk_dimension[0][0] = 3
+                              |       |       |    ijk_dimension[0][1] = 4
+                              |       |       |    ijk_dimension[0][2] = 1
+                            3 *-------*-------*
+                              |       |       |    ijk_dimension[0][3] = 1
+                              |       |       |    ijk_dimension[0][4] = 3
+                              |       |       |    ijk_dimension[0][5] = 1
+                            2 *-------*-------*    ijk_dimension[0][6] = 4
+                              |       |       |    ijk_dimension[0][7] = 1
+                              |       |       |    ijk_dimension[0][8] = 1
+                              |       |       |
+                            1 *-------*-------*
+                              1       2       3  (I planes)
+
+
+                              example2: (Want to have the block represented
+                                         in two portions - 2 parts)
+
+                        (J planes)                 top portion
+                            4 *-------*-------*
+                              |       |       |    ijk_dimension[0][0] = 3
+                              |       |       |    ijk_dimension[0][1] = 4
+                              |       |       |    ijk_dimension[0][2] = 1
+                            3 *-------*-------*
+                              .       .       .    ijk_dimension[0][3] = 1
+                              .       .       .    ijk_dimension[0][4] = 3
+                              .       .       .    ijk_dimension[0][5] = 3
+                            2 .................    ijk_dimension[0][6] = 4
+                              .       .       .    ijk_dimension[0][7] = 1
+                              .       .       .    ijk_dimension[0][8] = 1
+                              .       .       .
+                            1 .................
+                              1       2       3  (I planes)
+
+
+                        (J planes)                 bottom portion
+                            4 .................
+                              .       .       .    ijk_dimension[1][0] = 3
+                              .       .       .    ijk_dimension[2][1] = 4
+                              .       .       .    ijk_dimension[3][2] = 1
+                            3 *-------*-------*
+                              |       |       |    ijk_dimension[1][3] = 1
+                              |       |       |    ijk_dimension[1][4] = 3
+                              |       |       |    ijk_dimension[1][5] = 1
+                            2 *-------*-------*    ijk_dimension[1][6] = 3
+                              |       |       |    ijk_dimension[1][7] = 1
+                              |       |       |    ijk_dimension[1][8] = 1
+                              |       |       |
+                            1 *-------*-------*
+                              1       2       3  (I planes)
+
+
+        And note that if you were partioning this block for
+        EnSight's Server of Servers, you would only have one part,
+        instead of two.  Each SOS server would return its appropriate
+        ranges in the last 6 slots. The first 3 slots would remain constant.
+
+
+   (OUT) iblanking_options      = 2D array containing iblanking
+                                  options possible for each
+                                  structured model part.
+                                  ----------
+                                  (Ignored unless Z_IBLANKED type)
+
+                                  (Array will have been allocated
+                                   Numparts_available by 6 long)
+
+      iblanking_options[][Z_EXT]     = TRUE if external (outside)
+                       [][Z_INT]     = TRUE if internal (inside)
+                       [][Z_BND]     = TRUE if boundary
+                       [][Z_INTBND]  = TRUE if internal boundary
+                       [][Z_SYM]     = TRUE if symmetry surface
+
+
+   Notes:
+   -----
+   * If you haven't built a table of pointers to the different parts,
+     you might want to do so here as you gather the needed info.
+
+   * Will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_gold_variable_info
+
+   Description:
+   -----------
+   Get the variable descriptions, types and filenames
+
+   Specification:
+   -------------
+   int USERD_get_gold_variable_info(char **var_description,
+                                    char **var_filename,
+                                    int *var_type,
+                                    int *var_classify,
+                                    int *var_complex,
+                                    char **var_ifilename,
+                                    float *var_freq,
+                                    int *var_contran,
+                                    int *var_timeset)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) var_description      = Variable descriptions
+
+                                (Array will have been allocated
+                                 Num_variables by Z_BUFL long)
+
+           variable description restrictions:
+           ----------------------------------
+           1. Only first 19 characters used in EnSight.
+           2. Leading and trailing whitespace will be removed by EnSight.
+           3. Illegal characters will be replaced by underscores.
+           4. Thay may not start with a numeric digit.
+           4. No two variables may have the same description.
+
+
+   (OUT) var_filename         = Variable real filenames
+
+                                (Array will have been allocated
+                                 Num_variables by Z_BUFL long)
+
+   (OUT) var_type             = Variable type
+
+                                (Array will have been allocated
+                                 Num_variables long)
+
+                                types are:  Z_CONSTANT
+                                            Z_SCALAR
+                                            Z_VECTOR
+                                            Z_TENSOR
+                                            Z_TENSOR9
+
+   (OUT) var_classify         = Variable classification
+
+                                (Array will have been allocated
+                                 Num_variables long)
+
+                                types are:  Z_PER_NODE
+                                            Z_PER_ELEM
+
+   (OUT) var_complex          = TRUE if complex, FALSE otherwise
+ 
+                                (Array will have been allocated
+                                 Num_variables long)
+ 
+   (OUT) var_ifilename        = Variable imaginary filenames (if complex)
+ 
+                                (Array will have been allocated
+                                 Num_variables by Z_BUFL long)
+
+   (OUT) var_freq             = complex frequency  (if complex)
+ 
+                                (Array will have been allocated
+                                 Num_variables long)
+ 
+   (OUT) var_contran          = TRUE if constant changes per time step
+                                FALSE if constant truly same at all time steps
+ 
+                                (Array will have been allocated
+                                 Num_variables long)
+
+   (OUT) var_timeset          = Timeset the variable will use (1 based).
+                                (For static models, set it to 1)
+
+                                (Array will have been allocated
+                                 Num_variables long)
+
+                                 For example:  If USERD_get_number_of_timesets
+                                               returns 2, the valid
+                                               timeset_number's would be 1 or 2
+
+
+   Notes:
+   -----
+   * The implied variable numbers apply, but be aware that the
+     arrays are zero based.
+     So for variable 1, will need to provide   var_description[0]
+                                               var_filename[0]
+                                               var_type[0]
+                                               var_classify[0]
+                                               var_complex[0]
+                                               var_ifilename[0]
+                                               var_freq[0]
+                                               var_contran[0]
+                                               var_timeset[0]
+
+
+        for variable 2, will need to provide   var_description[1]
+                                               var_filename[1]
+                                               var_type[1]
+                                               var_classify[1]
+                                               var_complex[1]
+                                               var_ifilename[1]
+                                               var_freq[1]
+                                               var_contran[1]
+                                               var_timeset[1]
+              etc.
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_ghosts_in_block_flag
+
+   Description:
+   -----------
+   Gets whether ghost cells present in block or not
+
+   Specification:
+   -------------
+  int USERD_get_ghosts_in_block_flag(int block_number)
+
+   Returns:
+   -------
+   TRUE  if any ghost cells in this structured part
+   FALSE if no ghost cells in this structured part
+
+   Arguments:
+   ---------
+   (IN) block_number      = The block part number
+                              (1-based index of part table, namely:
+
+                                1 ... Numparts_available.
+
+                              It is NOT the part_id that
+                              is loaded in USERD_get_gold_part_build_info)
+
+   Notes:
+   -----
+    * This routine is new in the 2.01 API
+    * This will be based on Current_time_step
+  
+    * Intended for structured parts only, value will be ignored for
+      unstructured parts
+
+
+
+--------------------------------------------------------------------
+USERD_get_ghosts_in_model_flag
+
+   Description:
+   -----------
+   Answers the question as to whether any ghost cells in the model.
+
+   Specification:
+   -------------
+  int USERD_get_ghosts_in_model_flag( void )
+
+   Returns:
+   -------
+   TRUE  if any ghost cells in the model
+   FALSE if no ghost cells in the model
+
+   Arguments:
+   ---------
+  
+   Notes:
+   -----
+    * This routine is new in the 2.01 API
+
+-------------------------------------------------------------------------
+USERD_get_matf_set_info
+
+   Description:
+   -----------
+   Get the material set ids and names
+
+   Specification:
+   -------------
+   int USERD_get_matf_set_info(int *mat_set_ids,
+                               char **mat_set_name)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) mat_set_ids  = 1D material set ids array
+
+                               (Array will have been allocated
+                                Num_material_sets long)
+
+   (OUT) mat_set_name = 2D material set name array
+
+                               (Array will have been allocated
+                                Num_material_sets by Z_BUFL long)
+
+   Notes:
+   -----
+   * Will not be called if Num_material_sets is zero
+   * See USERD_get_number_of_material_sets header for explanatory example
+
+
+--------------------------------------------------------------------
+USERD_get_matf_var_info
+
+   Description:
+   -----------
+   Gets the material ids and descriptions for the material set
+
+   Specification:
+   -------------
+   int USERD_get_matf_var_info(int set_index,
+                               int *mat_ids,
+                               char **mat_desc)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  set_index               = the material set index (zero based)
+
+   (OUT) mat_ids[set_index]      = 1D integer array containing the material
+                                   ids to associated with each material
+
+                                    (Array will have been allocated
+                                     Num_materials[set_index] long)
+
+   (OUT) mat_desc[set_index]     = 2D char array containing the material
+                                   descriptions to associated with each material
+
+                                    (Array will have been allocated
+                                     Num_materials[set_index] by Z_BUFL long)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero, or
+     Num_materials[set_index] is zero
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_maxsize_info
+
+   Description:
+   -----------
+   Gets maximum part sizes for efficient memory allocation.
+
+   Transient models (especially those that increase in size) can cause
+   reallocations, at time step changes, to keep chewing up more and
+   more memory.   The way to avoid this is to know what the maximum
+   size of such memory will be, and allocate for this maximum initially.
+
+   Accordingly, if you choose to provide this information (it is optional),
+   EnSight will take advantage of it.
+
+
+   Specification:
+   -------------
+   int USERD_get_maxsize_info(int *max_number_of_nodes,
+                              int *max_number_of_elements[Z_MAXTYPE],
+                              int *max_ijk_dimensions[3])
+
+   Returns:
+   -------
+   Z_OK  if supplying maximum data
+   Z_ERR if not supplying maximum data, or some error occurred
+           while trying to obtain it.
+
+   Arguments:
+   ---------
+   (OUT) max_number_of_nodes    = Maximum number of unstructured nodes
+                                  in the part (over all time).
+ 
+                                   (Array will have been allocated
+                                    Numparts_available long)
+
+   (OUT) max_number_of_elements = 2D array containing maximum number of
+                                  each type of element for each
+                                  unstructured model part (over all time).
+                                  ------------
+                                  Possible types are:
+
+                                Z_POINT   =  point
+                                Z_BAR02   =  2-noded bar
+                                Z_BAR03   =  3-noded bar
+                                Z_TRI03   =  3-noded triangle
+                                Z_TRI06   =  6-noded triangle
+                                Z_QUA04   =  4-noded quadrilateral
+                                Z_QUA08   =  8-noded quadrilateral
+                                Z_TET04   =  4-noded tetrahedron
+                                Z_TET10   = 10-noded tetrahedron
+                                Z_PYR05   =  5-noded pyramid
+                                Z_PYR13   = 13-noded pyramid
+                                Z_PEN06   =  6-noded pentahedron
+                                Z_PEN15   = 15-noded pentahedron
+                                Z_HEX08   =  8-noded hexahedron
+                                Z_HEX20   = 20-noded hexahedron
+
+                                Z_G_POINT =  ghost node point element
+                                Z_G_BAR02 =  2 node ghost bar
+                                Z_G_BAR03 =  3 node ghost bar
+                                Z_G_TRI03 =  3 node ghost triangle
+                                Z_G_TRI06 =  6 node ghost triangle
+                                Z_G_QUA04 =  4 node ghost quad
+                                Z_G_QUA08 =  8 node ghost quad
+                                Z_G_TET04 =  4 node ghost tetrahedron
+                                Z_G_TET10 = 10 node ghost tetrahedron
+                                Z_G_PYR05 =  5 node ghost pyramid
+                                Z_G_PYR13 = 13 node ghost pyramid
+                                Z_G_PEN06 =  6 node ghost pentahedron
+                                Z_G_PEN15 = 15 node ghost pentahedron
+                                Z_G_HEX08 =  8 node ghost hexahedron
+                                Z_G_HEX20 = 20 node ghost hexahedron
+
+                               (Ignored unless Z_UNSTRUCTURED type)
+
+                                  (Array will have been allocated
+                                   Numparts_available by
+                                   Z_MAXTYPE long)
+
+   (OUT) max_ijk_dimensions  = 2D array containing maximum ijk dimensions
+                               for each structured model part (over all time).
+                                           ----------
+                                (Ignored if Z_UNSTRUCTURED type)
+
+                                (Array will have been allocated
+                                 Numparts_available by 3 long)
+
+                             max_ijk_dimensions[][0] = maximum I dimension
+                             max_ijk_dimensions[][1] = maximum J dimension
+                             max_ijk_dimensions[][2] = maximum K dimension
+
+   Notes:
+   -----
+   * You need to have first called USERD_get_number_of_model_parts and
+     USERD_get_gold_part_build_info, so Numparts_available is known and
+     so EnSight will know what the type is (Z_UNSTRUCTURED, Z_STRUCTURED,
+     or Z_IBLANKED) of each part.
+
+   * This will NOT be based on Current_time_step - it is to be the maximum
+     values over all time!!
+
+   * This information is optional.  If you return Z_ERR, Ensight will still
+     process things fine, reallocating as needed, etc.  However, for
+     large transient models you will likely use considerably more memory
+     and take more processing time for the memory reallocations. So, if it
+     is possible to provide this information "up front", it is recommended
+     to do so.
+
+
+--------------------------------------------------------------------
+USERD_get_model_extents
+
+   Description:
+   -----------
+   Gets the model bounding box extents.  If this routine supplys them
+   EnSight will not have to spend time doing so.  If this routine
+   returns Z_ERR, EnSight will have to take the time to touch all the
+   nodes and gather the extent info.
+
+   Specification:
+   -------------
+   int USERD_get_model_extents(float extents[6])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful  (whereupon EnSight will determine by reading
+                             all coords of all parts)
+
+   Arguments:
+   ---------
+   (OUT) extents[0]   = min x
+                [1]   = max x
+                [2]   = min y
+                [3]   = max y
+                [4]   = min z
+                [5]   = max z
+
+   Notes:
+   -----
+   * This will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_name_of_reader
+
+   Description:
+   -----------
+   Gets the name of your user defined reader.  The user interface will
+   ask for this and include it in the available reader list.
+
+   Specification:
+   -------------
+   int USERD_get_name_of_reader(char reader_name[Z_MAX_USERD_NAME],
+				int *two_fields)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) reader_name          = the name of the your reader or data format.
+                              (max length is Z_MAX_USERD_NAME, which is 20)
+
+   (OUT) two_fields          = FALSE if only one data field is      
+                                      required.                      
+                                TRUE if two data fields required     
+ 
+                                -1   if one field (Geom) required 
+                                     and one field (Param) is optional
+                                     Param field can contain any text
+                                     for example a file name, modifiers,
+                                     etc. that can be used to modify the
+                                     reader's behavior.
+ 
+
+   Notes:
+   -----
+   * Always called.  Please be sure to provide a name for your custom
+     reader format.
+
+--------------------------------------------------------------------
+USERD_get_nfaced_conn
+
+   Description:
+   -----------
+   Gets the array containing the connectivity of nsided faces of nfaced elements
+
+   Specification:
+   -------------int
+   int USERD_get_nfaced_conn(int part_number,
+                             int *nfaced_conn_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number        = the part number
+
+   (OUT) nfaced_conn_array  = 1D array of nsided face connectivies of nfaced
+                              elements
+
+                              (int array will have been allocated long enough to
+                               hold all the nsided face connectivities. Which is
+                               the sum of all the nodes per face values in the
+                               nfaced_npf_array of USERD_get_nfaced_nodes_per_face)
+
+   Notes:
+   -----
+ * Will not be called unless there are some nfaced elements in the part
+
+ * Providing nfaced information to Ensight:
+
+     1. In USERD_get_gold_part_build_info, provide the number of nfaced
+        polyhedral elements in the part.
+
+     2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+        the number of faces per nfaced element. (as if connectivity
+        length of an nfaced element is one)
+
+     3. In this routine, provide the streamed number of nodes per face
+        for each of the faces of the nfaced elements.
+
+
+     Simple example:         11        10   12
+                            +--------+-----+
+     2 nfaced elements:    /|        |\   /|
+     (1 7-faced           / |        | \ / |
+      1 5-sided)         /  |        |  +9 |
+                        /   |        | /|  |
+                       /7   |      8 /  |  |
+                      +-----------+/ |  |  |
+                      |     |5    |  |4 |  |6
+                      |     +-----|--+--|--+
+                      |    /      |   \ | /
+                      |   /       |    \|/3
+                      |  /        |     +
+                      | /         |    /
+                      |/1         |2 /
+                      +-----------+/
+
+      1. In USERD_get_gold_part_build_info:
+              number_of_elements[Z_NFACED] = 2
+                                             .
+                                            /|\
+                                             |
+      2. In USERD_get_part_elements_by_type:
+          length of conn_array will be:      2 x 1
+          for element_type of Z_NFACED:
+              conn_array[0][0] = 7           (for the 7-faced element)
+              conn_array[1][0] = 5           (for the 5-faced element)
+
+                                ==
+                           Sum  12    <---------+
+                                                |
+      3. In USERD_get_faced_nodes_per_face:     |
+           length of nfaced_npf_array will be:  12
+
+            nfaced_npf_array[0]  = 5  (5-noded top face of 7-faced element)
+            nfaced_npf_array[1]  = 5  (5-noded bot face of 7-faced element)
+            nfaced_npf_array[2]  = 4  (4-noded front face of 7-faced element)
+            nfaced_npf_array[3]  = 4  (4-noded left face of 7-faced element)
+            nfaced_npf_array[4]  = 4  (4-noded back face of 7-faced element)
+            nfaced_npf_array[5]  = 4  (4-noded right front face of 7-faced element)
+            nfaced_npf_array[6]  = 4  (4-noded right back face of 7-faced element)
+
+            nfaced_npf_array[7]  = 3  (3-noded top face of 5-faced element)
+            nfaced_npf_array[8]  = 3  (3-noded bot face of 5-faced element)
+            nfaced_npf_array[9]  = 4  (4-noded back face of 5-faced element)
+            nfaced_npf_array[10] = 4  (4-noded right face of 5-faced element)
+            nfaced_npf_array[11] = 4  (4-noded left front face of 5-faced element)
+
+                                   ==
+                             Sum   48   <-------------+
+                                                      |
+      4. In this function:                            |
+            length of the nfaced_conn_array will be:  48
+
+            nsided_conn_array[0] = 7   (conn of 5-noded top face of 7-faced elem)
+            nsided_conn_array[1] = 8
+            nsided_conn_array[2] = 9
+            nsided_conn_array[3] = 10
+            nsided_conn_array[4] = 11
+
+            nsided_conn_array[5] = 1   (conn of 5-noded bot face of 7-faced elem)
+            nsided_conn_array[6] = 5
+            nsided_conn_array[7] = 4
+            nsided_conn_array[8] = 3
+            nsided_conn_array[9] = 2
+
+            nsided_conn_array[10] = 1  (conn of 4-noded front face of 7-faced elem)
+            nsided_conn_array[11] = 2
+            nsided_conn_array[12] = 8
+            nsided_conn_array[13] = 7
+
+            nsided_conn_array[14] = 5  (conn of 4-noded left face of 7-faced elem)
+            nsided_conn_array[15] = 1
+            nsided_conn_array[16] = 7
+            nsided_conn_array[17] = 11
+
+            nsided_conn_array[18] = 4  (conn of 4-noded back face of 7-faced elem)
+            nsided_conn_array[19] = 5
+            nsided_conn_array[20] = 11
+            nsided_conn_array[21] = 10
+
+            nsided_conn_array[22] = 2  (conn of 4-noded right front face of 7-faced)
+            nsided_conn_array[23] = 3
+            nsided_conn_array[24] = 9
+            nsided_conn_array[25] = 8
+
+            nsided_conn_array[26] = 3  (conn of 4-noded right back face of 7-faced)
+            nsided_conn_array[27] = 4
+            nsided_conn_array[28] = 10
+            nsided_conn_array[29] = 9
+
+            nsided_conn_array[30] = 9  (conn of 3-noded top face of 5-faced elem)
+            nsided_conn_array[32] = 12
+            nsided_conn_array[32] = 10
+
+            nsided_conn_array[33] = 3  (conn of 3-noded bot face of 5-faced elem)
+            nsided_conn_array[34] = 4
+            nsided_conn_array[35] = 6
+
+            nsided_conn_array[36] = 6  (conn of 4-noded back face of 5-faced elem)
+            nsided_conn_array[37] = 4
+            nsided_conn_array[38] = 10
+            nsided_conn_array[39] = 12
+
+            nsided_conn_array[40] = 3  (conn of 4-noded right face of 5-faced elem)
+            nsided_conn_array[41] = 6
+            nsided_conn_array[42] = 12
+            nsided_conn_array[43] = 9
+
+            nsided_conn_array[44] = 4  (conn of 4-noded left front face of 5-faced)
+            nsided_conn_array[45] = 3
+            nsided_conn_array[46] = 9
+            nsided_conn_array[47] = 10
+
+
+
+--------------------------------------------------------------------
+USERD_get_nfaced_nodes_per_face -
+
+   Description:
+   -----------
+   Gets the array containing the number of nodes per face for each face
+   of the nfaced elements.
+
+   Specification:
+   -------------
+   int USERD_get_nfaced_nodes_per_face(int part_number,
+                                       int *nfaced_npf_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number       = the part number
+
+   (OUT) nfaced_npf_array  = 1D array of nodes per face for all faces of
+                             nfaced elements
+
+                             (int array will have been allocated long enough
+                              to hold all the nodes_per_face values. Which is
+                              the sum of all the number of faces per element
+                              values in the conn_array of
+                              USERD_get_part_elements_by_type)
+
+   Notes:
+   -----
+   * Will not be called unless there are some nfaced elements in the
+     the part
+
+   * Providing nfaced information to Ensight:
+
+     1. In USERD_get_gold_part_build_info, provide the number of nfaced
+        polyhedral elements in the part.
+
+     2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+        the number of faces per nfaced element. (as if connectivity
+        length of an nfaced element is one)
+
+     3. In this routine, provide the streamed number of nodes per face
+        for each of the faces of the nfaced elements.
+
+
+     Simple example:         11        10   12
+                            +--------+-----+
+     2 nfaced elements:    /|        |\   /|
+     (1 7-faced           / |        | \ / |
+      1 5-sided)         /  |        |  +9 |
+                        /   |        | /|  |
+                       /7   |      8 /  |  |
+                      +-----------+/ |  |  |
+                      |     |5    |  |4 |  |6
+                      |     +-----|--+--|--+
+                      |    /      |   \ | /
+                      |   /       |    \|/3
+                      |  /        |     +
+                      | /         |    /
+                      |/1         |2 /
+                      +-----------+/
+
+      1. In USERD_get_gold_part_build_info:
+              number_of_elements[Z_NFACED] = 2
+                                             .
+                                            /|\
+                                             |
+      2. In USERD_get_part_elements_by_type:
+          length of conn_array will be:      2 x 1
+          for element_type of Z_NFACED:
+              conn_array[0][0] = 7           (for the 7-faced element)
+              conn_array[1][0] = 5           (for the 5-faced element)
+
+                                ==
+                           Sum  12    <---------+
+                                                |
+      3. In this routine:                       |
+           length of nfaced_npf_array will be:  12
+
+            nfaced_npf_array[0]  = 5  (5-noded top face of 7-faced element)
+            nfaced_npf_array[1]  = 5  (5-noded bot face of 7-faced element)
+            nfaced_npf_array[2]  = 4  (4-noded front face of 7-faced element)
+            nfaced_npf_array[3]  = 4  (4-noded left face of 7-faced element)
+            nfaced_npf_array[4]  = 4  (4-noded back face of 7-faced element)
+            nfaced_npf_array[5]  = 4  (4-noded right front face of 7-faced element)
+            nfaced_npf_array[6]  = 4  (4-noded right back face of 7-faced element)
+
+            nfaced_npf_array[7]  = 3  (3-noded top face of 5-faced element)
+            nfaced_npf_array[8]  = 3  (3-noded bot face of 5-faced element)
+            nfaced_npf_array[9]  = 4  (4-noded back face of 5-faced element)
+            nfaced_npf_array[10] = 4  (4-noded right face of 5-faced element)
+            nfaced_npf_array[11] = 4  (4-noded left front face of 5-faced element)
+
+                                   ==
+                             Sum   48   <-------------+
+                                                      |
+      4. In USERD_get_nfaced_conn:                    |
+            length of the nfaced_conn_array will be:  48
+
+            nsided_conn_array[0] = 7   (conn of 5-noded top face of 7-faced elem)
+            nsided_conn_array[1] = 8
+            nsided_conn_array[2] = 9
+            nsided_conn_array[3] = 10
+            nsided_conn_array[4] = 11
+
+            nsided_conn_array[5] = 1   (conn of 5-noded bot face of 7-faced elem)
+            nsided_conn_array[6] = 5
+            nsided_conn_array[7] = 4
+            nsided_conn_array[8] = 3
+            nsided_conn_array[9] = 2
+
+            nsided_conn_array[10] = 1  (conn of 4-noded front face of 7-faced elem)
+            nsided_conn_array[11] = 2
+            nsided_conn_array[12] = 8
+            nsided_conn_array[13] = 7
+
+            nsided_conn_array[14] = 5  (conn of 4-noded left face of 7-faced elem)
+            nsided_conn_array[15] = 1
+            nsided_conn_array[16] = 7
+            nsided_conn_array[17] = 11
+
+            nsided_conn_array[18] = 4  (conn of 4-noded back face of 7-faced elem)
+            nsided_conn_array[19] = 5
+            nsided_conn_array[20] = 11
+            nsided_conn_array[21] = 10
+
+            nsided_conn_array[22] = 2  (conn of 4-noded right front face of 7-faced)
+            nsided_conn_array[23] = 3
+            nsided_conn_array[24] = 9
+            nsided_conn_array[25] = 8
+
+            nsided_conn_array[26] = 3  (conn of 4-noded right back face of 7-faced)
+            nsided_conn_array[27] = 4
+            nsided_conn_array[28] = 10
+            nsided_conn_array[29] = 9
+
+            nsided_conn_array[30] = 9  (conn of 3-noded top face of 5-faced elem)
+            nsided_conn_array[32] = 12
+            nsided_conn_array[32] = 10
+
+            nsided_conn_array[33] = 3  (conn of 3-noded bot face of 5-faced elem)
+            nsided_conn_array[34] = 4
+            nsided_conn_array[35] = 6
+
+            nsided_conn_array[36] = 6  (conn of 4-noded back face of 5-faced elem)
+            nsided_conn_array[37] = 4
+            nsided_conn_array[38] = 10
+            nsided_conn_array[39] = 12
+
+            nsided_conn_array[40] = 3  (conn of 4-noded right face of 5-faced elem)
+            nsided_conn_array[41] = 6
+            nsided_conn_array[42] = 12
+            nsided_conn_array[43] = 9
+
+            nsided_conn_array[44] = 4  (conn of 4-noded left front face of 5-faced)
+            nsided_conn_array[45] = 3
+            nsided_conn_array[46] = 9
+            nsided_conn_array[47] = 10
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_node_label_status
+
+   Description:
+   -----------
+   Answers the question as to whether node labels will be provided.
+
+   Specification:
+   -------------
+   int USERD_get_node_label_status( void )
+
+   Returns:
+   -------
+   TRUE        if node labels will be provided
+   FALSE       if node labels will NOT be provided
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * Node ids are needed in order to do any node querying, or node
+     labeling on-screen within EnSight.
+
+   * Prior to API 2.01:
+     -----------------
+       For unstructured parts, you can read them from your file if
+       available, or can assign them, etc. They need to be unique
+       per part, and are often unique per model.  They must also be
+       positive numbers greater than zero.
+
+         USERD_get_part_node_ids is used to obtain the ids, if the
+         status returned here is TRUE.
+
+         (Unlike API 1.0, where the connectivity of elements had to be
+          according to the node ids - API 2.0's element connectivities
+          are not affected either way by the status here.)
+
+       For structured parts, EnSight will assign ids if you return a
+         status of TRUE here.  You cannot assign them yourself!!
+
+   * Starting at API 2.01:
+     --------------------
+       For both unstructured and structured parts, you can read them
+       from your file if available, or can assign them, etc. They need
+       to be unique per part, and are often unique per model. They must
+       also be positive numbers greater than zero.
+
+       USERD_get_part_node_ids is used to obtain the ids, if the
+       status returned here is TRUE.
+
+   * Will call USERD_get_part_node_ids for each part if this routine
+     returns TRUE.
+
+--------------------------------------------------------------------
+USERD_get_nsided_conn -
+
+   Description:
+   -----------
+   Gets the array containing the connectivity of nsided elements
+
+   Specification:
+   -------------
+   int USERD_get_nsided_conn(int part_number,
+                             int *nsided_conn_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number         = the part number
+
+   (OUT) nsided_conn_array   = 1D array of nsided connectivies
+
+                               (int array will have been allocated long enough
+                                to hold all the nsided connectivities. Which is
+                                the sum of all the nodes_per_element values in
+                                the conn_array of USERD_get_part_elements_by_type)
+
+
+   Notes:
+   -----
+   * Will not be called unless there are some nsided elements in the the part.
+
+   * Providing nsided information to Ensight:
+
+     1. In USERD_get_gold_part_build_info, provide the number of nsided
+        elements in the part.
+
+     2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+        the number of nodes per nsided element. (as if connectivity
+        length of an nsided element is one)
+
+     3. In this routine, provide the streamed connectivities for each of the
+        nsided elements.
+
+
+     Simple example:         5        6
+                            +--------+
+     3 nsided elements:    /|         \
+     (1 4-sided           / |          \
+      1 3-sided          /  |           \
+      1 7-sided)        /   |            \ 7
+                       /3   |4            +
+                      +-----+             |
+                      |     |             |
+                      |     |             |8
+                      |     |             +
+                      |     |            /
+                      |     |           /
+                      |     |          /
+                      |1    |2        /9
+                      +-----+--------+
+
+      1. In USERD_get_gold_part_build_info:
+              number_of_elements[Z_NSIDED] = 3
+                                             .
+                                            /|\
+                                             |
+      2. In USERD_get_part_elements_by_type:
+          length of conn_array will be:      3 x 1
+
+          for element_type of Z_NSIDED:
+              conn_array[0][0] = 4           (for the 4-sided element)
+              conn_array[1][0] = 3           (for the 3-sided element)
+              conn_array[2][0] = 7           (for the 7-sided element)
+
+                           Sum  ===
+                                 14    <---------+
+                                                 |
+      3. In this routine:                        |
+           length of nsided_conn_array will be:  14
+
+              nsided_conn_array[0]  = 1      (connectivity of 4-sided element)
+              nsided_conn_array[1]  = 2
+              nsided_conn_array[2]  = 4
+              nsided_conn_array[3]  = 3
+
+              nsided_conn_array[4]  = 3      (connectivity of 3-sided element)
+              nsided_conn_array[5]  = 4
+              nsided_conn_array[6]  = 5
+
+              nsided_conn_array[7]  = 2      (connectivity of 7-sided element)
+              nsided_conn_array[8]  = 9
+              nsided_conn_array[9]  = 8
+              nsided_conn_array[10] = 7
+              nsided_conn_array[11] = 6
+              nsided_conn_array[12] = 5
+              nsided_conn_array[13] = 4
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_num_of_time_steps
+
+   Description:
+   -----------
+   Gets the number of time steps of data available for desired timeset.
+
+   Specification:
+   -------------
+   int USERD_get_num_of_time_steps( int timeset_number )
+
+   Returns:
+   -------
+   Number of time steps in timeset  (>0 if okay, <=0 if problems).
+
+   Arguments:
+   ---------
+   (IN) timeset number = the timeset number
+
+                         For example: If USERD_get_number_of_timesets
+                                      returns 2, the valid
+                                      timeset_number's would be 1 and 2
+
+   Notes:
+   -----
+   * This should be >= 1       1 indicates a static model
+                              >1 indicates a transient model
+
+   * Num_time_steps[timeset_number] would be set here
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_files_in_dataset
+
+   Description:
+   -----------
+   Get the total number of files in the dataset.  Used for the
+   dataset query option within EnSight.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_files_in_dataset( void )
+
+   Returns:
+   -------
+   The total number of files in the dataset.
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * You can be as complete as you want about this.  If you don't
+     care about the dataset query option, return a value of 0
+     If you only want certain files, you can just include them. But,
+     you will need to supply the info in USERD_get_dataset_query_file_info
+     for each file you include here.
+
+   * Num_dataset_files would be set here
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_material_sets -
+
+   Description:
+   -----------
+   Get the number of material sets in the model
+
+   Specification:
+   -------------
+   int USERD_get_number_of_material_sets( void )
+
+
+   Returns:
+   -------
+   Num_material_sets = number of material sets
+                       (Zero would indicate that you have no materials
+                        to deal with in the model)
+
+                       or
+
+                       -1 if an error condition
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+  * You may want to keep this as a global for use in other routines.
+
+   ###############################################################
+   NOTE:  For EnSight 7.6, only one material set is supported
+          within EnSight.
+          Thus the only valid returns here are:
+               0 (no materials)
+               1 (for the one material set allowed)
+          or  -1 (if an error)
+
+          If the casefile has more than this, this reader will
+          read them, but EnSight will issue an error message and
+          choke on them!
+   ###############################################################
+
+  ================================================================
+  A very simple explanatory example, to use as a reference for the
+  materials routines:
+
+  Given a 2D mesh composed of 9 quad (Z_QUA04) elements, with two materials.
+  Most of the model is material 1, but the top left corner is material 9 -
+  basically as shown:
+
+
+        *--------*--------*--------*
+        |        |   /    |        |
+        |     Mat 9 /     |        |
+        |        | /      |        |
+        |        |/       |        |
+        |  e7    /   e8   |   e9   |
+        |       /|        |        |
+        |      / |        |        |
+        |     /  |        |        |
+        *----/---*--------*--------*
+        |   /    |        |        |
+        |  /     |        |        |
+        | /      |      Mat 1      |
+        |/       |        |        |
+        |   e4   |   e5   |   e6   |
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        *--------*--------*--------*
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        |   e1   |   e2   |   e3   |
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        *--------*--------*--------*
+
+
+  Thus, in this routine, set:
+    Num_material_sets = 1
+
+  In USERD_get_matf_set_info, set:
+    mat_set_ids[0]    = 1
+    mat_set_name[0]   = "Material Set 1"  (or whatever name desired)
+
+  In USERD_get_number_of_materials, input would be set_index = 0, and
+  would need to set:
+    Num_materials[0] = 2
+
+  For simplicity, the ids and descriptions that would be returned in
+  USERD_get_matf_var_info could be:
+    mat_ids[0] = 1
+    mat_ids[1] = 9
+    mat_desc[0] = "mat 1"   (or whatever desired)
+    mat_desc[2] = "mat 9"
+
+  The per element material ids list would need to be:
+
+     material ids:
+     -------------
+     ids_list[0] = 1  (material id 1, for elem e1)
+     ids_list[1] = 1  (     "                  e2)
+     ids_list[2] = 1  (     "                  e3)
+     ids_list[3] = -1 (negative of index into mixed-material id list, for elem e4)
+     ids_list[5] = 1  (material id 1, for elem e5)
+     ids_list[5] = 1  (     "                  e6)
+     ids_list[5] = -5 (negative of index into mixed-material id list, for elem e7)
+     ids_list[5] = -9 (     "                  e8)
+     ids_list[5] = 1  (material id 1, for elem e9)
+
+  Finally we need the mixed material ids list and the mixed materials values list,
+  which would need to be:
+
+       mixed-material ids:
+       -------------------
+   ==> 1  ids_list[0]  =  2  (the -1 in the material variable points here,
+                                      2 indicates that two materials are present)
+       2  ids_list[1]  =  1  (1st material is 1)
+       3  ids_list[2]  =  9  (2nd material is 9)
+       4  ids_list[3]  = -1  (negative of index into mixed-material val_list)
+   ==> 5  ids_list[4]  =  2  (the -5 in the material variable points here,
+                                      2 indicates that two materials are present)
+       6  ids_list[5]  =  1  (1st material is 1)
+       7  ids_list[6]  =  9  (2nd material is 9)
+       8  ids_list[7]  = -3  (negative of index into mixed-material val_list)
+   ==> 9  ids_list[8]  =  2     etc.
+       10 ids_list[9]  =  1
+       11 ids_list[10] =  9
+       12 ids_list[11] = -5
+
+       mixed-material values:
+       ----------------------
+   ==> 1 val_list[0] = 0.875 (the -1 in the  mixed-material ids_list points here,
+                                       and this is the value for material 1)
+       2 val_list[1] = 0.125 (the value for material 9)
+   ==> 3 val_list[2] = 0.125 (the -3 in the mixed-materials ids_list points here)
+       4 val_list[3] = 0.875
+   ==> 5 val_list[4] = 0.875 (the -5 in the mixed-materials ids_list points here)
+       6 val_list[5] = 0.125
+
+  So, USERD_size_matf_data would need to return
+       matf_size = 8, when called with set_id    = 1
+                                       part_id   = 1
+                                       wtyp      = Z_QUA04
+                                       mat_type  = Z_MAT_INDEX
+
+       matf_size = 12, when called with set_id   = 1
+                                        part_id  = 1
+                                        mat_type = Z_MIX_INDEX
+
+                 = 6, when called with set_id   = 1
+                                       part_id  = 1
+                                       mat_type = Z_MIX_VALUE
+
+  And, USERD_load_matf_data would need to return:
+    the int array ids_list as shown above when called with:
+       set_id   = 1
+       part_id  = 1
+       wtyp     = Z_QUA04
+       mat_type = Z_MAT_INDEX (indicating id list).
+
+    the int array ids_list as shown above when called with:
+       set_id   = 1
+       part_id  = 1
+       mat_type = Z_MIX_INDEX (indicating id list).
+
+    the float array val_list as shown above when called with:
+       set_id   = 1
+       part_id  = 1
+       mat_type = Z_MIX_VALUE (indicating val list).
+
+
+-------------------------------------------------------------------------
+USERD_get_number_of_materials
+
+   Description:
+   -----------
+   Gets the number of materials in the material set
+
+   Specification:
+   -------------
+   int USERD_get_number_of_materials( int set_index )
+
+   Returns:
+   -------
+   Num_materials[set_index]   = Number of materials in the set
+                                 0 indicates no materials information present
+                                -1 indicates an error
+   Arguments:
+   ---------
+   (IN) set_index             = the material set index (zero based)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero
+  * You may want to keep this as a global for use in other routines.
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_model_parts
+
+   Description:
+   -----------
+   Gets the total number of unstructured and structured parts
+   in the model, for which you can supply information.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_model_parts( void )
+
+   Returns:
+   -------
+   Number of parts  (>0 if okay, <=0 if problems).
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * If going to have to read down through the parts in order to
+     know how many, you may want to build a table of pointers to
+     the various parts, so you can easily get to particular parts in
+     later processes.  If you can simply read the number of parts
+     at the head of the file, then you would probably not build the
+     table at this time.
+
+   * This routine would set Numparts_available, which is equal to
+     Num_unstructured_parts + Num_structured_blocks.
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_timesets
+
+   Description:
+   -----------
+    Gets the number of timesets used in the model.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_timesets( void )
+
+   Returns:
+   -------
+   Number of timesets in the model
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * Num_timesets would be set here
+
+   * If you have a static model, both geometry and variables, you should
+     return a value of zero.
+ 
+   * If you have a transient model, then you should return one or more.
+ 
+   For example:
+ 
+      Geometry    Variables                                 No. of timesets
+      ---------   ------------------------------            ---------------
+      static      static                                      0
+      static      transient, all using same timeset           1
+ 
+      transient   transient, all using same timeset as geom   1
+ 
+      static      transient, using 3 different timesets       3
+ 
+      transient   transient, using 3 different timesets and
+                             none of them the same as the
+                             geometry timeset                 4
+          etc.
+ 
+   NOTE: ALL GEOMETRY MUST USE THE SAME TIMESET!!! You will have to provide
+                                                   the timeset number to use
+                                                   for geometry in:
+                                               USERD_get_geom_timeset_number
+ 
+         Variables can use the same timeset as the geometry, or can use
+         other timesets. More than one variable can use the same timeset.
+ 
+   example:  changing geometry at 5 steps, 0.0, 1.0, 2.0, 3.0, 4.0
+             variable 1 provided at these same five steps
+             variable 2 provided at 3 steps, 0.5, 1.25, 3.33
+ 
+        This routine should return a value of 2, because only
+        two different timesets are needed. Timeset 1 would be for the
+        geometry and variable 1 (they both use it). Timeset 2 would
+        be for variable 2, which needs its own in this case.
+
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_variables
+
+   Description:
+   -----------
+   Get the number of variables for which you will be providing info.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_variables( void )
+
+   Returns:
+   -------
+   Number of variables (includes constant, scalar, vector and tensor types)
+                       (>=0 if okay, <0 if problem)
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+    *****************************************************************
+   * Variable numbers, by which references will be made, are implied
+     here. If you say there are 3 variables, the variable numbers
+     will be 1, 2, and 3.
+    *****************************************************************
+
+   * Num_variables would be set here
+
+
+
+--------------------------------------------------------------------
+USERD_get_part_coords
+
+   Description:
+   -----------
+   Gets the coordinates for an unstructured part.
+
+   Specification:
+   -------------
+   int USERD_get_part_coords(int part_number, float **coord_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) coord_array             = 2D float array which contains,
+                                   x,y,z coordinates of each node
+                                   in the part.
+
+       (IMPORTANT: The second dimension of this aray is 1-based!!!)
+
+                                (Array will have been allocated
+                                 3 by (number_of_nodes + 1) for the part
+                                 long - see USERD_get_gold_part_build_info)
+
+
+                       ex) If number_of_nodes = 100
+                           as obtained in:
+                             USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions of the
+                           pointer sent to this routine will be:
+                             coord_array[3][101]
+
+                           Ignore the coord_array[0][0]
+                                      coord_array[1][0]
+                                      coord_array[2][0] locations and start
+                           the node coordinates at:
+                             coord_array[0][1]
+                             coord_array[1][1]
+                             coord_array[2][1]
+
+                             coord_array[0][2]
+                             coord_array[1][2]
+                             coord_array[2][2]
+
+                                   etc.
+
+   Notes:
+   -----
+   * Not called unless Num_unstructured_parts is > 0
+
+   * Will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_part_element_ids_by_type
+
+   Description:
+   -----------
+   Gets the ids for the elements of a particular type for an unstructured
+   or structured part.
+
+   Specification:
+   -------------
+   int USERD_get_part_element_ids_by_type(int part_number,
+                                          int element_type,
+                                          int *elemid_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  element_type            = One of the following (See global_extern.h)
+                                   Z_POINT      node point element
+                                   Z_BAR02      2 node bar
+                                   Z_BAR03      3 node bar
+                                   Z_TRI03      3 node triangle
+                                   Z_TRI06      6 node triangle
+                                   Z_QUA04      4 node quad
+                                   Z_QUA08      8 node quad
+                                   Z_TET04      4 node tetrahedron
+                                   Z_TET10     10 node tetrahedron
+                                   Z_PYR05      5 node pyramid
+                                   Z_PYR13     13 node pyramid
+                                   Z_PEN06      6 node pentahedron
+                                   Z_PEN15     15 node pentahedron
+                                   Z_HEX08      8 node hexahedron
+                                   Z_HEX20     20 node hexahedron
+
+                                   Z_G_POINT    ghost node point element
+                                   Z_G_BAR02    2 node ghost bar
+                                   Z_G_BAR03    3 node ghost bar
+                                   Z_G_TRI03    3 node ghost triangle
+                                   Z_G_TRI06    6 node ghost triangle
+                                   Z_G_QUA04    4 node ghost quad
+                                   Z_G_QUA08    8 node ghost quad
+                                   Z_G_TET04    4 node ghost tetrahedron
+                                   Z_G_TET10   10 node ghost tetrahedron
+                                   Z_G_PYR05    5 node ghost pyramid
+                                   Z_G_PYR13   13 node ghost pyramid
+                                   Z_G_PEN06    6 node ghost pentahedron
+                                   Z_G_PEN15   15 node ghost pentahedron
+                                   Z_G_HEX08    8 node ghost hexahedron
+                                   Z_G_HEX20   20 node ghost hexahedron
+
+   (OUT) elemid_array            = 1D array containing id of each
+                                   element of the type.
+
+                                  (Array will have been allocated
+                                   number_of_elements of the type long)
+
+                       ex) If number_of_elements[Z_TRI03] = 25
+                              number_of_elements[Z_QUA04] = 100
+                              number_of_elements[Z_HEX08] = 30
+                           as obtained in:
+                            USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions available
+                           for this routine will be:
+                              conn_array[25]   when called with Z_TRI03
+
+                              conn_array[100]  when called with Z_QUA04
+
+                              conn_array[30]  when called with Z_HEX08
+
+   Notes:
+   -----
+   * Not called unless element label status is set to TRUE in
+     USERD_get_element_label_status
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_part_elements_by_type
+
+   Description:
+   -----------
+   Gets the connectivities for the elements of a particular type in an
+   unstructured part
+
+   Specification:
+   -------------
+   int USERD_get_part_elements_by_type(int part_number,
+                                       int element_type,
+                                       int **conn_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number           = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  element_type          = One of the following (See global_extern.h)
+                                 Z_POINT      node point element
+                                 Z_BAR02      2 node bar
+                                 Z_BAR03      3 node bar
+                                 Z_TRI03      3 node triangle
+                                 Z_TRI06      6 node triangle
+                                 Z_QUA04      4 node quad
+                                 Z_QUA08      8 node quad
+                                 Z_TET04      4 node tetrahedron
+                                 Z_TET10     10 node tetrahedron
+                                 Z_PYR05      5 node pyramid
+                                 Z_PYR13     13 node pyramid
+                                 Z_PEN06      6 node pentahedron
+                                 Z_PEN15     15 node pentahedron
+                                 Z_HEX08      8 node hexahedron
+                                 Z_HEX20     20 node hexahedron
+
+                                 Z_G_POINT    ghost node point element
+                                 Z_G_BAR02    2 node ghost bar
+                                 Z_G_BAR03    3 node ghost bar
+                                 Z_G_TRI03    3 node ghost triangle
+                                 Z_G_TRI06    6 node ghost triangle
+                                 Z_G_QUA04    4 node ghost quad
+                                 Z_G_QUA08    8 node ghost quad
+                                 Z_G_TET04    4 node ghost tetrahedron
+                                 Z_G_TET10   10 node ghost tetrahedron
+                                 Z_G_PYR05    5 node ghost pyramid
+                                 Z_G_PYR13   13 node ghost pyramid
+                                 Z_G_PEN06    6 node ghost pentahedron
+                                 Z_G_PEN15   15 node ghost pentahedron
+                                 Z_G_HEX08    8 node ghost hexahedron
+                                 Z_G_HEX20   20 node ghost hexahedron
+
+
+   (OUT) conn_array            = 2D array containing connectivity
+                                 of each element of the type.
+
+                                (Array will have been allocated
+                                 num_of_elements of the type by
+                                 connectivity length of the type)
+
+                       ex) If number_of_elements[Z_TRI03] = 25
+                              number_of_elements[Z_QUA04] = 100
+                              number_of_elements[Z_HEX08] = 30
+                           as obtained in:
+                            USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions available
+                           for this routine will be:
+                              conn_array[25][3]   when called with Z_TRI03
+
+                              conn_array[100][4]  when called with Z_QUA04
+
+                              conn_array[30][8]   when called with Z_HEX08
+   
+   Notes:
+   -----
+   * Not called unless Num_unstructured_parts is > 0
+
+   * Will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_part_node_ids
+
+   Description:
+   -----------
+   Gets the node ids of an unstructured or structured part.
+
+   Specification:
+   -------------
+   int USERD_get_part_node_ids(int part_number, int *nodeid_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) nodeid_array            = 1D array containing node ids of
+                                    each node in the part.
+
+           (IMPORTANT: This array is 1-based!!!)
+
+                                   (Array will have been allocated
+                                    (number_of_nodes + 1) for the part long
+                                    see USERD_get_gold_part_build_info)
+
+                       ex) If number_of_nodes = 100
+                           as obtained in:
+                             USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions of the
+                           pointer sent to this routine will be:
+                             nodeid_array[101]
+
+                           Ignore the nodeid_array[0] location and start
+                           the node ids at:
+                             nodeid_array[1]
+
+                             nodeid_array[2]
+
+                                   etc.
+
+   Notes:
+   -----
+   * Not called unless node label status is TRUE, as returned from
+     USERD_get_node_label_status
+
+   * Will be based on Current_time_step
+
+   * The ids are purely labels, used when displaying or querying node ids.
+     However, any node id < 0 will never be displayed
+
+
+--------------------------------------------------------------------
+USERD_get_reader_descrip
+
+   Description:
+   -----------
+   Gets the description of the reader, so gui can give more info
+
+   Specification:
+   -------------
+   int USERD_get_reader_descrip(char descrip[Z_MAXFILENP])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) descrip  = the description of the reader (max length is MAXFILENP,
+                                                   which is 255)
+
+   Notes:
+   -----
+   * OPTIONAL ROUTINE!   You can have it or not.
+
+
+
+--------------------------------------------------------------------
+USERD_get_reader_version
+
+   Description:
+   -----------
+   Gets the version number of the user defined reader
+
+   Specification:
+   -------------
+   int USERD_get_reader_version(char version_number[Z_MAX_USERD_NAME])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful (and will assume is version 1.0)
+
+   Arguments:
+   ---------
+   (OUT) version_number       = the version number of the reader
+                                (max length is Z_MAX_USERD_NAME, which
+                                 is 20)
+
+   Notes:
+   -----
+   * This needs to be "2.000" or greater. Otherwise EnSight will assume
+     this reader is API 1.0
+
+   * should set it to "2.010" for this version of the API
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_sol_times
+
+   Description:
+   -----------
+   Get the solution times associated with each time step for 
+   desired timeset.
+
+   Specification:
+   -------------
+   int USERD_get_sol_times(int timeset_number,
+                           float *solution_times)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  timeset_number     = the timeset number
+ 
+                              For example: If USERD_get_number_of_timesets
+                                           returns 2, the valid
+                                           timeset_number's would be 1 and 2
+
+   (OUT) solution_times       = 1D array of solution times per time step
+
+                                  (Array will have been allocated
+                                   Num_time_steps[timeset_number] long)
+
+   Notes:
+   -----
+   * The solution times must be non-negative and increasing.
+
+
+
+--------------------------------------------------------------------
+USERD_get_timeset_description -
+
+   Description:
+   -----------
+   Get the description to associate with the desired timeset.
+
+   Specification:
+   -------------
+   int USERD_get_timeset_description(int timeset_number,
+                                     char timeset_description[Z_BUFL])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  timeset_number     = the timeset number
+ 
+                              For example: If USERD_get_number_of_timesets
+                                           returns 2, the valid
+                                           timeset_number's would be 1 and 2
+
+   (OUT) timeset_description  = timeset description string
+
+
+   Notes:
+   -----
+   * A string of NULLs is valid for timeset_description
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_var_by_component
+
+   Description:
+   -----------
+   Gets the values of a variable component.  Both unstructured and structured
+   parts use this routine.
+
+   if Z_PER_NODE:
+     Get the component value at each node for a given variable in the part.
+
+   or if Z_PER_ELEM:
+     Get the component value at each element of a specific part and type
+     for a given variable.
+
+   Specification:
+   -------------
+   int USERD_get_var_by_component(int which_variable,
+                                  int which_part,
+                                  int var_type,
+                                  int which_type,
+                                  int imag_data,
+                                  int component,
+                                  float *var_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   or:  Z_UNDEF, in which case you need not load any values into var_array
+
+
+   Arguments:
+   ---------
+   (IN)  which_variable          = The variable number
+
+   (IN)  which_part                 Since EnSight Version 7.4
+                                    -------------------------
+                                  = The part number
+
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+                                    Prior to EnSight Version 7.4
+                                    ----------------------------
+                                  = The part id   This is the part_id label loaded
+                                                  in USERD_get_gold_part_build_info.
+                                                  It is NOT the part table index.
+
+   (IN)  var_type                = Z_SCALAR
+                                   Z_VECTOR
+                                   Z_TENSOR   (symmetric tensor)
+                                   Z_TENSOR9  (asymmetric tensor)
+
+   (IN)  which_type
+
+            if Z_PER_NODE:         Not used
+
+            if Z_PER_ELEM:       = The element type
+                                   Z_POINT      node point element
+                                   Z_BAR02      2 node bar
+                                   Z_BAR03      3 node bar
+                                   Z_TRI03      3 node triangle
+                                   Z_TRI06      6 node triangle
+                                   Z_QUA04      4 node quad
+                                   Z_QUA08      8 node quad
+                                   Z_TET04      4 node tetrahedron
+                                   Z_TET10     10 node tetrahedron
+                                   Z_PYR05      5 node pyramid
+                                   Z_PYR13     13 node pyramid
+                                   Z_PEN06      6 node pentahedron
+                                   Z_PEN15     15 node pentahedron
+                                   Z_HEX08      8 node hexahedron
+                                   Z_HEX20     20 node hexahedron
+
+                                   Z_G_POINT    ghost node point element
+                                   Z_G_BAR02    2 node ghost bar
+                                   Z_G_BAR03    3 node ghost bar
+                                   Z_G_TRI03    3 node ghost triangle
+                                   Z_G_TRI06    6 node ghost triangle
+                                   Z_G_QUA04    4 node ghost quad
+                                   Z_G_QUA08    8 node ghost quad
+                                   Z_G_TET04    4 node ghost tetrahedron
+                                   Z_G_TET10   10 node ghost tetrahedron
+                                   Z_G_PYR05    5 node ghost pyramid
+                                   Z_G_PYR13   13 node ghost pyramid
+                                   Z_G_PEN06    6 node ghost pentahedron
+                                   Z_G_PEN15   15 node ghost pentahedron
+                                   Z_G_HEX08    8 node ghost hexahedron
+                                   Z_G_HEX20   20 node ghost hexahedron
+
+   (IN)  imag_data               = TRUE if imag component
+                                   FALSE if real component
+ 
+   (IN)  component               = The component: (0       if Z_SCALAR)
+                                                  (0 - 2   if Z_VECTOR)
+                                                  (0 - 5   if Z_TENSOR)
+                                                  (0 - 8   if Z_TENSOR9)
+ 
+                                 * 6 Symmetric Indicies, 0:5    *
+                                 * ---------------------------- *
+                                 *     | 11 12 13 |   | 0 3 4 | *
+                                 *     |          |   |       | *
+                                 * T = |    22 23 | = |   1 5 | *
+                                 *     |          |   |       | *
+                                 *     |       33 |   |     2 | *
+ 
+
+                                 * 9 General   Indicies, 0:8    *
+                                 * ---------------------------- *
+                                 *     | 11 12 13 |   | 0 3 4 | *
+                                 *     |          |   |       | *
+                                 * T = | 21 22 23 | = | 6 1 5 | *
+                                 *     |          |   |       | *
+                                 *     | 31 32 33 |   | 7 8 2 | *
+
+   (OUT) var_array 
+
+      -----------------------------------------------------------------------
+      (IMPORTANT: this array is 1-based for both Z_PER_NODE and Z_PER_ELEM!!!)
+      -----------------------------------------------------------------------
+
+            if Z_PER_NODE:    = 1D array containing variable component value
+                                for each node.
+
+                                (Array will have been allocated
+                                 (number_of_nodes + 1) long)
+
+                      Info stored in this fashion:
+                            var_array[0] = not used
+                            var_array[1] = var component for node 1 of part
+                            var_array[2] = var_component for node 2 of part
+                            var_array[3] = var_component for node 3 of part
+                            etc.
+
+            if Z_PER_ELEM:    = 1D array containing variable component
+                                value for each element of a particular
+                                part and type.
+                                    
+                              (Array will have been allocated
+                               (number_of_elements[which_part][which_type] + 1)
+                                long.  See USERD_get_gold_part_build_info)
+
+                  Info stored in this fashion:
+                    var_array[1] = var component for elem 1 (of part and type)
+                    var_array[2] = var component for elem 2 (of part and type)
+                    var_array[3] = var component for elem 3 (of part and type)
+                    etc.
+
+   Notes:
+   -----
+   * Not called unless Num_variables is > 0
+
+   * The per_node or per_elem classification must be obtainable from the
+     variable number (a var_classify array needs to be retained)
+
+   * Will be based on Current_time_step
+
+   * If the variable is not defined for this part, simply return with a
+     value of Z_UNDEF.  EnSight will treat the variable as undefined for
+     this part.
+
+
+--------------------------------------------------------------------
+USERD_get_var_value_at_specific
+
+   Description:
+   -----------
+   if Z_PER_NODE:
+     Get the value of a particular variable at a particular node in a
+     particular part at a particular time.
+
+   or if Z_PER_ELEM:
+     Get the value of a particular variable at a particular element of
+     a particular type in a particular part at a particular time.
+
+
+   Specification:
+   -------------
+   int USERD_get_var_value_at_specific(int which_var,
+                                       int which_node_or_elem,
+                                       int which_part,
+                                       int which_elem_type,
+                                       int time_step,
+                                       float values[3],
+                                       int imag_data)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  which_var   = The variable number
+
+   (IN)  which_node_or_elem
+
+              If Z_PER_NODE:
+                = The node number.  This is not the id, but is
+                                    the index of the global node 
+                                    list (1 based), or the block's
+                                    node list (1 based).
+
+                  Thus,  coord_array[1]
+                         coord_array[2]
+                         coord_array[3]
+                              .      |
+                              .      |which_node_or_elem index
+                              .             ----
+
+
+              If Z_PER_ELEM:
+                = The element number.  This is not the id, but is
+                                       the element number index
+                                       of the number_of_element array
+                                       (see USERD_get_gold_part_build_info),
+                                        or the block's element list (1 based).
+
+                  Thus,  for which_part:
+                         conn_array[which_elem_type][0]
+                         conn_array[which_elem_type][1]
+                         conn_array[which_elem_type][2]
+                              .                      |
+                              .          which_node_or_elem index
+                              .                        ----
+
+
+   (IN)  which_part                 Since EnSight Version 7.4
+                                    -------------------------
+                                  = The part number
+
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+                                    Prior to EnSight Version 7.4
+                                    ----------------------------
+                                  = The part id   This is the part_id label loaded
+                                                  in USERD_get_gold_part_build_info.
+                                                  It is NOT the part table index.
+
+
+   (IN)  which_elem_type
+
+              If Z_PER_NODE, or block part:
+                = Not used
+
+              If Z_PER_ELEM:
+                = The element type.    This is the element type index
+                                       of the number_of_element array
+                                       (see USERD_get_gold_part_build_info)
+
+   (IN)  time_step   = The time step
+
+   (IN)  imag_data   = TRUE if want imaginary value.
+                       FALSE if want real value.
+
+   (OUT) values      = scalar or vector component value(s)
+                        values[0] = scalar or vector[0]
+                        values[1] = vector[1]
+                        values[2] = vector[2]
+
+
+   Notes:
+   -----
+   * This routine is used in node querys over time (or element querys over
+     time for Z_PER_ELEM variables).  If these operations are not critical
+     to you, this can be a dummy routine.
+
+   * The per_node or per_elem classification must be obtainable from the
+     variable number (a var_classify array needs to be retained)
+
+   * The time step given is for the proper variable timeset.
+
+
+----------------------------------------------------------------------
+USERD_load_matf_data
+
+   Description:
+   -----------
+   Get the material id list, mixed-material id list, or
+   mixed-material values list for the given material set and part (and
+   element type if material id list)
+
+   Specification:
+   -------------
+   int USERD_load_matf_data( int set_index,
+                             int part_id,
+                             int wtyp,
+                             int mat_type,
+                             int *ids_list,
+                             float *val_list)
+
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+  (IN)  set_index         = the material set index (zero based)
+
+  (IN)  part_id           = the part number desired
+
+  (IN)  wtyp              = the element type        (used for Z_MAT_INDEX only)
+
+                                  Z_POINT    node point element
+                                  Z_BAR02    2 node bar
+                                  Z_BAR03    3 node bar
+                                  Z_TRI03    3 node triangle
+                                  Z_TRI06    6 node triangle
+                                  Z_QUA04    4 node quad
+                                  Z_QUA08    8 node quad
+                                  Z_TET04    4 node tetrahedron
+                                  Z_TET10   10 node tetrahedron
+                                  Z_PYR05    5 node pyramid
+                                  Z_PYR13   13 node pyramid
+                                  Z_PEN06    6 node pentahedron
+                                  Z_PEN15   15 node pentahedron
+                                  Z_HEX08    8 node hexahedron
+                                  Z_HEX20   20 node hexahedron
+                                  Z_NSIDED  nsided polygon
+                                  Z_NFACED  nfaced polyhedron
+
+                                  Z_G_POINT    ghost node point element
+                                  Z_G_BAR02    2 node ghost bar
+                                  Z_G_BAR03    3 node ghost bar
+                                  Z_G_TRI03    3 node ghost triangle
+                                  Z_G_TRI06    6 node ghost triangle
+                                  Z_G_QUA04    4 node ghost quad
+                                  Z_G_QUA08    8 node ghost quad
+                                  Z_G_TET04    4 node ghost tetrahedron
+                                  Z_G_TET10   10 node ghost tetrahedron
+                                  Z_G_PYR05    5 node ghost pyramid
+                                  Z_G_PYR13   13 node ghost pyramid
+                                  Z_G_PEN06    6 node ghost pentahedron
+                                  Z_G_PEN15   15 node ghost pentahedron
+                                  Z_G_HEX08    8 node ghost hexahedron
+                                  Z_G_HEX20   20 node ghost hexahedron
+                                  Z_G_NSIDED  ghost nsided polygon
+                                  Z_G_NFACED  ghost nfaced polyhedron
+
+  (IN)  mat_type          = Z_MAT_INDEX for material ids list
+                            Z_MIX_INDEX for mixed-material ids list
+                            Z_MIX_VALUE for mixed-material values list
+
+  (OUT) ids_list          = If mat_type is Z_MAT_INDEX:
+                            ---------------------------
+                             1D material id list
+                               (Int array will have been allocated
+                                the appropriate size, as returned in
+                                 USERD_size_matf_data for mat_type Z_MAT_INDEX)
+
+                            If mat_type is Z_MIX_INDEX:
+                            ---------------------------
+                             1D mixed-material id list
+                               (Int array will have been allocated
+                                the appropriate size, as returned in
+                                 USERD_size_matf_data for mat_type Z_MIX_INDEX)
+
+  (OUT) val_list          = 1D mixed-materials values list
+                            (only used if mat_type is Z_MIX_VALUE)
+
+                               (Float array will have been allocated
+                                the appropriate size, as returned in
+                                USERD_size_matf_data for mat_type Z_MIX_VALUE)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero,
+     or Num_materials[set_index] is zero,
+     or the appropriate size from USERD_size_matf_data is zero
+
+
+
+--------------------------------------------------------------------
+USERD_set_filenames
+
+   Description:
+   -----------
+   Receives the geometry and result filenames entered in the data
+   dialog.  The user written code will have to store and use these
+   as needed. The user written code must manage its own files!!
+
+   Specification:
+   -------------
+   int USERD_set_filenames(char filename_1[],
+                           char filename_2[],
+                           char the_path[],
+                           int swapbytes)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN) filename_1   = the filename entered into the geometry
+                         field of the data dialog.
+
+   (IN) param_2      = The usage of this string depends on
+                       'two_fields' in USERD_get_name_of_reader.
+ 
+                       If two_fields is FALSE then it's empty.
+ 
+                       If two_fields is TRUE, this is the 
+                       manditory results file entered 
+                       into the result field of the data dialog.
+ 
+                       If two_fields is -1, then this contains
+                       optional text (filenames, modifiers, etc.)
+                       that can be parsed and used to modify 
+                       reader 
+
+   (IN) the_path     = the path info from the data dialog.
+                       Note: filename_1 and filename_2 have already
+                            had the path prepended to them.  This
+                            is provided in case it is needed for
+                            filenames contained in one of the files
+
+   (IN) swapbytes    = TRUE if should swap bytes when reading data.
+                     = FALSE normally.
+
+   Notes:
+   -----
+   * Since you must manage everything from the input that is entered in
+     these data dialog fields, this is an important routine!
+
+   * It may be that you will need to have an executive type file that contains
+     info and other filenames within it, like EnSight6's case file.
+
+
+--------------------------------------------------------------------
+USERD_set_server_number
+
+   Description:
+   -----------
+   Receives the server number of how many total servers.
+
+   Specification:
+   -------------
+   int USERD_set_server_number(int cur_serv,
+                               int tot_servs)
+
+   Returns:
+   -------
+   nothing
+
+   Arguments:
+   ---------
+   (IN) cur_serv    = the current server.
+
+   (IN) tot_servs   = the total number of servers.
+
+   Notes:
+   -----
+   * Only useful if your user defined reader is being used with EnSight's
+     Server-of-Server capability.  And even then, it may or may not be
+     something that you can take advantage of.  If your data is already
+     partitioned in some manner, such that you can access the proper
+     portions using this information.
+ 
+     For all non-SOS uses, this will simply be 1 of 1
+
+
+
+--------------------------------------------------------------------
+USERD_set_time_set_and_step
+
+   Description:
+   -----------
+   Set the current time step in the desired timeset.  All functions that
+   need time, and that do not explicitly pass it in, will use the timeset
+   and step set by this routine, if needed.
+
+   Specification:
+   -------------
+   void USERD_set_time_set_and_step(int timeset_number,
+                                    int time_step)
+
+   Returns:
+   -------
+   nothing
+
+   Arguments:
+   ---------
+   (IN) timeset_number  = the timeset number (1 based).
+ 
+                          For example:  If USERD_get_number_of_timesets
+                                        returns 2, the valid timeset_number's
+                                        would be 1 and 2.
+
+   (IN) time_step       = The current time step to set
+
+   Notes:
+   -----
+   * Current_time_step and Current_timeset would be set here
+
+
+--------------------------------------------------------------------
+USERD_size_matf_data
+
+   Description:
+   -----------
+   Get the length of the material id list, mixed-material id list, or
+   mixed-material values list for the given material set and part (and
+   element type if material id list)
+
+   Specification:
+   -------------
+   int USERD_size_matf_data( int set_index,
+                             int part_id,
+                             int wtyp,
+                             int mat_type,
+                             int *matf_size)
+
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+  (IN)  set_index         = the material set index (zero based)
+
+  (IN)  part_id           = the part number desired
+
+  (IN)  wtyp              = the element type        (used for Z_MAT_INDEX only)
+
+                                  Z_POINT    node point element
+                                  Z_BAR02    2 node bar
+                                  Z_BAR03    3 node bar
+                                  Z_TRI03    3 node triangle
+                                  Z_TRI06    6 node triangle
+                                  Z_QUA04    4 node quad
+                                  Z_QUA08    8 node quad
+                                  Z_TET04    4 node tetrahedron
+                                  Z_TET10   10 node tetrahedron
+                                  Z_PYR05    5 node pyramid
+                                  Z_PYR13   13 node pyramid
+                                  Z_PEN06    6 node pentahedron
+                                  Z_PEN15   15 node pentahedron
+                                  Z_HEX08    8 node hexahedron
+                                  Z_HEX20   20 node hexahedron
+                                  Z_NSIDED  nsided polygon
+                                  Z_NFACED  nfaced polyhedron
+
+                                  Z_G_POINT    ghost node point element
+                                  Z_G_BAR02    2 node ghost bar
+                                  Z_G_BAR03    3 node ghost bar
+                                  Z_G_TRI03    3 node ghost triangle
+                                  Z_G_TRI06    6 node ghost triangle
+                                  Z_G_QUA04    4 node ghost quad
+                                  Z_G_QUA08    8 node ghost quad
+                                  Z_G_TET04    4 node ghost tetrahedron
+                                  Z_G_TET10   10 node ghost tetrahedron
+                                  Z_G_PYR05    5 node ghost pyramid
+                                  Z_G_PYR13   13 node ghost pyramid
+                                  Z_G_PEN06    6 node ghost pentahedron
+                                  Z_G_PEN15   15 node ghost pentahedron
+                                  Z_G_HEX08    8 node ghost hexahedron
+                                  Z_G_HEX20   20 node ghost hexahedron
+                                  Z_G_NSIDED  ghost nsided polygon
+                                  Z_G_NFACED  ghost nfaced polyhedron
+
+  (IN)  mat_type          = Z_MAT_INDEX for material ids list
+                            Z_MIX_INDEX for mixed-material ids list
+                            Z_MIX_VALUE for mixed-material values list
+
+  (OUT) matf_size         = the length of the material id list, or
+                            mixed-material id list, or
+                            mixed-material values list
+                            for the given material set and part number
+                            (and element type if Z_MAT_INDEX)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero, or
+     Num_materials[set_index] is zero
+
+
+
+
+--------------------------------------------------------------------
+USERD_stop_part_building
+
+   Description:
+   -----------
+   This routine called when the part building dialog is closed.  It is
+   provided in case you desire to release memory, etc. that was only needed
+   during the part building process.
+
+   Specification:
+   -------------
+   void USERD_stop_part_building( void )
+
+   Returns:
+   -------
+   nothing
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+
+--------------------------------------------------------------------
+USERD_rigidbody_existence
+
+   Description:
+   -----------
+   Gets the existence of rigid body values or not in the model
+
+   Specification:
+   -------------
+   int USERD_rigidbody_existence( void )
+
+   Returns:
+   -------
+   Z_OK    if rigid body values exist for the model
+   Z_UNDEF if no rigid body values exist
+   Z_ERR   if an error
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * This will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_rigidbody_values
+
+   Description:
+   -----------
+   Gets the rigid body values for each part
+
+   Specification:
+   -------------
+   int USERD_rigidbody_values(int part_number,
+                              float values[7])
+
+   Returns:
+   -------
+   Z_OK    if rigid body values exist for the model
+   Z_UNDEF if no rigid body values exist
+   Z_ERR   if an error
+
+   Arguments:
+   ---------
+   (IN)  part_number        = The part number
+ 
+                              (1-based index of part table, namely:
+ 
+                                 1 ... Numparts_available.
+ 
+                               It is NOT the part_id that
+                               is loaded in USERD_get_gold_part_build_info)
+ 
+   (OUT) values             values[0] = IX   (x location)
+                            values[1] = IY   (y location)
+                            values[2] = IZ   (z location)
+                            values[3] = E0   (e0 euler value)
+                            values[4] = E1   (e1 euler value)
+                            values[5] = E2   (e2 euler value)
+                            values[6] = E3   (e3 euler value)
+
+
+   Notes:
+   -----
+   * This will be based on Current_time_step
+   * It will not be called unless USERD_rigidbody_existence indicates
+       that there are some values in the model by returning Z_OK.
+
+
+--------------------------------------------------------------------
+USERD_set_right_side
+
+   Description:
+   -----------
+   Informs the reader that the time currently set is the right side of a time
+   span used for variable interpolation between time steps
+
+   Specification:
+   -------------
+   void USERD_set_right_side( void )
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * Applies to Current_time_step
+
+
+
+
+
+------------------------------------------------------------------
+	ENHANCED GUI ROUTINES
+
+--------------------------------------------------------------------
+USERD_get_extra_gui_numbers
+
+   Description:
+   -----------
+   The Enhanced GUI routines are added to allow
+   the user to customize a portion of the Data
+   Reader dialog to pass in options to their
+   user defined reader.
+
+   Specification:
+   -------------
+   void USERD__get_extra_gui_numbers(int *num_Toggles,
+                                     int *num_pulldowns,
+                                     int *num_fields)
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (OUT) num_Toggles    = number of toggles that will be provided
+   
+         num_pulldowns  = number of pulldowns that will be provided
+
+         num_fields     = number of fields that will be provided
+
+   Notes:
+   -----
+     There are three routines that work together:
+     USERD_get_extra_gui_numbers
+     USERD_get_extra_gui_defaults
+     USERD_set_extra_gui_data
+
+     The existence of these routine indicates that
+     you wish to add customize entries to the
+     Data Reader dialog.
+
+     If you don't want the extra GUI features,
+     simply delete these routines, or change their
+     names to something such as
+     USERD_DISABLED_get_extra_gui_defaults
+ 
+     The presence of these routines
+     will ensure that EnSight will call them and
+     use their data to modify the extraction parameters set
+     with some or all of the following:
+     toggles, pulldown menu and fields.
+ 
+     The user can then interact with the enhanced
+     GUI and then send their choices to
+     USERD_set_extra_gui_data
+  
+     Therefore if USERD_get_extra_gui_numbers
+     exists then the other two must exist.
+ 
+     If none exist, then the GUI will be unchanged.
+ 
+     Toggle data will return an integer
+                               TRUE if checked
+                               FALSE if unchecked
+ 
+     Pulldown menu will return an integer representing
+                               the menu item selected
+ 
+     Field will return a string Z_LEN_GUI_FIELD_STR long.
+ 
+     If all the enhanced GUI features are enabled it
+     might look something like this
+
+    ===================================================
+    [] Title 1  [X] Title 3
+    [X]Title 2  [X] Title 4
+ 
+    Pulldown Menu ->
+        Menu Choice 1
+        Menu Choice 2
+        Menu Choice 3
+ 
+    Data Field Title 1 ____________________________
+ 
+    Data Field Title 2 ____________________________
+    =====================================================
+
+    This routine defines the numbers of toggles, pulldowns & fields
+ 
+    The following are defined in the global_extern.h
+           Z_MAX_NUM_GUI_PULL_ITEMS max num GUI pulldowns
+           Z_LEN_GUI_PULL_STR  max length of GUI pulldown string
+           Z_LEN_GUI_FIELD_STR  max length of field string
+           Z_LEN_GUI_TITLE_STR   max length of title string
+ 
+    The library is loaded, this routine is
+     called, then the library is unloaded.
+ 
+    Do not define globals in this routine
+     as when the library is unloaded, you'll
+     lose them.
+ 
+
+--------------------------------------------------------------------
+USERD_get_extra_gui_defaults
+
+   Description:
+   -----------
+   This routine defines the Titles, status,
+   List choices, strings, etc that are fed
+   up to the GUI.
+
+   Specification:
+   -------------
+   int USERD_get_extra_gui_defaults(char **toggle_Title,
+                                    int *toggle_default_status,
+                                    char **pulldown_Title,
+                                    int *pulldown_number_in_list,
+                                    int *pulldown_default_selection,
+                                    char ***pulldown_item_strings,
+                                    char **field_Title,
+                                    char **field_user_string)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) toggle_Title               = title for each toggle
+                                      array dimension is [num_toggles] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         toggle_default_status      = Setting for each toggle (TRUE or FALSE)
+                                      array dimension is [num_toggles] long 
+
+         pulldown_Title             = title for each pulldown
+                                      array dimension is [num_pulldowns] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         pulldown_number_in_list    = number of items in each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_default_selection = pulldown item selection for each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_item_strings      = pulldown item strings
+                                      array is [num_pulldowns] by
+                                               [Z_MAX_NUM_GUI_PULL_ITEMS] by
+                                               [Z_LEN_GUI_PULL_STR] long
+
+         field_Title                = title for each field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         field_user_string          = content of the field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+
+
+   Notes:
+   -----
+   * The library is loaded, this routine is called, then the library is unloaded.
+ 
+   * Do not define globals in this routine as when the library is unloaded, you'll
+     lose them.
+
+
+
+--------------------------------------------------------------------
+USERD_set_extra_gui_data
+
+   Description:
+   -----------
+   This routine sets the new values for the toggles, pulldowns, and fields.
+
+   Specification:
+   -------------
+   void USERD_set_extra_gui_data(
+               int *toggle,       /* [num_toggle] */
+               int *pulldown,     /* [num_pulldown] */
+               char **field_text  /* [num_fields][Z_LEN_GUI_FIELD_STR]*/)
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (IN) toggle               = setting for each toggle.  TRUE or FALSE
+                               array dimension is [num_toggles] long
+
+        pulldown             = item chosen in each pulldown. (0 based)
+                               array dimension is [num_pulldowns] long
+
+        field_text           = content of the field
+                               array dimension is [num_fields] by
+                                                  [Z_LEN_GUI_TITLE_STR] long
+
+
+   Notes:
+   -----
+   * This routine is called when the library is permanently
+     loaded to the EnSight session, so define your globals
+     in this and later routines.
+ 
+   * It's up to you to change your reader behavior according to
+     user entries!
+
+
+
+--------------------------------------------------------------------
+USERD_get_var_extract_gui_numbers
+
+   Description:
+   -----------
+   The Var_Extract_GUI routines are added to allow
+   the user to customize a extraction parameters
+   for variables "after" the file has been read.
+   These things can be modified and the variables will
+   be update/refreshed according to the new parameters set
+
+   Specification:
+   -------------
+   void USERD_get_var_extract_gui_numbers(int *num_Toggles,
+                                          int *num_pulldowns,
+                                          int *num_fields)
+
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (OUT) num_Toggles    = number of toggles that will be provided
+   
+         num_pulldowns  = number of pulldowns that will be provided
+
+         num_fields     = number of fields that will be provided
+
+   Notes:
+   -----
+     There are three routines that work together:
+     USERD_get_var_extract_gui_numbers
+     USERD_get_var_extract_gui_defaults (this one)
+     USERD_set_var_extract_gui_data
+
+     The existence of these routine indicates that
+     you wish to have the Var Extract Parameters dialog.
+
+     If you don't want the extra GUI features,
+     simply delete these routines, or change their
+     names to something such as
+     USERD_DISABLED_get_var_extract_gui_defaults
+ 
+     The presence of these routines
+     will ensure that EnSight will call them and
+     use their data to modify the extraction parameters set
+     with some or all of the following:
+     toggles, pulldown menu and fields.
+ 
+     The user can then interact with the enhanced
+     GUI and then send their choices to
+     USERD_set_extra_gui_data
+  
+     Therefore if USERD_get_var_extract_gui_numbers
+     exists then the other two must exist.
+ 
+     If none exist, then the GUI will be unchanged.
+ 
+     Toggle data will return an integer
+                               TRUE if checked
+                               FALSE if unchecked
+ 
+     Pulldown menu will return an integer representing
+                               the menu item selected
+ 
+     Field will return a string Z_LEN_GUI_FIELD_STR long.
+ 
+     If all the enhanced GUI features are enabled it
+     might look something like this
+
+    ===================================================
+    [] Title 1  [X] Title 3
+    [X]Title 2  [X] Title 4
+ 
+    Pulldown Menu ->
+        Menu Choice 1
+        Menu Choice 2
+        Menu Choice 3
+ 
+    Data Field Title 1 ____________________________
+ 
+    Data Field Title 2 ____________________________
+    =====================================================
+
+    This routine defines the numbers of toggles, pulldowns & fields
+ 
+    The following are defined in the global_extern.h
+           Z_MAX_NUM_GUI_PULL_ITEMS max num GUI pulldowns
+           Z_LEN_GUI_PULL_STR  max length of GUI pulldown string
+           Z_LEN_GUI_FIELD_STR  max length of field string
+           Z_LEN_GUI_TITLE_STR   max length of title string
+ 
+    The library is loaded, this routine is
+     called, then the library is unloaded.
+ 
+    Do not define globals in this routine
+     as when the library is unloaded, you'll
+     lose them.
+ 
+
+--------------------------------------------------------------------
+USERD_get_var_extract_gui_defaults
+
+   Description:
+   -----------
+   This routine defines the Titles, status,
+   List choices, strings, etc that are fed
+   up to the GUI.
+
+   Specification:
+   -------------
+   int USERD_get_var_extract_gui_defaults(char **toggle_Title,
+                                          int *toggle_default_status,
+                                          char **pulldown_Title,
+                                          int *pulldown_number_in_list,
+                                          int *pulldown_default_selection,
+                                          char ***pulldown_item_strings,
+                                          char **field_Title,
+                                          char **field_user_string)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) toggle_Title               = title for each toggle
+                                      array dimension is [num_toggles] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         toggle_default_status      = Setting for each toggle (TRUE or FALSE)
+                                      array dimension is [num_toggles] long 
+
+         pulldown_Title             = title for each pulldown
+                                      array dimension is [num_pulldowns] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         pulldown_number_in_list    = number of items in each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_default_selection = pulldown item selection for each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_item_strings      = pulldown item strings
+                                      array is [num_pulldowns] by
+                                               [Z_MAX_NUM_GUI_PULL_ITEMS] by
+                                               [Z_LEN_GUI_PULL_STR] long
+
+         field_Title                = title for each field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         field_user_string          = content of the field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+
+
+   Notes:
+   -----
+   * The library is loaded, this routine is called, then the library is unloaded.
+ 
+   * Do not define globals in this routine as when the library is unloaded, you'll
+     lose them.
+
+
+
+--------------------------------------------------------------------
+USERD_set_var_extract_gui_data
+
+   Description:
+   -----------
+   This routine sets the new values for the toggles, pulldowns, and fields.
+
+   Specification:
+   -------------
+   void USERD_set_var_extract_gui_data(
+               int *toggle,       /* [num_toggle] */
+               int *pulldown,     /* [num_pulldown] */
+               char **field_text  /* [num_fields][Z_LEN_GUI_FIELD_STR]*/)
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (IN) toggle               = setting for each toggle.  TRUE or FALSE
+                               array dimension is [num_toggles] long
+
+        pulldown             = item chosen in each pulldown. (0 based)
+                               array dimension is [num_pulldowns] long
+
+        field_text           = content of the field
+                               array dimension is [num_fields] by
+                                                  [Z_LEN_GUI_TITLE_STR] long
+
+
+   Notes:
+   -----
+   * This routine is called when the library is permanently
+     loaded to the EnSight session, so define your globals
+     in this and later routines.
+ 
+   * It's up to you to change your reader behavior according to
+     user entries!
+
+
+
+
+
+-----------------------------------------------------------------------------------
+/* ----------------------------------------------------------
+ *  New in EnSight 8 is the capability to remove (fail) elements
+ *   based on variable threshold values.  Basically the variable
+ *   name, a couple of thresholds, a couple of values and a logic 
+ *   criteria are read in from this routine.  Every element that
+ *   satisfies the failure criteria is removed and not used in
+ *   EnSight calculations.
+ *   
+ *  Example Failure criteria 
+ *     Let fail_var_name = "fail_flag"
+ *         threshold_val1 = 0
+ *         threshold_operator1 = Z_EQUAL_TO  
+ *         logic_criteria2 not used
+ *         threshold_val2 not used
+ *         threshold_operator2 not used
+ *     For each value of "fail_flag" at each element, 
+ *         if fail flag == threshold_val1 (0.0) then element fails
+ *   Return (Z_ERR) if this is not used.
+ *   Return (Z_OK) if failed element feature should be used
+ *
+ *  threshold_operator1 & 2 can be one of the following
+ *    Z_ELE_FAILED_NONE,           - disables checking
+ *     Z_ELE_FAILED_GREATER,        - greater than
+ *     Z_ELE_FAILED_LESS,           - less than
+ *     Z_ELE_FAILED_EQUAL,          - equal
+ *     Z_ELE_FAILED_NOT_EQUAL,      - not equal
+ *     Z_ELE_FAILED_MANY            - not used
+ *
+ * logic_criteria2
+ *      Z_ELE_FAILED_LOGIC_NONE,
+ *      Z_ELE_FAILED_LOGIC_AND,
+ *      Z_ELE_FAILED_LOGIC_OR,
+ *      Z_ELE_FAILED_LOGIC_MANY
+ *
+ * ---------------------------------------------------------- */
+int USERD_get_uns_failed_params(
+                char *fail_var_name,           /* variable name to be used in failure
+                                             must be scalar, per elem      */
+                float *threshold_val1,     /* number to compare for failure */
+                float *threshold_val2,     /* number to compare for failure */
+                int *threshold_operator1,   /* Z_GREATER_THAN, Z_LESS_THAN,
+                                            Z_EQUAL_TO */
+                int *threshold_operator2,   /* Z_GREATER_THAN, Z_LESS_THAN,
+                                            Z_EQUAL_TO */
+		int *logic_criteria2
+
+
+
+
+---- end of document ----
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_2.06 b/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_2.06
new file mode 100644
index 0000000000..88c4955c81
--- /dev/null
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_2.06
@@ -0,0 +1,4603 @@
+README_USERD_2.06
+=================
+--------------------------------------
+EnSight User Defined Reader Capability   ===> (API 2.06)
+--------------------------------------
+A user defined reader capability is included in EnSight which can allow
+otherwise unsupported structured or unstructured data to be read.  The user
+defined reader capability utilizes dynamic shared libraries composed of
+routines defined in this document but produced by you, the user, (or some
+third party). This capability is currently available for dec, ibm, hp, sgi,
+sun, linux, alpha linux, and NT servers.
+
+You should refer to beginning of README_USERD_2.0  and/or README_1.0_to_2.0
+for a discussion of the differences between API 1.0 and API 2.*.
+
+***>> API 2.06 additional capabilities (beyond API 2.05):
+Routines to allow userd defined readers for structured data
+to deal with min, max, and stride within the reader itself
+instead of within EnSight.
+    USERD_get_structured_reader_cinching
+    USERD_set_block_range_and_stride
+
+
+***>> API 2.05 additional capabilities (beyond API 2.04):
+Routines to handle material species.
+    USERD_get_number_of_species
+    USERD_get_matsp_info
+
+Routines to handle variable extraction parameters after a read, and then
+update the variables accordingly.  Similar to the extra GUI capabilities
+(which are processed before a read).  (Can actually be added to pre-2.05 readers)
+    USERD_get_var_extract_gui_numbers
+    USERD_get_var_extract_gui_defaults
+    USERD_set_var_extract_gui_data
+
+Routines to obtain rigid body values from a reader.
+(Routines were added - EnSight is now using for Nastran and STL readers
+                       with Dynasty rigid body motion data file)
+    USERD_rigidbody_existence
+    USERD_rigidbody_values
+
+Routine that lets reader know when EnSight is getting the right side of a time
+interval for variable interpolation between steps.  Not generally needed for
+most readers - however, may be needed for those that implement rigid body, and
+wish to cache left and right timespan information for interpolation within the
+reader itself.  (Can actually be added to pre-2.05 readers)
+    USERD_set_right_side
+
+
+***>> API 2.04 additional capabilities (beyond API 2.03):
+Routines to handle failed elements.  Basically 
+a.One routine to return a flag indicating the existence of 
+  failed elements in at least one part in at least one 
+  timestep in the model.  
+b.A second routine to return a matrix of flags indexed by part and
+  element type indicating which parts and element types have failed
+  elements at the current time step.
+c.Finally a third routine to return an array of flags for a given
+  part and element type that is number of elements of that type long
+  indicating which elements have failed, and which have not failed.
+
+
+***>> API 2.03 additional capabilities (beyond API 2.01):
+1. Routines to handle materials
+2. Routines to handle nsided and nfaced elements
+3. Modified routine to handle structured ranges
+
+
+****************************************************************************
+Note: Only the the Ensight Gold example reader, has been moved to 
+      this 2.06 API level.  And it is purely for an example - it does not
+      actually provide a benefit.
+****************************************************************************
+
+
+The process for producing a user defined reader is:
+---------------------------------------------------
+1. Write code for all pertinent routines in the library (Unless someone else
+   has done this for you).
+
+        This is of course where the work is done by the user.  The word
+        "pertinent" is used because depending on the nature of the data, some
+        of the routines in the library may be dummy routines.
+
+        The source code for a dummy_gold library and for various other
+        working or sample libraries is copied from the installation CD during
+        installation.  These will be located in directories under:
+
+        $CEI_HOME/ensight76/user_defined_src/readers
+
+        examples:
+        --------
+        Basic dummy_gold routines provide skeleton for a new reader
+          $CEI_HOME/ensight76/user_defined_src/readers/dummy_gold
+
+        Sample library which reads unstructured binary EnSight Gold data
+          $CEI_HOME/ensight76/user_defined_src/readers/ensight_gold
+
+        You may find it useful to place your library source in this area as
+        well, but are not limited to this location.
+
+ * ===>	The descriptions of each library routine and the order that the
+        routines are called, which is provided in this file, along with
+        the example libraries, should make it possible for you to produce
+        code for your own data reader.	
+
+
+2. Produce the dynamic shared library.
+
+   This is a compiling and loading process which varies according to
+   the type of machine you are on.  In the user-defined-reader source
+   tree we have tried to isolate the machine dependent parts of the
+   build process using a set of files in the 'config' directory.  In this
+   directory there is a configuration file for each platform on which
+   EnSight is supported.  Before you can compile the installed readers
+   you should run the script called 'init' in the config directory.
+
+      i.e.  (for UNIX)
+            cd config
+            ./init sgi_6.5_n64
+            cd ..
+            make
+
+   If you are compiling for Windows NT, there are two options.  If you
+   have the Cygwin GNU utilities installed, you can use GNU make as for
+   Unix.  Otherwise, there is a script called makeall.cmd which will
+   build all of the readers using nmake.  The Makefiles in each reader
+   directory will work using either make or nmake.
+
+      i.e.  (WIN32 Cygwin)                 (using nmake)
+            cd config                      cd config
+            sh init win32                  cp win32 config
+            cd ..                          cd ..
+                                           mkdir lib
+            make                           makeall.cmd
+
+   If you have platform-specific portions of code in your reader, the
+   build system defines a set of flags which can be used within
+   #ifdef ... #endif regions in your source, as shown in the table
+   below.
+
+   Because the readers are now dynamically opened by EnSight, you may
+   have to include dependent libraries on your link-line to avoid having
+   unresolved symbols.  If you are having problems with a reader, start
+   ensight as "ensight7 -readerdbg" and you will get feedback on any
+   problems encountered in loading a reader.  If there are unresolved
+   symbols, you need to find the library which contains the missing
+   symbols and link it into your reader by adding it to the example
+   link commands below.
+
+   If you choose to use a different build environment for your reader,
+   you should take care to use compatible compilation flags to ensure
+   compatibilty with the EnSight executables, most notably on the SGI
+   and HP-UX 11.0 platforms, which should use the following flags:
+
+      sgi_6.2_o32: -mips2
+      sgi_6.2_n64: -mips4 -64
+      sgi_6.5_n32: -mips3
+      sgi_6.5_n64: -mips4 -64
+       hp_11.0_32: +DA2.0
+       hp_11.0_64: +DA2.0W
+
+    ______________________________________________________________________
+   | MACHINE | OS flag               |  SHARED LIBRARY NAME PRODUCED      |
+   |  TYPE   |------------------------------------------------------------|
+   |         |         LD COMMAND USED IN MAKEFILE                        |
+    ======================================================================
+    ______________________________________________________________________
+   | sgi     | -DSGI                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -shared -all -o libuserd-X.so libuserd-X.o              |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | hp      | -DHP                  |  libuserd-X.sl                     |
+   |         |------------------------------------------------------------|
+   |         | ld -b -o libuserd-X.sl libuserd-X.o                        |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | sun     | -DSUN                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -G -o libuserd-X.so libuserd-X.o                        |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | dec     | -DDEC                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -shared -all -o libuserd-X.so libuserd-X.o -lc          |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | linux   | -DLINUX               |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -shared -o libuserd-X.so libuserd-X.o -lc               |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | alpha   | -DALINUX              |  libuserd-X.so                     |
+   | linux   |------------------------------------------------------------|
+   |         | ld -shared -o libuserd-X.so libuserd-X.o -lc               |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | ibm     | -DIBM                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -G -o libuserd-X.so libuserd-X.o -bnoentry -bexpall -lc |
+    ----------------------------------------------------------------------
+
+   Once you have created your library, you should place it in a directory
+   of your choice or in the standard reader location:
+
+      $CEI_HOME/ensight76/machines/$CEI_ARCH/lib_readers
+
+   For example, if you created a reader for "mydata", you should create
+   the reader libuserd-mydata.so and place the file in your own reader
+   directory (see section 3 below) or in the standard location:
+
+      $CEI_HOME/ensight76/machines/$CEI_ARCH/lib_readers/libuserd-mydata.so
+
+
+3. By default EnSight will load all readers found in the directory:
+
+      $CEI_HOME/ensight76/machines/$CEI_ARCH/lib_readers
+
+   Files with names "libuserd-X.so" (where X is a name unique to the reader)
+   are assumed to be user-defined readers.
+
+   There are two methods which can be used to supplement the default
+   behavior.
+
+   (1) A feature which is useful for site-level or user-level configuration
+       is the optional environment variable $ENSIGHT7_READER.  This
+       variable directs EnSight to load all readers in the specified reader
+       directory (you should probably specify a full path) before loading
+       the built-in readers.  If the same reader exists in both directories
+       (as determined by the name returned by USERD_get_name_of_reader(),
+       NOT by the filename), the locally configured reader will take
+       precedence.
+
+   (2) A useful feature for end-users is the use of the libuserd-devel
+       reader.  EnSight will search for a reader named libuserd-devel.so
+       (.sl for HP or .dll for NT).  This reader can exist anywhere in the
+       library path (see below) of the user.  This is useful for an
+       individual actively developing a reader because the existence of a
+       libuserd-devel library will take precedence over any other library
+       which returns the same name from USERD_get_name_of_reader().
+
+   As an example, a site may install commonly used readers in a common
+   location, and users can set the ENSIGHT7_READER variable to access them:
+
+      setenv ENSIGHT7_READER /usr/local/lib/e7readers
+  
+   A user working on a new reader may compile the reader and place it in
+   a directory specified by the library path:
+
+      cp libuserd-myreader.so ~/lib/libuserd-devel.so
+      setenv <librarypath> ~/lib:$<librarypath>
+
+   The user is responsible for correctly configuring the library path
+   variable in order to make use of the libuserd-devel feature.  The
+   library environment variables used are:
+
+        Machine type    Environment variable to set
+        ------------    ---------------------------
+        sgi             LD_LIBRARY_PATH
+        dec             LD_LIBRARY_PATH
+        sun             LD_LIBRARY_PATH
+        linux           LD_LIBRARY_PATH
+        alpha linux     LD_LIBRARY_PATH
+        hp              SHLIB_PATH
+        ibm             LIBPATH
+
+As always, EnSight support is available if you need it.
+
+-------------------------------
+Quick Index of Library Routines
+-------------------------------
+
+Generally Needed for UNSTRUCTURED data
+--------------------------------------
+USERD_get_part_coords                 part's node coordinates
+USERD_get_part_node_ids               part's node ids
+USERD_get_part_elements_by_type       part's element connectivites
+USERD_get_part_element_ids_by_type    part's element ids
+
+
+Generally Needed for BLOCK data
+--------------------------------------
+USERD_get_block_coords_by_component   block coordinates
+USERD_get_block_iblanking             block iblanking values
+USERD_get_ghosts_in_block_flag        block ghost cell existence?
+USERD_get_block_ghost_flags           block ghost cell flags
+
+  These routines, which formerly were only for unstructured data, will now
+  also be called for structured data if you specify that ids will be given
+  in the USERD_get_node_label_status and USERD_get_element_label_status rotuines
+  ------------------------------------------------------------------------------ 
+  USERD_get_part_node_ids               part's node ids
+  USERD_get_part_element_ids_by_type    part's element ids
+
+
+Generally needed for either or both kinds of data
+-------------------------------------------------
+USERD_get_name_of_reader              name of reader for GUI
+USERD_get_reader_release              release string of reader
+USERD_get_reader_version              provide reader version number
+USERD_get_reader_descrip              provide GUI more description (optional)
+
+USERD_get_extra_gui_numbers           Gets the number of toggles, pulldowns and fields
+USERD_get_extra_gui_defaults          Gets the default values for the GUI members
+USERD_set_extra_gui_data              Returns the answers provided by the user
+
+USERD_set_filenames                   filenames entered in GUI
+USERD_set_server_number               server which of how many
+
+USERD_get_number_of_timesets          number of timesets
+USERD_get_timeset_description         description of timeset
+USERD_get_geom_timeset_number         timeset # to use for geom
+
+USERD_get_num_of_time_steps           number of time steps
+USERD_get_sol_times                   solution time values
+USERD_set_time_set_and_step           current timeset and time step
+
+USERD_get_changing_geometry_status    changing geometry?
+USERD_get_node_label_status           node labels?
+USERD_get_element_label_status        element labels?
+USERD_get_model_extents               provide model bounding extents
+USERD_get_number_of_files_in_dataset  number of files in model
+USERD_get_dataset_query_file_info     info about each model file
+USERD_get_descrip_lines               file associated description lines
+USERD_get_number_of_model_parts       number of model parts
+USERD_get_gold_part_build_info        Gets the info needed for part building process
+USERD_get_part_build_info             part/block type/descrip etc.
+USERD_get_maxsize_info                part/block allocation maximums
+USERD_get_ghosts_in_model_flag        model contains ghost cells?
+USERD_get_nsided_conn                 Gets the element connectivities for nsided
+                                        elements. (utilizes the number of nodes
+                                        per element obtained in
+                                        USERD_get_part_elements_by_type)
+USERD_get_nfaced_nodes_per_face       Gets the number of nodes per face for nfaced
+                                        elements (utilizes the number of faces
+                                        per element obtained in
+                                        USERD_get_part_elements_by_type)
+USERD_get_nfaced_conn                 Gets the element connectivities for nfaced
+                                        elements (utilizes the number of nodes
+                                        per face obtained in
+                                        USERD_get_nfaced_nodes_per_face)
+
+
+USERD_get_border_availability         part border provided?
+USERD_get_border_elements_by_type     part border conn and parent info
+
+USERD_get_number_of_variables         number of variables
+USERD_get_gold_variable_info          variable type/descrip etc.
+USERD_get_var_by_component            part or block variable values
+USERD_get_constant_val                constant variable's value
+USERD_get_var_value_at_specific       node's or element's variable value over time
+USERD_stop_part_building              cleanup after part build routine
+
+USERD_get_number_of_material_sets     Gets the number of material sets
+USERD_get_matf_set_info               Gets the material set indices and names
+USERD_get_number_of_materials         Gets the number of materials
+USERD_get_matf_var_info               Gets the material indices and descriptions
+USERD_size_matf_data                  Gets the length of either the
+                                        material ids list,
+                                        mixed-material ids list, or
+                                        mixed-material values list
+USERD_load_matf_data                  Gets the material ids list,
+                                        mixed-material ids list, or
+                                        mixed-material values list
+
+USERD_bkup                            archive routine
+
+USERD_exit_routine                    cleanup upon exit routine
+
+USERD_get_uns_failed_params           Gets thresholds/criteria for failure  
+
+USERD_rigidbody_existence             Returns whether rigid body transformation
+                                       data exists for the model.
+USERD_rigidbody_values                Returns the euler and location values for a
+                                       given part
+
+USERD_set_right_side                  Simply informs the reader when the time set
+                                      is for the right side of a time span during
+                                      variable interpolation between time steps.
+
+USERD_get_structured_reader_cinching  Tells if the reader will do structured
+                                        cinching
+USERD_set_block_range_and_stride      Sets the min, max, and stride of a block
+                                        if doing structured cinching
+
+
+-------------------------
+Order Routines are called
+-------------------------
+
+The various main operations are given basically in the order they will
+be performed.  Within each operation, the order the routines will be
+called is given.  
+
+1. Setting name in the gui, and specifying one or two input fields
+
+        USERD_get_name_of_reader
+        USERD_get_reader_descrip        (optional)
+        USERD_get_extra_gui_numbers     (optional)
+	USERD_get_extra_gui_defaults    (optional)
+
+2. Getting the reader version (also distinguishes between API's)
+
+        USERD_get_reader_version
+
+3. Setting filenames and getting timeset and time info
+
+        <USERD_set_extra_gui_data> (optional if reader has
+                                    USERD_get_extra_gui_defaults routine)
+        USERD_get_structured_reader_cinching
+        USERD_set_server_number
+	USERD_set_extra_gui_data        (optional)
+        USERD_set_filenames
+        USERD_get_number_of_timesets
+        USERD_get_geom_timeset_number
+
+        for each timeset:
+          USERD_get_timeset_description
+          USERD_get_num_of_time_steps
+          USERD_get_sol_times
+
+        USERD_set_time_set_and_step
+
+4. Gathering info for part builder
+
+        USERD_set_time_set_and_step
+        USERD_get_changing_geometry_status
+        USERD_get_node_label_status
+        USERD_get_element_label_status
+        USERD_get_number_of_files_in_dataset
+        USERD_get_dataset_query_file_info
+        USERD_get_descrip_lines                 (for geometry)
+        USERD_get_number_of_model_parts
+        USERD_get_gold_part_build_info
+        USERD_get_ghosts_in_model_flag
+        USERD_get_maxsize_info
+        USERD_get_get_ghosts_in_block_flag      (if any ghost cells in model)
+        USERD_get_model_extents     OR          (for model extents)
+             USERD_get_part_coords  AND/OR
+             <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+             USERD_get_block_coords_by_component
+
+5. Gathering Variable info
+
+        USERD_get_number_of_variables
+        USERD_get_gold_variable_info
+              
+6. Part building (per part created)
+
+        both unstructured and structured:
+        --------------------------------
+        USERD_set_time_set_and_step
+
+        if unstructured part:
+        --------------------
+        USERD_get_part_element_ids_by_type
+        USERD_get_part_elements_by_type
+
+        If any nsided elements:
+
+          USERD_get_nsided_conn
+
+        If any nfaced elements:
+
+          USERD_get_nfaced_nodes_per_face
+          USERD_get_nfaced_conn
+
+        USERD_get_part_coords
+        USERD_get_part_node_ids
+
+        else if structured part:
+        -----------------------
+        USERD_get_block_iblanking
+        <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+        USERD_get_block_coords_by_component
+        USERD_get_block_ghost_flags          (If ghost cells in part)
+        USERD_get_part_node_ids              (If node ids given)
+        USERD_get_part_element_ids_by_type   (If element ids given)
+
+        both again:
+        ----------
+        USERD_get_border_availability        (If border representation
+        USERD_get_border_elements_by_type     is selected)
+
+        USERD_stop_part_building      (only once when part builder
+                                       dialog is closed)
+
+7. Loading Variables
+          
+        constants:
+        ---------
+        USERD_set_time_set_and_step
+        USERD_get_constant_val
+          
+        scalars/vectors/tensors:
+        ------------------------
+        USERD_get_descrip_lines
+        USERD_set_time_set_and_step
+         <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+        USERD_get_var_by_component
+
+8. Changing geometry
+
+        changing coords only (per part):
+        --------------------
+        USERD_set_time_set_and_step
+        USERD_get_descrip_lines
+        USERD_get_part_coords
+        <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+        USERD_get_block_coords_by_component
+
+        changing connectivity (per part):
+        ---------------------
+        USERD_set_time_set_and_step
+        USERD_get_descrip_lines
+        USERD_get_number_of_model_parts
+        USERD_get_gold_part_build_info
+        USERD_get_ghosts_in_model_flag
+        USERD_get_get_ghosts_in_block_flag      (if any ghost cells in model)
+        USERD_get_model_extents   OR
+           USERD_get_part_coords  AND/OR
+           <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+           USERD_get_block_coords_by_component
+        USERD_get_part_element_ids_by_type
+        USERD_get_part_elements_by_type
+        USERD_get_part_coords
+        USERD_get_part_node_ids
+        USERD_get_block_iblanking
+        <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+        USERD_get_block_coords_by_component
+        USERD_get_block_ghost_flags          (If ghost cells in part)
+        USERD_get_part_node_ids              (If node ids given)
+        USERD_get_part_element_ids_by_type   (If element ids given)
+
+        USERD_get_border_availability        (If border representation
+        USERD_get_border_elements_by_type     is selected)
+
+  
+9. Node or Element queries over time
+
+        USERD_get_var_value_at_specific
+
+10. To see if materials in the model
+
+        USERD_get_number_of_material_sets
+        USERD_get_matf_set_info
+
+        If any material sets in the model (calls these once per material set):
+          USERD_get_number_of_materials
+          USERD_get_matf_var_info
+
+        For each elment type of each part containing material ids, calls:
+          USERD_size_matf_data
+          USERD_load_matf_data
+
+        If there are any elements with mixed materials, when a domain or
+        interface is created, calls these again per part:
+
+          USERD_size_matf_data
+          USERD_load_matf_data
+
+11. To modify the variable extraction parameters and have the variables
+    update accordingly.
+
+        USERD_get_var_extract_gui_numbers
+        USERD_get_var_extract_gui_defaults
+        USERD_set_var_extract_gui_data
+
+
+
+-----------------------
+Detailed Specifications
+-----------------------
+
+Include files:
+--------------
+The following header file is required in any file containing these library
+routines. 
+
+       #include "global_extern.h"
+
+And it references:
+
+       #include "global_extern_proto.h"
+
+
+
+*******************************************************************************
+****************************** Special Note ***********************************
+*******************************************************************************
+
+Make sure you use the proper define in the global_extern.h header file, namely:
+#define USERD_API_204
+
+Also, Make sure the api version in the USERD_get_reader_version routine is set
+to "2.04" or larger.
+
+Make sure your reader has access to the global_extern_proto.h   This is a new
+file which is accessed from the new global_extern.h
+
+*******************************************************************************
+*******************************************************************************
+
+
+Basis of arrays:
+---------------
+Unless explicitly stated otherwise, all arrays are zero based - in true C
+fashion.
+
+
+Global variables:
+----------------
+You will generally need to have a few global variables which are shared by
+the various library routines. The detailed specifications below have assumed
+the following are available.  (Their names describe their purpose, and they
+will be used in helping describe the details of the routines below).
+
+static int Numparts_available         = 0;
+static int Num_unstructured_parts     = 0;
+static int Num_structured_blocks      = 0;
+
+/* Note: Numparts_available = Num_unstructured_parts + Num_structured_blocks */
+
+static int Num_timesets               = 1;
+static int Current_timeset            = 1;
+static int Geom_timeset_number        = 1;
+
+static int Num_time_steps[Z_MAXSETS]  = 1;
+static int Current_time_step          = 0;
+static int Num_variables              = 0;
+static int Num_dataset_files          = 0;
+
+static int Server_Number              = 1;    Which server of
+static int Tot_Servers                = 1;    the total number of servers
+
+
+
+_________________________________________
+-----------------------------------------
+Library Routines (in alphabetical order):
+_________________________________________
+-----------------------------------------
+
+--------------------------------------------------------------------
+USERD_bkup
+
+   Description:
+   -----------
+   This routine is called during the EnSight archive process.  You can
+   use it to save or restore info relating to your user defined reader.
+
+   Specification:
+   -------------
+   int USERD_bkup(FILE *archive_file,
+                  int backup_type)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  archive_file         = The archive file pointer
+
+   (IN)  backup_type          = Z_SAVE_ARCHIVE for saving archive
+                                Z_REST_ARCHIVE for restoring archive
+
+   Notes:
+   -----
+   * Since EnSight's archive file is saved in binary form, you should
+     also do any writing to it or reading from it in binary.
+
+   * You should archive any variables, which will be needed for
+     future operations, that will not be read or computed again
+     before they will be needed.  These are typically global
+     variables.
+
+   * Make sure that the number of bytes that you write on a save and
+     the number of bytes that you read on a restore are identical!!
+
+   * If any of the variables you save are allocated arrays, you must
+     do the allocations before restoring into them.
+
+--------------------------------------------------------------------
+USERD_exit_routine
+
+   Description:
+   -----------
+   This routine is called as EnSight is exiting. It can be used to clean
+   up anything needed - such as removing temporary files, etc. - or can simply
+   be a dummy.
+
+   Specification:
+   -------------
+   void USERD_exit_routine( void )
+
+   Arguments:
+   ---------
+   none
+
+--------------------------------------------------------------------
+USERD_get_block_coords_by_component
+
+   Description:
+   -----------
+   Get the coordinates of a given structured block, a component at a time.
+
+   Specification:
+   -------------
+   int USERD_get_block_coords_by_component(int block_number,
+                                           int which_component,
+                                           float *coord_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  block_number            = The block part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  which_component         = Z_COMPX if x component wanted
+                                 = Z_COMPY if y component wanted
+                                 = Z_COMPZ if z component wanted
+
+   (OUT) coord_array             = 1D array containing x,y, or z
+                                   coordinate component of each node
+
+                                  (Array will have been allocated
+                                   i*j*k for the block long)
+
+   Notes:
+   -----
+   * Not called unless Num_structured_blocks is > 0
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_block_iblanking
+
+   Description:
+   -----------
+   Get the iblanking value at each node of a block (if the block is
+   iblanked).
+
+   Specification:
+   -------------
+   int USERD_get_block_iblanking(int block_number,
+                                 int *iblank_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  block_number            = The block part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) iblank_array            = 1D array containing iblank value
+                                   for each node.
+
+                                  (Array will have been allocated
+                                   i*j*k for the block long)
+
+          possible values are:   Z_EXT     = exterior
+                                 Z_INT     = interior
+                                 Z_BND     = boundary
+                                 Z_INTBND  = internal boundary
+                                 Z_SYM     = symmetry plane
+
+   Notes:
+   -----
+   * Not called unless Num_structured_blocks is > 0  and you have
+     some iblanked blocks
+
+   * Will be based on Current_time_step
+
+
+
+----------------------------------------------------------------------
+USERD_get_block_ghost_flags
+
+   Description:
+   -----------
+   Get the ghost_flags value at each element of a block containing ghost cells.
+
+   Specification:
+   -------------
+   int USERD_get_block_ghost_flags(int block_number,
+                                   int *ghost_flags)
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  block_number            = The block number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) ghost_flags             = 1D array containing ghost flag value
+                                     for each block cell.
+  
+                                    (Array will have been allocated
+                                     (i-1)*(j-1)*(k-1) for the block long)
+  
+            possible values are:    0  = non-ghost cell  (normal cell)
+                                   >0  = ghost cell
+  
+    Notes:
+    -----
+    * This routine is new in the 2.01 API
+
+    * This will be based on Current_time_step
+  
+    * Only called for structured "block" parts that have some ghost cells
+      as indicated by the USERD_get_ghost_in_block_flag.  The model must
+      of course also have been indicated to have some ghost cells in the
+      USERD_get_ghost_in_model_flag routine.
+  
+    * It is sufficient to set the value to be 1 to flag as a ghost cell,
+      but the value can be any non-zero value, so you could use it to
+      indicate which block or which server (for Server-of-server use) the
+      cell is actually in.
+
+
+
+--------------------------------------------------------------------
+USERD_get_border_availability
+
+   Description:
+   -----------
+   Finds out if border elements are provided by the reader for the
+   desired part, or will need to be computed internally by EnSight.
+
+   Specification:
+   -------------
+   int USERD_get_border_availability(int part_number,
+                                     int number_of_elements[Z_MAXTYPE])
+
+   Returns:
+   -------
+   Z_OK  if border elements will be provided by the reader.
+          (number_of_elements array will be loaded and
+           USERD_get_border_elements_by_type will be called)
+
+   Z_ERR if border elements are not available - thus EnSight must compute.
+          (USERD_get_border_elements_by_type will not be called)
+
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) number_of_elements     = 2D array containing number of
+                                  each type of border element in
+                                  the part.
+                                  ------------
+                                  Possible types are:
+
+                                Z_POINT   =  point
+                                Z_BAR02   =  2-noded bar
+                                Z_BAR03   =  3-noded bar
+                                Z_TRI03   =  3-noded triangle
+                                Z_TRI06   =  6-noded triangle
+                                Z_QUA04   =  4-noded quadrilateral
+                                Z_QUA08   =  8-noded quadrilateral
+
+   Notes:
+   -----
+   * Only called if border representation is used.
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_border_elements_by_type
+
+   Description:
+   -----------
+   Provides border element connectivity and parent information. 
+
+   Specification:
+   -------------
+   int USERD_get_border_elements_by_type(int part_number,
+                                         int element_type,
+                                         int **conn_array,
+                                         short *parent_element_type,
+                                         int *parent_element_num)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number           = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  element_type          = One of the following (See global_extern.h)
+                                 Z_POINT    node point element
+                                 Z_BAR02    2 node bar
+                                 Z_BAR03    3 node bar
+                                 Z_TRI03    3 node triangle
+                                 Z_TRI06    6 node triangle
+                                 Z_QUA04    4 node quad
+                                 Z_QUA08    8 node quad
+
+   (OUT) conn_array            = 2D array containing connectivity
+                                 of each border element of the type.
+
+                                (Array will have been allocated
+                                 num_of_elements of the type by
+                                 connectivity length of the type)
+
+                       ex) If number_of_elements[Z_TRI03] = 25
+                              number_of_elements[Z_QUA04] = 100
+                              number_of_elements[Z_QUA08] = 30
+                           as obtained in:
+                            USERD_get_border_availability
+
+                           Then the allocated dimensions available
+                           for this routine will be:
+                              conn_array[25][3]   when called with Z_TRI03
+
+                              conn_array[100][4]  when called with Z_QUA04
+
+                              conn_array[30][8]   when called with Z_QUA08
+
+   (OUT) parent_element_type   = 1D array containing element type of the
+                                 parent element (the one that the border
+                                 element is a face/edge of).
+
+                                (Array will have been allocated
+                                 num_of_elements of the type long)
+
+   (OUT) parent_element_num   = 1D array containing element number of the
+                                 parent element (the one that the border
+                                 element is a face/edge of).
+
+                                (Array will have been allocated
+                                 num_of_elements of the type long)
+
+   
+   Notes:
+   -----
+   * Not called unless USERD_get_border_availability returned Z_OK
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_changing_geometry_status
+
+   Description:
+   -----------
+   Gets the changing geometry status for the model
+
+   Specification:
+   -------------
+   int USERD_get_changing_geometry_status( void )
+
+   Returns:
+   -------
+   Z_STATIC        if geometry does not change
+   Z_CHANGE_COORDS if changing coordinates only
+   Z_CHANGE_CONN   if changing connectivity
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * EnSight does not support changing number of parts.  But the
+     coords and/or the connectivity of the parts can change.  Note that
+     a part is allowed to be empty (number of nodes and elements equal
+     to zero).
+
+
+--------------------------------------------------------------------
+USERD_get_constant_val
+
+   Description:
+   -----------
+   Get the value of a constant at a time step
+
+   Specification:
+   -------------
+   float USERD_get_constant_value(int which_var,
+                                  int imag_data)
+
+   Returns:
+   -------
+   Value of the requested constant variable
+
+   Arguments:
+   ---------
+   (IN)  which_var            = The variable number
+
+   (IN)  imag_data            = TRUE if want imaginary data value.
+                                FALSE if want real data value.
+
+   Notes:
+   -----
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_dataset_query_file_info
+
+   Description:
+   -----------
+   Get the information about files in the dataset.  Used for the
+   dataset query option within EnSight.
+
+   Specification:
+   -------------
+   int USERD_get_dataset_query_file_info(Z_QFILES *qfiles)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) qfiles   = Structure containing information about each file
+                    of the dataset. The Z_QFILES structure is defined
+                    in the global_extern.h file
+
+                   (The structure will have been allocated
+                    Num_dataset_files long, with 10 description
+                    lines per file).
+
+      qfiles[].name        = The name of the file
+                             (Z_MAXFILENP is the dimensioned length
+                              of the name)
+
+      qfiles[].sizeb       = The number of bytes in the file
+                             (Typically obtained with a call to the
+                              "stat" system routine) (Is a long)
+
+      qfiles[].timemod     = The time the file was last modified 
+                             (Z_MAXTIMLEN is the dimensioned length
+                              of this string)
+                             (Typically obtained with a call to the
+                              "stat" system routine)
+
+      qfiles[].num_d_lines = The number of description lines you
+                              are providing from the file. Max = 10
+
+      qfiles[].f_desc[]    = The description line(s) per file,
+                              qfiles[].num_d_lines of them
+                              (Z_MAXFILENP is the allocated length of
+                               each line)
+
+   Notes:
+   -----
+   * If Num_dataset_files is 0, this routine will not be called.
+     (See USERD_get_number_of_files_in_dataset)
+
+
+--------------------------------------------------------------------
+USERD_get_descrip_lines
+
+   Description:
+   -----------
+   Get two description lines associated with geometry per time step,
+   or one description line associated with a variable per time step.
+
+   Specification:
+   -------------
+   int USERD_get_descrip_lines(int which_type,
+                               int which_var,
+                               int imag_data,
+                               char line1[Z_BUFL],
+                               char line2[Z_BUFL])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  which_type           = Z_GEOM for geometry (2 lines)
+                              = Z_VARI for variable (1 line)
+
+   (IN)  which_var            = If it is a variable, which one.
+                                Ignored if geometry type.
+
+   (IN)  imag_data            = TRUE if want imaginary data file.
+                                FALSE if want real data file.
+
+   (OUT) line1                = The 1st geometry description line,
+                                or the variable description line.
+
+   (OUT) line2                = The 2nd geometry description line
+                                Not used if variable type.
+
+   Notes:
+   -----
+   * Will be based on Current_time_step
+
+   * These are the lines EnSight can echo to the screen in
+     annotation mode.
+
+
+
+--------------------------------------------------------------------
+USERD_get_element_label_status
+
+   Description:
+   -----------
+   Answers the question as to whether element labels will be provided.
+
+   Specification:
+   -------------
+   int USERD_get_element_label_status( void )
+
+   Returns:
+   -------
+   TRUE        if element labels will be provided
+   FALSE       if element labels will NOT be provided
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * element lables are needed in order to do any element querying, or
+     element labeling on-screen within EnSight.
+
+   * Prior to API 2.01:
+     -----------------
+       For unstructured parts, you can read them from your file if
+       available, or can assign them, etc. They need to be unique
+       per part, and are often unique per model.
+
+       API 1.0:
+         USERD_get_element_ids_for_part is used to obtain the ids,
+         on a part by part basis, if TRUE status is returned here.
+
+       API 2.0:
+         USERD_get_part_element_ids_by_type is used to obtain the ids,
+         on a per part, per type basis, if TRUE status is returned here.
+
+       For structured parts, EnSight will assign ids if you return a
+         status of TRUE here.  You cannot assign them youself!!
+
+   * Starting at API 2.01:
+     --------------------
+       For both unstructured and structured parts, you can read them
+       from your file if available, or can assign them, etc. They need
+       to be unique per part, and are often unique per model (especially
+       if you are dealing with a decomposed dataset).
+
+       USERD_get_part_element_ids_by_type is used to obtain the ids,
+       on an element type by part basis, if TRUE status is returned here.
+
+   * Will call USERD_get_part_element_ids_by_type for each type of
+     of each part if this routine returns TRUE.
+--------------------------------------------------------------------
+USERD_get_geom_timeset_number -
+
+   Description:
+   -----------
+    Gets the timeset number to be used for geometry
+
+   Specification:
+   -------------
+   int USERD_get_geom_timeset_number( void )
+
+   Returns:
+   -------
+   Geom_timeset_number = The timeset number that will be used for geometry.   
+                         For example, if USERD_get_number_of timesets
+                         returns 2, the valid timeset numbers would be
+                         1 or 2.
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   *  If your model is static, which you indicated by returning a zero
+      in USERD_get_number_of_timesets, you can return a zero here as well.
+
+
+
+--------------------------------------------------------------------
+USERD_get_gold_part_build_info
+
+   Description:
+   -----------
+   Gets the info needed for the part building process.
+
+   Specification:
+   -------------
+   int USERD_get_gold_part_build_info(int *part_id,
+                                      int *part_types,
+                                      char *part_description[Z_BUFL],
+                                      int *number_of_nodes,
+                                      int *number_of_elements[Z_MAXTYPE],
+                                      int *ijk_dimensions[9],
+                                      int *iblanking_options[6])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+    (OUT) part_id                = Array containing the external part
+                                   ids for each of the model parts.
+
+                                   IMPORTANT:
+                                    Parts numbers must be >= 1, because
+                                    of the way they are used in the GUI
+
+               *******************************************
+                The ids provided here are the numbers by
+                which the parts will be referred to in the
+                GUI (if possible). They are basically
+                labels as far as you are concerned.
+
+                Note: The part numbers you pass to routines
+                which receive a part_number or block_number
+                or which_part as an argument are the 1-based
+                table index of the parts!
+
+                example:  If Numparts_available = 3
+
+                          Table index        part_id
+                          -----------        -------
+                           1                  13
+                           2                  57
+                           3                  125
+
+                           ^                   ^
+                           |                   |
+                           |                    These are placed in:
+                           |                      part_id[0] = 13
+                           |                      part_id[1] = 57
+                           |                      part_id[2] = 125
+                           |                    for GUI labeling purposes.
+                           |
+                            These implied table indices are the part_number,
+                            block_number, or which_part numbers that you would
+                            pass to routines like:
+
+                           USERD_get_part_coords(int part_number,...
+                           USERD_get_part_node_ids(int part_number,...
+                           USERD_get_part_elements_by_type(int part_number,...
+                           USERD_get_part_element_ids_by_type(int part_number,...
+                           USERD_get_block_coords_by_component(int block_number,...
+                           USERD_get_block_iblanking(int block_number,...
+                           USERD_get_block_ghost_flags(int block_number,...
+                           USERD_get_ghosts_in_block_flag(int block_number)
+                           USERD_get_border_availability(int part_number,...
+                           USERD_get_border_elements_by_type(int part_number,...
+                           USERD_get_var_by_component(int which_variable,
+                                                      int which_part,...
+                           USERD_get_var_value_at_specific(int which_var,
+                                                           int which_node_or_elem,
+                                                           int which_part,...
+               ********************************************
+
+                                    (Array will have been allocated
+                                     Numparts_available long)
+
+   (OUT) part_types             = Array containing one of the
+                                  following for each model part:
+
+                                       Z_UNSTRUCTURED or
+                                       Z_STRUCTURED  or
+                                       Z_IBLANKED
+
+                                  (Array will have been allocated
+                                   Numparts_available long)
+
+   (OUT) part_description       = Array containing a description
+                                  for each of the model parts
+
+                                  (Array will have been allocated
+                                   Numparts_available by Z_BUFL
+                                   long)
+
+   (OUT) number_of_nodes        = Number of unstructured nodes in the part
+ 
+                                   (Array will have been allocated
+                                    Numparts_available long)
+
+   (OUT) number_of_elements     = 2D array containing number of
+                                  each type of element for each
+                                  unstructured model part.
+                                  ------------
+                                  Possible types are:
+
+                                Z_POINT   =  point
+                                Z_BAR02   =  2-noded bar
+                                Z_BAR03   =  3-noded bar
+                                Z_TRI03   =  3-noded triangle
+                                Z_TRI06   =  6-noded triangle
+                                Z_QUA04   =  4-noded quadrilateral
+                                Z_QUA08   =  8-noded quadrilateral
+                                Z_TET04   =  4-noded tetrahedron
+                                Z_TET10   = 10-noded tetrahedron
+                                Z_PYR05   =  5-noded pyramid
+                                Z_PYR13   = 13-noded pyramid
+                                Z_PEN06   =  6-noded pentahedron
+                                Z_PEN15   = 15-noded pentahedron
+                                Z_HEX08   =  8-noded hexahedron
+                                Z_HEX20   = 20-noded hexahedron
+
+                                Z_G_POINT =  ghost node point element
+                                Z_G_BAR02 =  2 node ghost bar
+                                Z_G_BAR03 =  3 node ghost bar
+                                Z_G_TRI03 =  3 node ghost triangle
+                                Z_G_TRI06 =  6 node ghost triangle
+                                Z_G_QUA04 =  4 node ghost quad
+                                Z_G_QUA08 =  8 node ghost quad
+                                Z_G_TET04 =  4 node ghost tetrahedron
+                                Z_G_TET10 = 10 node ghost tetrahedron
+                                Z_G_PYR05 =  5 node ghost pyramid
+                                Z_G_PYR13 = 13 node ghost pyramid
+                                Z_G_PEN06 =  6 node ghost pentahedron
+                                Z_G_PEN15 = 15 node ghost pentahedron
+                                Z_G_HEX08 =  8 node ghost hexahedron
+                                Z_G_HEX20 = 20 node ghost hexahedron
+
+                               (Ignored unless Z_UNSTRUCTURED type)
+
+                                  (Array will have been allocated
+                                   Numparts_available by
+                                   Z_MAXTYPE long)
+
+   (OUT) ijk_dimensions         = 2D array containing ijk dimension info
+                                  for structured blocks
+
+                                  For Z_UNSTRUCTURED - is ignored
+
+                                  For Z_STRUCTURED or Z_IBLANKED
+
+        Prior to version 2.03:
+        ----------------------
+                                   (Array will have been allocated
+                                    Numparts_available by 3 long)
+
+                              ijk_dimensions[][0] = I dimension
+                              ijk_dimensions[][1] = J dimension
+                              ijk_dimensions[][2] = K dimension
+
+
+        Starting at version 2.03:
+        ------------------------
+                                   (Array will have been allocated
+                                    Numparts_available by 9 long)
+
+                              There are two ways to do this:
+                              ------------------------------
+                              1. The simple one, without ranges.
+
+                                   This is good for all structured models
+                                   that will NOT be used in EnSight's
+                                   Server of Servers
+
+                                   Simply provide the ijk dimensions in the
+                                   first three slots and place a -1 in
+                                   the 4th slot.  (The remaining slots will
+                                   be ignored).
+
+                              Thus,
+                              ijk_dimensions[][0] = I dimension of block
+                              ijk_dimensions[][1] = J dimension of block
+                              ijk_dimensions[][2] = K dimension of block
+                              ijk_dimensions[][3] = -1
+
+                        (J planes)
+                            4 *-------*-------*
+                              |       |       |    ijk_dimension[0][0] = 3
+                              |       |       |    ijk_dimension[0][1] = 4
+                              |       |       |    ijk_dimension[0][2] = 1
+                            3 *-------*-------*
+                              |       |       |    ijk_dimension[0][4] = -1
+                              |       |       |
+                              |       |       |
+                            2 *-------*-------*
+                              |       |       |
+                              |       |       |
+                              |       |       |
+                            1 *-------*-------*
+                              1       2       3  (I planes)
+
+
+
+                              2. Using ranges.
+
+                                  This one can be used anytime, but MUST
+                                  be used if EnSight's Server of Servers
+                                  is to be used!
+
+                                  The first 3 slots contain the ijk dimension
+                                  of the complete block (of which this may be
+                                  a portion).  The last 6 slots contain the
+                                  ijk min and max ranges within the complete.
+
+                              Thus,
+                              ijk_dimensions[][0] = I dim of complete block
+                              ijk_dimensions[][1] = J dim of complete block
+                              ijk_dimensions[][2] = K dim of complete block
+
+                              ijk_dimensions[][3] = Imin of portion (1-based)
+                              ijk_dimensions[][4] = Imax of portion (1-based)
+                              ijk_dimensions[][5] = Jmin of portion (1-based)
+                              ijk_dimensions[][6] = Jmax of portion (1-based)
+                              ijk_dimensions[][7] = Kmin of portion (1-based)
+                              ijk_dimensions[][8] = Kmax of portion (1-based)
+
+
+                              example1: (Model has one part, a simple 2D block,
+                                         and want whole thing)
+
+                        (J planes)
+                            4 *-------*-------*
+                              |       |       |    ijk_dimension[0][0] = 3
+                              |       |       |    ijk_dimension[0][1] = 4
+                              |       |       |    ijk_dimension[0][2] = 1
+                            3 *-------*-------*
+                              |       |       |    ijk_dimension[0][3] = 1
+                              |       |       |    ijk_dimension[0][4] = 3
+                              |       |       |    ijk_dimension[0][5] = 1
+                            2 *-------*-------*    ijk_dimension[0][6] = 4
+                              |       |       |    ijk_dimension[0][7] = 1
+                              |       |       |    ijk_dimension[0][8] = 1
+                              |       |       |
+                            1 *-------*-------*
+                              1       2       3  (I planes)
+
+
+                              example2: (Want to have the block represented
+                                         in two portions - 2 parts)
+
+                        (J planes)                 top portion
+                            4 *-------*-------*
+                              |       |       |    ijk_dimension[0][0] = 3
+                              |       |       |    ijk_dimension[0][1] = 4
+                              |       |       |    ijk_dimension[0][2] = 1
+                            3 *-------*-------*
+                              .       .       .    ijk_dimension[0][3] = 1
+                              .       .       .    ijk_dimension[0][4] = 3
+                              .       .       .    ijk_dimension[0][5] = 3
+                            2 .................    ijk_dimension[0][6] = 4
+                              .       .       .    ijk_dimension[0][7] = 1
+                              .       .       .    ijk_dimension[0][8] = 1
+                              .       .       .
+                            1 .................
+                              1       2       3  (I planes)
+
+
+                        (J planes)                 bottom portion
+                            4 .................
+                              .       .       .    ijk_dimension[1][0] = 3
+                              .       .       .    ijk_dimension[2][1] = 4
+                              .       .       .    ijk_dimension[3][2] = 1
+                            3 *-------*-------*
+                              |       |       |    ijk_dimension[1][3] = 1
+                              |       |       |    ijk_dimension[1][4] = 3
+                              |       |       |    ijk_dimension[1][5] = 1
+                            2 *-------*-------*    ijk_dimension[1][6] = 3
+                              |       |       |    ijk_dimension[1][7] = 1
+                              |       |       |    ijk_dimension[1][8] = 1
+                              |       |       |
+                            1 *-------*-------*
+                              1       2       3  (I planes)
+
+
+        And note that if you were partioning this block for
+        EnSight's Server of Servers, you would only have one part,
+        instead of two.  Each SOS server would return its appropriate
+        ranges in the last 6 slots. The first 3 slots would remain constant.
+
+
+   (OUT) iblanking_options      = 2D array containing iblanking
+                                  options possible for each
+                                  structured model part.
+                                  ----------
+                                  (Ignored unless Z_IBLANKED type)
+
+                                  (Array will have been allocated
+                                   Numparts_available by 6 long)
+
+      iblanking_options[][Z_EXT]     = TRUE if external (outside)
+                       [][Z_INT]     = TRUE if internal (inside)
+                       [][Z_BND]     = TRUE if boundary
+                       [][Z_INTBND]  = TRUE if internal boundary
+                       [][Z_SYM]     = TRUE if symmetry surface
+
+
+   Notes:
+   -----
+   * If you haven't built a table of pointers to the different parts,
+     you might want to do so here as you gather the needed info.
+
+   * Will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_gold_variable_info
+
+   Description:
+   -----------
+   Get the variable descriptions, types and filenames
+
+   Specification:
+   -------------
+   int USERD_get_gold_variable_info(char **var_description,
+                                    char **var_filename,
+                                    int *var_type,
+                                    int *var_classify,
+                                    int *var_complex,
+                                    char **var_ifilename,
+                                    float *var_freq,
+                                    int *var_contran,
+                                    int *var_timeset)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) var_description      = Variable descriptions
+
+                                (Array will have been allocated
+                                 Num_variables by Z_BUFL long)
+
+           variable description restrictions:
+           ----------------------------------
+           1. Only first 19 characters used in EnSight.
+           2. Leading and trailing whitespace will be removed by EnSight.
+           3. Illegal characters will be replaced by underscores.
+           4. Thay may not start with a numeric digit.
+           4. No two variables may have the same description.
+
+
+   (OUT) var_filename         = Variable real filenames
+
+                                (Array will have been allocated
+                                 Num_variables by Z_BUFL long)
+
+   (OUT) var_type             = Variable type
+
+                                (Array will have been allocated
+                                 Num_variables long)
+
+                                types are:  Z_CONSTANT
+                                            Z_SCALAR
+                                            Z_VECTOR
+                                            Z_TENSOR
+                                            Z_TENSOR9
+
+   (OUT) var_classify         = Variable classification
+
+                                (Array will have been allocated
+                                 Num_variables long)
+
+                                types are:  Z_PER_NODE
+                                            Z_PER_ELEM
+
+   (OUT) var_complex          = TRUE if complex, FALSE otherwise
+ 
+                                (Array will have been allocated
+                                 Num_variables long)
+ 
+   (OUT) var_ifilename        = Variable imaginary filenames (if complex)
+ 
+                                (Array will have been allocated
+                                 Num_variables by Z_BUFL long)
+
+   (OUT) var_freq             = complex frequency  (if complex)
+ 
+                                (Array will have been allocated
+                                 Num_variables long)
+ 
+   (OUT) var_contran          = TRUE if constant changes per time step
+                                FALSE if constant truly same at all time steps
+ 
+                                (Array will have been allocated
+                                 Num_variables long)
+
+   (OUT) var_timeset          = Timeset the variable will use (1 based).
+                                (For static models, set it to 1)
+
+                                (Array will have been allocated
+                                 Num_variables long)
+
+                                 For example:  If USERD_get_number_of_timesets
+                                               returns 2, the valid
+                                               timeset_number's would be 1 or 2
+
+
+   Notes:
+   -----
+   * The implied variable numbers apply, but be aware that the
+     arrays are zero based.
+     So for variable 1, will need to provide   var_description[0]
+                                               var_filename[0]
+                                               var_type[0]
+                                               var_classify[0]
+                                               var_complex[0]
+                                               var_ifilename[0]
+                                               var_freq[0]
+                                               var_contran[0]
+                                               var_timeset[0]
+
+
+        for variable 2, will need to provide   var_description[1]
+                                               var_filename[1]
+                                               var_type[1]
+                                               var_classify[1]
+                                               var_complex[1]
+                                               var_ifilename[1]
+                                               var_freq[1]
+                                               var_contran[1]
+                                               var_timeset[1]
+              etc.
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_ghosts_in_block_flag
+
+   Description:
+   -----------
+   Gets whether ghost cells present in block or not
+
+   Specification:
+   -------------
+  int USERD_get_ghosts_in_block_flag(int block_number)
+
+   Returns:
+   -------
+   TRUE  if any ghost cells in this structured part
+   FALSE if no ghost cells in this structured part
+
+   Arguments:
+   ---------
+   (IN) block_number      = The block part number
+                              (1-based index of part table, namely:
+
+                                1 ... Numparts_available.
+
+                              It is NOT the part_id that
+                              is loaded in USERD_get_gold_part_build_info)
+
+   Notes:
+   -----
+    * This routine is new in the 2.01 API
+    * This will be based on Current_time_step
+  
+    * Intended for structured parts only, value will be ignored for
+      unstructured parts
+
+
+
+--------------------------------------------------------------------
+USERD_get_ghosts_in_model_flag
+
+   Description:
+   -----------
+   Answers the question as to whether any ghost cells in the model.
+
+   Specification:
+   -------------
+  int USERD_get_ghosts_in_model_flag( void )
+
+   Returns:
+   -------
+   TRUE  if any ghost cells in the model
+   FALSE if no ghost cells in the model
+
+   Arguments:
+   ---------
+  
+   Notes:
+   -----
+    * This routine is new in the 2.01 API
+
+-------------------------------------------------------------------------
+USERD_get_matf_set_info
+
+   Description:
+   -----------
+   Get the material set ids and names
+
+   Specification:
+   -------------
+   int USERD_get_matf_set_info(int *mat_set_ids,
+                               char **mat_set_name)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) mat_set_ids  = 1D material set ids array
+
+                               (Array will have been allocated
+                                Num_material_sets long)
+
+   (OUT) mat_set_name = 2D material set name array
+
+                               (Array will have been allocated
+                                Num_material_sets by Z_BUFL long)
+
+   Notes:
+   -----
+   * Will not be called if Num_material_sets is zero
+   * See USERD_get_number_of_material_sets header for explanatory example
+
+
+--------------------------------------------------------------------
+USERD_get_matf_var_info
+
+   Description:
+   -----------
+   Gets the material ids and descriptions for the material set
+
+   Specification:
+   -------------
+   int USERD_get_matf_var_info(int set_index,
+                               int *mat_ids,
+                               char **mat_desc)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  set_index               = the material set index (zero based)
+
+   (OUT) mat_ids[set_index]      = 1D integer array containing the material
+                                   ids to associated with each material
+
+                                    (Array will have been allocated
+                                     Num_materials[set_index] long)
+
+   (OUT) mat_desc[set_index]     = 2D char array containing the material
+                                   descriptions to associated with each material
+
+                                    (Array will have been allocated
+                                     Num_materials[set_index] by Z_BUFL long)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero, or
+     Num_materials[set_index] is zero
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_maxsize_info
+
+   Description:
+   -----------
+   Gets maximum part sizes for efficient memory allocation.
+
+   Transient models (especially those that increase in size) can cause
+   reallocations, at time step changes, to keep chewing up more and
+   more memory.   The way to avoid this is to know what the maximum
+   size of such memory will be, and allocate for this maximum initially.
+
+   Accordingly, if you choose to provide this information (it is optional),
+   EnSight will take advantage of it.
+
+
+   Specification:
+   -------------
+   int USERD_get_maxsize_info(int *max_number_of_nodes,
+                              int *max_number_of_elements[Z_MAXTYPE],
+                              int *max_ijk_dimensions[3])
+
+   Returns:
+   -------
+   Z_OK  if supplying maximum data
+   Z_ERR if not supplying maximum data, or some error occurred
+           while trying to obtain it.
+
+   Arguments:
+   ---------
+   (OUT) max_number_of_nodes    = Maximum number of unstructured nodes
+                                  in the part (over all time).
+ 
+                                   (Array will have been allocated
+                                    Numparts_available long)
+
+   (OUT) max_number_of_elements = 2D array containing maximum number of
+                                  each type of element for each
+                                  unstructured model part (over all time).
+                                  ------------
+                                  Possible types are:
+
+                                Z_POINT   =  point
+                                Z_BAR02   =  2-noded bar
+                                Z_BAR03   =  3-noded bar
+                                Z_TRI03   =  3-noded triangle
+                                Z_TRI06   =  6-noded triangle
+                                Z_QUA04   =  4-noded quadrilateral
+                                Z_QUA08   =  8-noded quadrilateral
+                                Z_TET04   =  4-noded tetrahedron
+                                Z_TET10   = 10-noded tetrahedron
+                                Z_PYR05   =  5-noded pyramid
+                                Z_PYR13   = 13-noded pyramid
+                                Z_PEN06   =  6-noded pentahedron
+                                Z_PEN15   = 15-noded pentahedron
+                                Z_HEX08   =  8-noded hexahedron
+                                Z_HEX20   = 20-noded hexahedron
+
+                                Z_G_POINT =  ghost node point element
+                                Z_G_BAR02 =  2 node ghost bar
+                                Z_G_BAR03 =  3 node ghost bar
+                                Z_G_TRI03 =  3 node ghost triangle
+                                Z_G_TRI06 =  6 node ghost triangle
+                                Z_G_QUA04 =  4 node ghost quad
+                                Z_G_QUA08 =  8 node ghost quad
+                                Z_G_TET04 =  4 node ghost tetrahedron
+                                Z_G_TET10 = 10 node ghost tetrahedron
+                                Z_G_PYR05 =  5 node ghost pyramid
+                                Z_G_PYR13 = 13 node ghost pyramid
+                                Z_G_PEN06 =  6 node ghost pentahedron
+                                Z_G_PEN15 = 15 node ghost pentahedron
+                                Z_G_HEX08 =  8 node ghost hexahedron
+                                Z_G_HEX20 = 20 node ghost hexahedron
+
+                               (Ignored unless Z_UNSTRUCTURED type)
+
+                                  (Array will have been allocated
+                                   Numparts_available by
+                                   Z_MAXTYPE long)
+
+   (OUT) max_ijk_dimensions  = 2D array containing maximum ijk dimensions
+                               for each structured model part (over all time).
+                                           ----------
+                                (Ignored if Z_UNSTRUCTURED type)
+
+                                (Array will have been allocated
+                                 Numparts_available by 3 long)
+
+                             max_ijk_dimensions[][0] = maximum I dimension
+                             max_ijk_dimensions[][1] = maximum J dimension
+                             max_ijk_dimensions[][2] = maximum K dimension
+
+   Notes:
+   -----
+   * You need to have first called USERD_get_number_of_model_parts and
+     USERD_get_gold_part_build_info, so Numparts_available is known and
+     so EnSight will know what the type is (Z_UNSTRUCTURED, Z_STRUCTURED,
+     or Z_IBLANKED) of each part.
+
+   * This will NOT be based on Current_time_step - it is to be the maximum
+     values over all time!!
+
+   * This information is optional.  If you return Z_ERR, Ensight will still
+     process things fine, reallocating as needed, etc.  However, for
+     large transient models you will likely use considerably more memory
+     and take more processing time for the memory reallocations. So, if it
+     is possible to provide this information "up front", it is recommended
+     to do so.
+
+
+--------------------------------------------------------------------
+USERD_get_model_extents
+
+   Description:
+   -----------
+   Gets the model bounding box extents.  If this routine supplys them
+   EnSight will not have to spend time doing so.  If this routine
+   returns Z_ERR, EnSight will have to take the time to touch all the
+   nodes and gather the extent info.
+
+   Specification:
+   -------------
+   int USERD_get_model_extents(float extents[6])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful  (whereupon EnSight will determine by reading
+                             all coords of all parts)
+
+   Arguments:
+   ---------
+   (OUT) extents[0]   = min x
+                [1]   = max x
+                [2]   = min y
+                [3]   = max y
+                [4]   = min z
+                [5]   = max z
+
+   Notes:
+   -----
+   * This will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_name_of_reader
+
+   Description:
+   -----------
+   Gets the name of your user defined reader.  The user interface will
+   ask for this and include it in the available reader list.
+
+   Specification:
+   -------------
+   int USERD_get_name_of_reader(char reader_name[Z_MAX_USERD_NAME],
+				int *two_fields)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) reader_name          = the name of the your reader or data format.
+                              (max length is Z_MAX_USERD_NAME, which is 20)
+
+   (OUT) two_fields          = FALSE if only one data field is      
+                                      required.                      
+                                TRUE if two data fields required     
+ 
+                                -1   if one field (Geom) required 
+                                     and one field (Param) is optional
+                                     Param field can contain any text
+                                     for example a file name, modifiers,
+                                     etc. that can be used to modify the
+                                     reader's behavior.
+ 
+
+   Notes:
+   -----
+   * Always called.  Please be sure to provide a name for your custom
+     reader format.
+
+--------------------------------------------------------------------
+USERD_get_nfaced_conn
+
+   Description:
+   -----------
+   Gets the array containing the connectivity of nsided faces of nfaced elements
+
+   Specification:
+   -------------int
+   int USERD_get_nfaced_conn(int part_number,
+                             int *nfaced_conn_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number        = the part number
+
+   (OUT) nfaced_conn_array  = 1D array of nsided face connectivies of nfaced
+                              elements
+
+                              (int array will have been allocated long enough to
+                               hold all the nsided face connectivities. Which is
+                               the sum of all the nodes per face values in the
+                               nfaced_npf_array of USERD_get_nfaced_nodes_per_face)
+
+   Notes:
+   -----
+ * Will not be called unless there are some nfaced elements in the part
+
+ * Providing nfaced information to Ensight:
+
+     1. In USERD_get_gold_part_build_info, provide the number of nfaced
+        polyhedral elements in the part.
+
+     2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+        the number of faces per nfaced element. (as if connectivity
+        length of an nfaced element is one)
+
+     3. In this routine, provide the streamed number of nodes per face
+        for each of the faces of the nfaced elements.
+
+
+     Simple example:         11        10   12
+                            +--------+-----+
+     2 nfaced elements:    /|        |\   /|
+     (1 7-faced           / |        | \ / |
+      1 5-sided)         /  |        |  +9 |
+                        /   |        | /|  |
+                       /7   |      8 /  |  |
+                      +-----------+/ |  |  |
+                      |     |5    |  |4 |  |6
+                      |     +-----|--+--|--+
+                      |    /      |   \ | /
+                      |   /       |    \|/3
+                      |  /        |     +
+                      | /         |    /
+                      |/1         |2 /
+                      +-----------+/
+
+      1. In USERD_get_gold_part_build_info:
+              number_of_elements[Z_NFACED] = 2
+                                             .
+                                            /|\
+                                             |
+      2. In USERD_get_part_elements_by_type:
+          length of conn_array will be:      2 x 1
+          for element_type of Z_NFACED:
+              conn_array[0][0] = 7           (for the 7-faced element)
+              conn_array[1][0] = 5           (for the 5-faced element)
+
+                                ==
+                           Sum  12    <---------+
+                                                |
+      3. In USERD_get_faced_nodes_per_face:     |
+           length of nfaced_npf_array will be:  12
+
+            nfaced_npf_array[0]  = 5  (5-noded top face of 7-faced element)
+            nfaced_npf_array[1]  = 5  (5-noded bot face of 7-faced element)
+            nfaced_npf_array[2]  = 4  (4-noded front face of 7-faced element)
+            nfaced_npf_array[3]  = 4  (4-noded left face of 7-faced element)
+            nfaced_npf_array[4]  = 4  (4-noded back face of 7-faced element)
+            nfaced_npf_array[5]  = 4  (4-noded right front face of 7-faced element)
+            nfaced_npf_array[6]  = 4  (4-noded right back face of 7-faced element)
+
+            nfaced_npf_array[7]  = 3  (3-noded top face of 5-faced element)
+            nfaced_npf_array[8]  = 3  (3-noded bot face of 5-faced element)
+            nfaced_npf_array[9]  = 4  (4-noded back face of 5-faced element)
+            nfaced_npf_array[10] = 4  (4-noded right face of 5-faced element)
+            nfaced_npf_array[11] = 4  (4-noded left front face of 5-faced element)
+
+                                   ==
+                             Sum   48   <-------------+
+                                                      |
+      4. In this function:                            |
+            length of the nfaced_conn_array will be:  48
+
+            nsided_conn_array[0] = 7   (conn of 5-noded top face of 7-faced elem)
+            nsided_conn_array[1] = 8
+            nsided_conn_array[2] = 9
+            nsided_conn_array[3] = 10
+            nsided_conn_array[4] = 11
+
+            nsided_conn_array[5] = 1   (conn of 5-noded bot face of 7-faced elem)
+            nsided_conn_array[6] = 5
+            nsided_conn_array[7] = 4
+            nsided_conn_array[8] = 3
+            nsided_conn_array[9] = 2
+
+            nsided_conn_array[10] = 1  (conn of 4-noded front face of 7-faced elem)
+            nsided_conn_array[11] = 2
+            nsided_conn_array[12] = 8
+            nsided_conn_array[13] = 7
+
+            nsided_conn_array[14] = 5  (conn of 4-noded left face of 7-faced elem)
+            nsided_conn_array[15] = 1
+            nsided_conn_array[16] = 7
+            nsided_conn_array[17] = 11
+
+            nsided_conn_array[18] = 4  (conn of 4-noded back face of 7-faced elem)
+            nsided_conn_array[19] = 5
+            nsided_conn_array[20] = 11
+            nsided_conn_array[21] = 10
+
+            nsided_conn_array[22] = 2  (conn of 4-noded right front face of 7-faced)
+            nsided_conn_array[23] = 3
+            nsided_conn_array[24] = 9
+            nsided_conn_array[25] = 8
+
+            nsided_conn_array[26] = 3  (conn of 4-noded right back face of 7-faced)
+            nsided_conn_array[27] = 4
+            nsided_conn_array[28] = 10
+            nsided_conn_array[29] = 9
+
+            nsided_conn_array[30] = 9  (conn of 3-noded top face of 5-faced elem)
+            nsided_conn_array[32] = 12
+            nsided_conn_array[32] = 10
+
+            nsided_conn_array[33] = 3  (conn of 3-noded bot face of 5-faced elem)
+            nsided_conn_array[34] = 4
+            nsided_conn_array[35] = 6
+
+            nsided_conn_array[36] = 6  (conn of 4-noded back face of 5-faced elem)
+            nsided_conn_array[37] = 4
+            nsided_conn_array[38] = 10
+            nsided_conn_array[39] = 12
+
+            nsided_conn_array[40] = 3  (conn of 4-noded right face of 5-faced elem)
+            nsided_conn_array[41] = 6
+            nsided_conn_array[42] = 12
+            nsided_conn_array[43] = 9
+
+            nsided_conn_array[44] = 4  (conn of 4-noded left front face of 5-faced)
+            nsided_conn_array[45] = 3
+            nsided_conn_array[46] = 9
+            nsided_conn_array[47] = 10
+
+
+
+--------------------------------------------------------------------
+USERD_get_nfaced_nodes_per_face -
+
+   Description:
+   -----------
+   Gets the array containing the number of nodes per face for each face
+   of the nfaced elements.
+
+   Specification:
+   -------------
+   int USERD_get_nfaced_nodes_per_face(int part_number,
+                                       int *nfaced_npf_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number       = the part number
+
+   (OUT) nfaced_npf_array  = 1D array of nodes per face for all faces of
+                             nfaced elements
+
+                             (int array will have been allocated long enough
+                              to hold all the nodes_per_face values. Which is
+                              the sum of all the number of faces per element
+                              values in the conn_array of
+                              USERD_get_part_elements_by_type)
+
+   Notes:
+   -----
+   * Will not be called unless there are some nfaced elements in the
+     the part
+
+   * Providing nfaced information to Ensight:
+
+     1. In USERD_get_gold_part_build_info, provide the number of nfaced
+        polyhedral elements in the part.
+
+     2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+        the number of faces per nfaced element. (as if connectivity
+        length of an nfaced element is one)
+
+     3. In this routine, provide the streamed number of nodes per face
+        for each of the faces of the nfaced elements.
+
+
+     Simple example:         11        10   12
+                            +--------+-----+
+     2 nfaced elements:    /|        |\   /|
+     (1 7-faced           / |        | \ / |
+      1 5-sided)         /  |        |  +9 |
+                        /   |        | /|  |
+                       /7   |      8 /  |  |
+                      +-----------+/ |  |  |
+                      |     |5    |  |4 |  |6
+                      |     +-----|--+--|--+
+                      |    /      |   \ | /
+                      |   /       |    \|/3
+                      |  /        |     +
+                      | /         |    /
+                      |/1         |2 /
+                      +-----------+/
+
+      1. In USERD_get_gold_part_build_info:
+              number_of_elements[Z_NFACED] = 2
+                                             .
+                                            /|\
+                                             |
+      2. In USERD_get_part_elements_by_type:
+          length of conn_array will be:      2 x 1
+          for element_type of Z_NFACED:
+              conn_array[0][0] = 7           (for the 7-faced element)
+              conn_array[1][0] = 5           (for the 5-faced element)
+
+                                ==
+                           Sum  12    <---------+
+                                                |
+      3. In this routine:                       |
+           length of nfaced_npf_array will be:  12
+
+            nfaced_npf_array[0]  = 5  (5-noded top face of 7-faced element)
+            nfaced_npf_array[1]  = 5  (5-noded bot face of 7-faced element)
+            nfaced_npf_array[2]  = 4  (4-noded front face of 7-faced element)
+            nfaced_npf_array[3]  = 4  (4-noded left face of 7-faced element)
+            nfaced_npf_array[4]  = 4  (4-noded back face of 7-faced element)
+            nfaced_npf_array[5]  = 4  (4-noded right front face of 7-faced element)
+            nfaced_npf_array[6]  = 4  (4-noded right back face of 7-faced element)
+
+            nfaced_npf_array[7]  = 3  (3-noded top face of 5-faced element)
+            nfaced_npf_array[8]  = 3  (3-noded bot face of 5-faced element)
+            nfaced_npf_array[9]  = 4  (4-noded back face of 5-faced element)
+            nfaced_npf_array[10] = 4  (4-noded right face of 5-faced element)
+            nfaced_npf_array[11] = 4  (4-noded left front face of 5-faced element)
+
+                                   ==
+                             Sum   48   <-------------+
+                                                      |
+      4. In USERD_get_nfaced_conn:                    |
+            length of the nfaced_conn_array will be:  48
+
+            nsided_conn_array[0] = 7   (conn of 5-noded top face of 7-faced elem)
+            nsided_conn_array[1] = 8
+            nsided_conn_array[2] = 9
+            nsided_conn_array[3] = 10
+            nsided_conn_array[4] = 11
+
+            nsided_conn_array[5] = 1   (conn of 5-noded bot face of 7-faced elem)
+            nsided_conn_array[6] = 5
+            nsided_conn_array[7] = 4
+            nsided_conn_array[8] = 3
+            nsided_conn_array[9] = 2
+
+            nsided_conn_array[10] = 1  (conn of 4-noded front face of 7-faced elem)
+            nsided_conn_array[11] = 2
+            nsided_conn_array[12] = 8
+            nsided_conn_array[13] = 7
+
+            nsided_conn_array[14] = 5  (conn of 4-noded left face of 7-faced elem)
+            nsided_conn_array[15] = 1
+            nsided_conn_array[16] = 7
+            nsided_conn_array[17] = 11
+
+            nsided_conn_array[18] = 4  (conn of 4-noded back face of 7-faced elem)
+            nsided_conn_array[19] = 5
+            nsided_conn_array[20] = 11
+            nsided_conn_array[21] = 10
+
+            nsided_conn_array[22] = 2  (conn of 4-noded right front face of 7-faced)
+            nsided_conn_array[23] = 3
+            nsided_conn_array[24] = 9
+            nsided_conn_array[25] = 8
+
+            nsided_conn_array[26] = 3  (conn of 4-noded right back face of 7-faced)
+            nsided_conn_array[27] = 4
+            nsided_conn_array[28] = 10
+            nsided_conn_array[29] = 9
+
+            nsided_conn_array[30] = 9  (conn of 3-noded top face of 5-faced elem)
+            nsided_conn_array[32] = 12
+            nsided_conn_array[32] = 10
+
+            nsided_conn_array[33] = 3  (conn of 3-noded bot face of 5-faced elem)
+            nsided_conn_array[34] = 4
+            nsided_conn_array[35] = 6
+
+            nsided_conn_array[36] = 6  (conn of 4-noded back face of 5-faced elem)
+            nsided_conn_array[37] = 4
+            nsided_conn_array[38] = 10
+            nsided_conn_array[39] = 12
+
+            nsided_conn_array[40] = 3  (conn of 4-noded right face of 5-faced elem)
+            nsided_conn_array[41] = 6
+            nsided_conn_array[42] = 12
+            nsided_conn_array[43] = 9
+
+            nsided_conn_array[44] = 4  (conn of 4-noded left front face of 5-faced)
+            nsided_conn_array[45] = 3
+            nsided_conn_array[46] = 9
+            nsided_conn_array[47] = 10
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_node_label_status
+
+   Description:
+   -----------
+   Answers the question as to whether node labels will be provided.
+
+   Specification:
+   -------------
+   int USERD_get_node_label_status( void )
+
+   Returns:
+   -------
+   TRUE        if node labels will be provided
+   FALSE       if node labels will NOT be provided
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * Node ids are needed in order to do any node querying, or node
+     labeling on-screen within EnSight.
+
+   * Prior to API 2.01:
+     -----------------
+       For unstructured parts, you can read them from your file if
+       available, or can assign them, etc. They need to be unique
+       per part, and are often unique per model.  They must also be
+       positive numbers greater than zero.
+
+         USERD_get_part_node_ids is used to obtain the ids, if the
+         status returned here is TRUE.
+
+         (Unlike API 1.0, where the connectivity of elements had to be
+          according to the node ids - API 2.0's element connectivities
+          are not affected either way by the status here.)
+
+       For structured parts, EnSight will assign ids if you return a
+         status of TRUE here.  You cannot assign them yourself!!
+
+   * Starting at API 2.01:
+     --------------------
+       For both unstructured and structured parts, you can read them
+       from your file if available, or can assign them, etc. They need
+       to be unique per part, and are often unique per model. They must
+       also be positive numbers greater than zero.
+
+       USERD_get_part_node_ids is used to obtain the ids, if the
+       status returned here is TRUE.
+
+   * Will call USERD_get_part_node_ids for each part if this routine
+     returns TRUE.
+
+--------------------------------------------------------------------
+USERD_get_nsided_conn -
+
+   Description:
+   -----------
+   Gets the array containing the connectivity of nsided elements
+
+   Specification:
+   -------------
+   int USERD_get_nsided_conn(int part_number,
+                             int *nsided_conn_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number         = the part number
+
+   (OUT) nsided_conn_array   = 1D array of nsided connectivies
+
+                               (int array will have been allocated long enough
+                                to hold all the nsided connectivities. Which is
+                                the sum of all the nodes_per_element values in
+                                the conn_array of USERD_get_part_elements_by_type)
+
+
+   Notes:
+   -----
+   * Will not be called unless there are some nsided elements in the the part.
+
+   * Providing nsided information to Ensight:
+
+     1. In USERD_get_gold_part_build_info, provide the number of nsided
+        elements in the part.
+
+     2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+        the number of nodes per nsided element. (as if connectivity
+        length of an nsided element is one)
+
+     3. In this routine, provide the streamed connectivities for each of the
+        nsided elements.
+
+
+     Simple example:         5        6
+                            +--------+
+     3 nsided elements:    /|         \
+     (1 4-sided           / |          \
+      1 3-sided          /  |           \
+      1 7-sided)        /   |            \ 7
+                       /3   |4            +
+                      +-----+             |
+                      |     |             |
+                      |     |             |8
+                      |     |             +
+                      |     |            /
+                      |     |           /
+                      |     |          /
+                      |1    |2        /9
+                      +-----+--------+
+
+      1. In USERD_get_gold_part_build_info:
+              number_of_elements[Z_NSIDED] = 3
+                                             .
+                                            /|\
+                                             |
+      2. In USERD_get_part_elements_by_type:
+          length of conn_array will be:      3 x 1
+
+          for element_type of Z_NSIDED:
+              conn_array[0][0] = 4           (for the 4-sided element)
+              conn_array[1][0] = 3           (for the 3-sided element)
+              conn_array[2][0] = 7           (for the 7-sided element)
+
+                           Sum  ===
+                                 14    <---------+
+                                                 |
+      3. In this routine:                        |
+           length of nsided_conn_array will be:  14
+
+              nsided_conn_array[0]  = 1      (connectivity of 4-sided element)
+              nsided_conn_array[1]  = 2
+              nsided_conn_array[2]  = 4
+              nsided_conn_array[3]  = 3
+
+              nsided_conn_array[4]  = 3      (connectivity of 3-sided element)
+              nsided_conn_array[5]  = 4
+              nsided_conn_array[6]  = 5
+
+              nsided_conn_array[7]  = 2      (connectivity of 7-sided element)
+              nsided_conn_array[8]  = 9
+              nsided_conn_array[9]  = 8
+              nsided_conn_array[10] = 7
+              nsided_conn_array[11] = 6
+              nsided_conn_array[12] = 5
+              nsided_conn_array[13] = 4
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_num_of_time_steps
+
+   Description:
+   -----------
+   Gets the number of time steps of data available for desired timeset.
+
+   Specification:
+   -------------
+   int USERD_get_num_of_time_steps( int timeset_number )
+
+   Returns:
+   -------
+   Number of time steps in timeset  (>0 if okay, <=0 if problems).
+
+   Arguments:
+   ---------
+   (IN) timeset number = the timeset number
+
+                         For example: If USERD_get_number_of_timesets
+                                      returns 2, the valid
+                                      timeset_number's would be 1 and 2
+
+   Notes:
+   -----
+   * This should be >= 1       1 indicates a static model
+                              >1 indicates a transient model
+
+   * Num_time_steps[timeset_number] would be set here
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_files_in_dataset
+
+   Description:
+   -----------
+   Get the total number of files in the dataset.  Used for the
+   dataset query option within EnSight.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_files_in_dataset( void )
+
+   Returns:
+   -------
+   The total number of files in the dataset.
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * You can be as complete as you want about this.  If you don't
+     care about the dataset query option, return a value of 0
+     If you only want certain files, you can just include them. But,
+     you will need to supply the info in USERD_get_dataset_query_file_info
+     for each file you include here.
+
+   * Num_dataset_files would be set here
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_material_sets -
+
+   Description:
+   -----------
+   Get the number of material sets in the model
+
+   Specification:
+   -------------
+   int USERD_get_number_of_material_sets( void )
+
+
+   Returns:
+   -------
+   Num_material_sets = number of material sets
+                       (Zero would indicate that you have no materials
+                        to deal with in the model)
+
+                       or
+
+                       -1 if an error condition
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+  * You may want to keep this as a global for use in other routines.
+
+   ###############################################################
+   NOTE:  For EnSight 7.6, only one material set is supported
+          within EnSight.
+          Thus the only valid returns here are:
+               0 (no materials)
+               1 (for the one material set allowed)
+          or  -1 (if an error)
+
+          If the casefile has more than this, this reader will
+          read them, but EnSight will issue an error message and
+          choke on them!
+   ###############################################################
+
+  ================================================================
+  A very simple explanatory example, to use as a reference for the
+  materials routines:
+
+  Given a 2D mesh composed of 9 quad (Z_QUA04) elements, with two materials.
+  Most of the model is material 1, but the top left corner is material 9 -
+  basically as shown:
+
+
+        *--------*--------*--------*
+        |        |   /    |        |
+        |     Mat 9 /     |        |
+        |        | /      |        |
+        |        |/       |        |
+        |  e7    /   e8   |   e9   |
+        |       /|        |        |
+        |      / |        |        |
+        |     /  |        |        |
+        *----/---*--------*--------*
+        |   /    |        |        |
+        |  /     |        |        |
+        | /      |      Mat 1      |
+        |/       |        |        |
+        |   e4   |   e5   |   e6   |
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        *--------*--------*--------*
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        |   e1   |   e2   |   e3   |
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        *--------*--------*--------*
+
+
+  Thus, in this routine, set:
+    Num_material_sets = 1
+
+  In USERD_get_matf_set_info, set:
+    mat_set_ids[0]    = 1
+    mat_set_name[0]   = "Material Set 1"  (or whatever name desired)
+
+  In USERD_get_number_of_materials, input would be set_index = 0, and
+  would need to set:
+    Num_materials[0] = 2
+
+  For simplicity, the ids and descriptions that would be returned in
+  USERD_get_matf_var_info could be:
+    mat_ids[0] = 1
+    mat_ids[1] = 9
+    mat_desc[0] = "mat 1"   (or whatever desired)
+    mat_desc[2] = "mat 9"
+
+  The per element material ids list would need to be:
+
+     material ids:
+     -------------
+     ids_list[0] = 1  (material id 1, for elem e1)
+     ids_list[1] = 1  (     "                  e2)
+     ids_list[2] = 1  (     "                  e3)
+     ids_list[3] = -1 (negative of index into mixed-material id list, for elem e4)
+     ids_list[5] = 1  (material id 1, for elem e5)
+     ids_list[5] = 1  (     "                  e6)
+     ids_list[5] = -5 (negative of index into mixed-material id list, for elem e7)
+     ids_list[5] = -9 (     "                  e8)
+     ids_list[5] = 1  (material id 1, for elem e9)
+
+  Finally we need the mixed material ids list and the mixed materials values list,
+  which would need to be:
+
+       mixed-material ids:
+       -------------------
+   ==> 1  ids_list[0]  =  2  (the -1 in the material variable points here,
+                                      2 indicates that two materials are present)
+       2  ids_list[1]  =  1  (1st material is 1)
+       3  ids_list[2]  =  9  (2nd material is 9)
+       4  ids_list[3]  = -1  (negative of index into mixed-material val_list)
+   ==> 5  ids_list[4]  =  2  (the -5 in the material variable points here,
+                                      2 indicates that two materials are present)
+       6  ids_list[5]  =  1  (1st material is 1)
+       7  ids_list[6]  =  9  (2nd material is 9)
+       8  ids_list[7]  = -3  (negative of index into mixed-material val_list)
+   ==> 9  ids_list[8]  =  2     etc.
+       10 ids_list[9]  =  1
+       11 ids_list[10] =  9
+       12 ids_list[11] = -5
+
+       mixed-material values:
+       ----------------------
+   ==> 1 val_list[0] = 0.875 (the -1 in the  mixed-material ids_list points here,
+                                       and this is the value for material 1)
+       2 val_list[1] = 0.125 (the value for material 9)
+   ==> 3 val_list[2] = 0.125 (the -3 in the mixed-materials ids_list points here)
+       4 val_list[3] = 0.875
+   ==> 5 val_list[4] = 0.875 (the -5 in the mixed-materials ids_list points here)
+       6 val_list[5] = 0.125
+
+  So, USERD_size_matf_data would need to return
+       matf_size = 8, when called with set_id    = 1
+                                       part_id   = 1
+                                       wtyp      = Z_QUA04
+                                       mat_type  = Z_MAT_INDEX
+
+       matf_size = 12, when called with set_id   = 1
+                                        part_id  = 1
+                                        mat_type = Z_MIX_INDEX
+
+                 = 6, when called with set_id   = 1
+                                       part_id  = 1
+                                       mat_type = Z_MIX_VALUE
+
+  And, USERD_load_matf_data would need to return:
+    the int array ids_list as shown above when called with:
+       set_id   = 1
+       part_id  = 1
+       wtyp     = Z_QUA04
+       mat_type = Z_MAT_INDEX (indicating id list).
+
+    the int array ids_list as shown above when called with:
+       set_id   = 1
+       part_id  = 1
+       mat_type = Z_MIX_INDEX (indicating id list).
+
+    the float array val_list as shown above when called with:
+       set_id   = 1
+       part_id  = 1
+       mat_type = Z_MIX_VALUE (indicating val list).
+
+
+-------------------------------------------------------------------------
+USERD_get_number_of_materials
+
+   Description:
+   -----------
+   Gets the number of materials in the material set
+
+   Specification:
+   -------------
+   int USERD_get_number_of_materials( int set_index )
+
+   Returns:
+   -------
+   Num_materials[set_index]   = Number of materials in the set
+                                 0 indicates no materials information present
+                                -1 indicates an error
+   Arguments:
+   ---------
+   (IN) set_index             = the material set index (zero based)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero
+  * You may want to keep this as a global for use in other routines.
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_model_parts
+
+   Description:
+   -----------
+   Gets the total number of unstructured and structured parts
+   in the model, for which you can supply information.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_model_parts( void )
+
+   Returns:
+   -------
+   Number of parts  (>0 if okay, <=0 if problems).
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * If going to have to read down through the parts in order to
+     know how many, you may want to build a table of pointers to
+     the various parts, so you can easily get to particular parts in
+     later processes.  If you can simply read the number of parts
+     at the head of the file, then you would probably not build the
+     table at this time.
+
+   * This routine would set Numparts_available, which is equal to
+     Num_unstructured_parts + Num_structured_blocks.
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_timesets
+
+   Description:
+   -----------
+    Gets the number of timesets used in the model.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_timesets( void )
+
+   Returns:
+   -------
+   Number of timesets in the model
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * Num_timesets would be set here
+
+   * If you have a static model, both geometry and variables, you should
+     return a value of zero.
+ 
+   * If you have a transient model, then you should return one or more.
+ 
+   For example:
+ 
+      Geometry    Variables                                 No. of timesets
+      ---------   ------------------------------            ---------------
+      static      static                                      0
+      static      transient, all using same timeset           1
+ 
+      transient   transient, all using same timeset as geom   1
+ 
+      static      transient, using 3 different timesets       3
+ 
+      transient   transient, using 3 different timesets and
+                             none of them the same as the
+                             geometry timeset                 4
+          etc.
+ 
+   NOTE: ALL GEOMETRY MUST USE THE SAME TIMESET!!! You will have to provide
+                                                   the timeset number to use
+                                                   for geometry in:
+                                               USERD_get_geom_timeset_number
+ 
+         Variables can use the same timeset as the geometry, or can use
+         other timesets. More than one variable can use the same timeset.
+ 
+   example:  changing geometry at 5 steps, 0.0, 1.0, 2.0, 3.0, 4.0
+             variable 1 provided at these same five steps
+             variable 2 provided at 3 steps, 0.5, 1.25, 3.33
+ 
+        This routine should return a value of 2, because only
+        two different timesets are needed. Timeset 1 would be for the
+        geometry and variable 1 (they both use it). Timeset 2 would
+        be for variable 2, which needs its own in this case.
+
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_variables
+
+   Description:
+   -----------
+   Get the number of variables for which you will be providing info.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_variables( void )
+
+   Returns:
+   -------
+   Number of variables (includes constant, scalar, vector and tensor types)
+                       (>=0 if okay, <0 if problem)
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+    *****************************************************************
+   * Variable numbers, by which references will be made, are implied
+     here. If you say there are 3 variables, the variable numbers
+     will be 1, 2, and 3.
+    *****************************************************************
+
+   * Num_variables would be set here
+
+
+
+--------------------------------------------------------------------
+USERD_get_part_coords
+
+   Description:
+   -----------
+   Gets the coordinates for an unstructured part.
+
+   Specification:
+   -------------
+   int USERD_get_part_coords(int part_number, float **coord_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) coord_array             = 2D float array which contains,
+                                   x,y,z coordinates of each node
+                                   in the part.
+
+       (IMPORTANT: The second dimension of this aray is 1-based!!!)
+
+                                (Array will have been allocated
+                                 3 by (number_of_nodes + 1) for the part
+                                 long - see USERD_get_gold_part_build_info)
+
+
+                       ex) If number_of_nodes = 100
+                           as obtained in:
+                             USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions of the
+                           pointer sent to this routine will be:
+                             coord_array[3][101]
+
+                           Ignore the coord_array[0][0]
+                                      coord_array[1][0]
+                                      coord_array[2][0] locations and start
+                           the node coordinates at:
+                             coord_array[0][1]
+                             coord_array[1][1]
+                             coord_array[2][1]
+
+                             coord_array[0][2]
+                             coord_array[1][2]
+                             coord_array[2][2]
+
+                                   etc.
+
+   Notes:
+   -----
+   * Not called unless Num_unstructured_parts is > 0
+
+   * Will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_part_element_ids_by_type
+
+   Description:
+   -----------
+   Gets the ids for the elements of a particular type for an unstructured
+   or structured part.
+
+   Specification:
+   -------------
+   int USERD_get_part_element_ids_by_type(int part_number,
+                                          int element_type,
+                                          int *elemid_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  element_type            = One of the following (See global_extern.h)
+                                   Z_POINT      node point element
+                                   Z_BAR02      2 node bar
+                                   Z_BAR03      3 node bar
+                                   Z_TRI03      3 node triangle
+                                   Z_TRI06      6 node triangle
+                                   Z_QUA04      4 node quad
+                                   Z_QUA08      8 node quad
+                                   Z_TET04      4 node tetrahedron
+                                   Z_TET10     10 node tetrahedron
+                                   Z_PYR05      5 node pyramid
+                                   Z_PYR13     13 node pyramid
+                                   Z_PEN06      6 node pentahedron
+                                   Z_PEN15     15 node pentahedron
+                                   Z_HEX08      8 node hexahedron
+                                   Z_HEX20     20 node hexahedron
+
+                                   Z_G_POINT    ghost node point element
+                                   Z_G_BAR02    2 node ghost bar
+                                   Z_G_BAR03    3 node ghost bar
+                                   Z_G_TRI03    3 node ghost triangle
+                                   Z_G_TRI06    6 node ghost triangle
+                                   Z_G_QUA04    4 node ghost quad
+                                   Z_G_QUA08    8 node ghost quad
+                                   Z_G_TET04    4 node ghost tetrahedron
+                                   Z_G_TET10   10 node ghost tetrahedron
+                                   Z_G_PYR05    5 node ghost pyramid
+                                   Z_G_PYR13   13 node ghost pyramid
+                                   Z_G_PEN06    6 node ghost pentahedron
+                                   Z_G_PEN15   15 node ghost pentahedron
+                                   Z_G_HEX08    8 node ghost hexahedron
+                                   Z_G_HEX20   20 node ghost hexahedron
+
+   (OUT) elemid_array            = 1D array containing id of each
+                                   element of the type.
+
+                                  (Array will have been allocated
+                                   number_of_elements of the type long)
+
+                       ex) If number_of_elements[Z_TRI03] = 25
+                              number_of_elements[Z_QUA04] = 100
+                              number_of_elements[Z_HEX08] = 30
+                           as obtained in:
+                            USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions available
+                           for this routine will be:
+                              conn_array[25]   when called with Z_TRI03
+
+                              conn_array[100]  when called with Z_QUA04
+
+                              conn_array[30]  when called with Z_HEX08
+
+   Notes:
+   -----
+   * Not called unless element label status is set to TRUE in
+     USERD_get_element_label_status
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_part_elements_by_type
+
+   Description:
+   -----------
+   Gets the connectivities for the elements of a particular type in an
+   unstructured part
+
+   Specification:
+   -------------
+   int USERD_get_part_elements_by_type(int part_number,
+                                       int element_type,
+                                       int **conn_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number           = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  element_type          = One of the following (See global_extern.h)
+                                 Z_POINT      node point element
+                                 Z_BAR02      2 node bar
+                                 Z_BAR03      3 node bar
+                                 Z_TRI03      3 node triangle
+                                 Z_TRI06      6 node triangle
+                                 Z_QUA04      4 node quad
+                                 Z_QUA08      8 node quad
+                                 Z_TET04      4 node tetrahedron
+                                 Z_TET10     10 node tetrahedron
+                                 Z_PYR05      5 node pyramid
+                                 Z_PYR13     13 node pyramid
+                                 Z_PEN06      6 node pentahedron
+                                 Z_PEN15     15 node pentahedron
+                                 Z_HEX08      8 node hexahedron
+                                 Z_HEX20     20 node hexahedron
+
+                                 Z_G_POINT    ghost node point element
+                                 Z_G_BAR02    2 node ghost bar
+                                 Z_G_BAR03    3 node ghost bar
+                                 Z_G_TRI03    3 node ghost triangle
+                                 Z_G_TRI06    6 node ghost triangle
+                                 Z_G_QUA04    4 node ghost quad
+                                 Z_G_QUA08    8 node ghost quad
+                                 Z_G_TET04    4 node ghost tetrahedron
+                                 Z_G_TET10   10 node ghost tetrahedron
+                                 Z_G_PYR05    5 node ghost pyramid
+                                 Z_G_PYR13   13 node ghost pyramid
+                                 Z_G_PEN06    6 node ghost pentahedron
+                                 Z_G_PEN15   15 node ghost pentahedron
+                                 Z_G_HEX08    8 node ghost hexahedron
+                                 Z_G_HEX20   20 node ghost hexahedron
+
+
+   (OUT) conn_array            = 2D array containing connectivity
+                                 of each element of the type.
+
+                                (Array will have been allocated
+                                 num_of_elements of the type by
+                                 connectivity length of the type)
+
+                       ex) If number_of_elements[Z_TRI03] = 25
+                              number_of_elements[Z_QUA04] = 100
+                              number_of_elements[Z_HEX08] = 30
+                           as obtained in:
+                            USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions available
+                           for this routine will be:
+                              conn_array[25][3]   when called with Z_TRI03
+
+                              conn_array[100][4]  when called with Z_QUA04
+
+                              conn_array[30][8]   when called with Z_HEX08
+   
+   Notes:
+   -----
+   * Not called unless Num_unstructured_parts is > 0
+
+   * Will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_part_node_ids
+
+   Description:
+   -----------
+   Gets the node ids of an unstructured or structured part.
+
+   Specification:
+   -------------
+   int USERD_get_part_node_ids(int part_number, int *nodeid_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) nodeid_array            = 1D array containing node ids of
+                                    each node in the part.
+
+           (IMPORTANT: This array is 1-based!!!)
+
+                                   (Array will have been allocated
+                                    (number_of_nodes + 1) for the part long
+                                    see USERD_get_gold_part_build_info)
+
+                       ex) If number_of_nodes = 100
+                           as obtained in:
+                             USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions of the
+                           pointer sent to this routine will be:
+                             nodeid_array[101]
+
+                           Ignore the nodeid_array[0] location and start
+                           the node ids at:
+                             nodeid_array[1]
+
+                             nodeid_array[2]
+
+                                   etc.
+
+   Notes:
+   -----
+   * Not called unless node label status is TRUE, as returned from
+     USERD_get_node_label_status
+
+   * Will be based on Current_time_step
+
+   * The ids are purely labels, used when displaying or querying node ids.
+     However, any node id < 0 will never be displayed
+
+
+--------------------------------------------------------------------
+USERD_get_reader_descrip
+
+   Description:
+   -----------
+   Gets the description of the reader, so gui can give more info
+
+   Specification:
+   -------------
+   int USERD_get_reader_descrip(char descrip[Z_MAXFILENP])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) descrip  = the description of the reader (max length is MAXFILENP,
+                                                   which is 255)
+
+   Notes:
+   -----
+   * OPTIONAL ROUTINE!   You can have it or not.
+
+
+
+--------------------------------------------------------------------
+USERD_get_reader_version
+
+   Description:
+   -----------
+   Gets the version number of the user defined reader
+
+   Specification:
+   -------------
+   int USERD_get_reader_version(char version_number[Z_MAX_USERD_NAME])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful (and will assume is version 1.0)
+
+   Arguments:
+   ---------
+   (OUT) version_number       = the version number of the reader
+                                (max length is Z_MAX_USERD_NAME, which
+                                 is 20)
+
+   Notes:
+   -----
+   * This needs to be "2.000" or greater. Otherwise EnSight will assume
+     this reader is API 1.0
+
+   * should set it to "2.010" for this version of the API
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_sol_times
+
+   Description:
+   -----------
+   Get the solution times associated with each time step for 
+   desired timeset.
+
+   Specification:
+   -------------
+   int USERD_get_sol_times(int timeset_number,
+                           float *solution_times)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  timeset_number     = the timeset number
+ 
+                              For example: If USERD_get_number_of_timesets
+                                           returns 2, the valid
+                                           timeset_number's would be 1 and 2
+
+   (OUT) solution_times       = 1D array of solution times per time step
+
+                                  (Array will have been allocated
+                                   Num_time_steps[timeset_number] long)
+
+   Notes:
+   -----
+   * The solution times must be non-negative and increasing.
+
+
+
+--------------------------------------------------------------------
+USERD_get_timeset_description -
+
+   Description:
+   -----------
+   Get the description to associate with the desired timeset.
+
+   Specification:
+   -------------
+   int USERD_get_timeset_description(int timeset_number,
+                                     char timeset_description[Z_BUFL])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  timeset_number     = the timeset number
+ 
+                              For example: If USERD_get_number_of_timesets
+                                           returns 2, the valid
+                                           timeset_number's would be 1 and 2
+
+   (OUT) timeset_description  = timeset description string
+
+
+   Notes:
+   -----
+   * A string of NULLs is valid for timeset_description
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_var_by_component
+
+   Description:
+   -----------
+   Gets the values of a variable component.  Both unstructured and structured
+   parts use this routine.
+
+   if Z_PER_NODE:
+     Get the component value at each node for a given variable in the part.
+
+   or if Z_PER_ELEM:
+     Get the component value at each element of a specific part and type
+     for a given variable.
+
+   Specification:
+   -------------
+   int USERD_get_var_by_component(int which_variable,
+                                  int which_part,
+                                  int var_type,
+                                  int which_type,
+                                  int imag_data,
+                                  int component,
+                                  float *var_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   or:  Z_UNDEF, in which case you need not load any values into var_array
+
+
+   Arguments:
+   ---------
+   (IN)  which_variable          = The variable number
+
+   (IN)  which_part                 Since EnSight Version 7.4
+                                    -------------------------
+                                  = The part number
+
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+                                    Prior to EnSight Version 7.4
+                                    ----------------------------
+                                  = The part id   This is the part_id label loaded
+                                                  in USERD_get_gold_part_build_info.
+                                                  It is NOT the part table index.
+
+   (IN)  var_type                = Z_SCALAR
+                                   Z_VECTOR
+                                   Z_TENSOR   (symmetric tensor)
+                                   Z_TENSOR9  (asymmetric tensor)
+
+   (IN)  which_type
+
+            if Z_PER_NODE:         Not used
+
+            if Z_PER_ELEM:       = The element type
+                                   Z_POINT      node point element
+                                   Z_BAR02      2 node bar
+                                   Z_BAR03      3 node bar
+                                   Z_TRI03      3 node triangle
+                                   Z_TRI06      6 node triangle
+                                   Z_QUA04      4 node quad
+                                   Z_QUA08      8 node quad
+                                   Z_TET04      4 node tetrahedron
+                                   Z_TET10     10 node tetrahedron
+                                   Z_PYR05      5 node pyramid
+                                   Z_PYR13     13 node pyramid
+                                   Z_PEN06      6 node pentahedron
+                                   Z_PEN15     15 node pentahedron
+                                   Z_HEX08      8 node hexahedron
+                                   Z_HEX20     20 node hexahedron
+
+                                   Z_G_POINT    ghost node point element
+                                   Z_G_BAR02    2 node ghost bar
+                                   Z_G_BAR03    3 node ghost bar
+                                   Z_G_TRI03    3 node ghost triangle
+                                   Z_G_TRI06    6 node ghost triangle
+                                   Z_G_QUA04    4 node ghost quad
+                                   Z_G_QUA08    8 node ghost quad
+                                   Z_G_TET04    4 node ghost tetrahedron
+                                   Z_G_TET10   10 node ghost tetrahedron
+                                   Z_G_PYR05    5 node ghost pyramid
+                                   Z_G_PYR13   13 node ghost pyramid
+                                   Z_G_PEN06    6 node ghost pentahedron
+                                   Z_G_PEN15   15 node ghost pentahedron
+                                   Z_G_HEX08    8 node ghost hexahedron
+                                   Z_G_HEX20   20 node ghost hexahedron
+
+   (IN)  imag_data               = TRUE if imag component
+                                   FALSE if real component
+ 
+   (IN)  component               = The component: (0       if Z_SCALAR)
+                                                  (0 - 2   if Z_VECTOR)
+                                                  (0 - 5   if Z_TENSOR)
+                                                  (0 - 8   if Z_TENSOR9)
+ 
+                                 * 6 Symmetric Indicies, 0:5    *
+                                 * ---------------------------- *
+                                 *     | 11 12 13 |   | 0 3 4 | *
+                                 *     |          |   |       | *
+                                 * T = |    22 23 | = |   1 5 | *
+                                 *     |          |   |       | *
+                                 *     |       33 |   |     2 | *
+ 
+
+                                 * 9 General   Indicies, 0:8    *
+                                 * ---------------------------- *
+                                 *     | 11 12 13 |   | 0 3 4 | *
+                                 *     |          |   |       | *
+                                 * T = | 21 22 23 | = | 6 1 5 | *
+                                 *     |          |   |       | *
+                                 *     | 31 32 33 |   | 7 8 2 | *
+
+   (OUT) var_array 
+
+      -----------------------------------------------------------------------
+      (IMPORTANT: this array is 1-based for both Z_PER_NODE and Z_PER_ELEM!!!)
+      -----------------------------------------------------------------------
+
+            if Z_PER_NODE:    = 1D array containing variable component value
+                                for each node.
+
+                                (Array will have been allocated
+                                 (number_of_nodes + 1) long)
+
+                      Info stored in this fashion:
+                            var_array[0] = not used
+                            var_array[1] = var component for node 1 of part
+                            var_array[2] = var_component for node 2 of part
+                            var_array[3] = var_component for node 3 of part
+                            etc.
+
+            if Z_PER_ELEM:    = 1D array containing variable component
+                                value for each element of a particular
+                                part and type.
+                                    
+                              (Array will have been allocated
+                               (number_of_elements[which_part][which_type] + 1)
+                                long.  See USERD_get_gold_part_build_info)
+
+                  Info stored in this fashion:
+                    var_array[1] = var component for elem 1 (of part and type)
+                    var_array[2] = var component for elem 2 (of part and type)
+                    var_array[3] = var component for elem 3 (of part and type)
+                    etc.
+
+   Notes:
+   -----
+   * Not called unless Num_variables is > 0
+
+   * The per_node or per_elem classification must be obtainable from the
+     variable number (a var_classify array needs to be retained)
+
+   * Will be based on Current_time_step
+
+   * If the variable is not defined for this part, simply return with a
+     value of Z_UNDEF.  EnSight will treat the variable as undefined for
+     this part.
+
+
+--------------------------------------------------------------------
+USERD_get_var_value_at_specific
+
+   Description:
+   -----------
+   if Z_PER_NODE:
+     Get the value of a particular variable at a particular node in a
+     particular part at a particular time.
+
+   or if Z_PER_ELEM:
+     Get the value of a particular variable at a particular element of
+     a particular type in a particular part at a particular time.
+
+
+   Specification:
+   -------------
+   int USERD_get_var_value_at_specific(int which_var,
+                                       int which_node_or_elem,
+                                       int which_part,
+                                       int which_elem_type,
+                                       int time_step,
+                                       float values[3],
+                                       int imag_data)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  which_var   = The variable number
+
+   (IN)  which_node_or_elem
+
+              If Z_PER_NODE:
+                = The node number.  This is not the id, but is
+                                    the index of the global node 
+                                    list (1 based), or the block's
+                                    node list (1 based).
+
+                  Thus,  coord_array[1]
+                         coord_array[2]
+                         coord_array[3]
+                              .      |
+                              .      |which_node_or_elem index
+                              .             ----
+
+
+              If Z_PER_ELEM:
+                = The element number.  This is not the id, but is
+                                       the element number index
+                                       of the number_of_element array
+                                       (see USERD_get_gold_part_build_info),
+                                        or the block's element list (1 based).
+
+                  Thus,  for which_part:
+                         conn_array[which_elem_type][0]
+                         conn_array[which_elem_type][1]
+                         conn_array[which_elem_type][2]
+                              .                      |
+                              .          which_node_or_elem index
+                              .                        ----
+
+
+   (IN)  which_part                 Since EnSight Version 7.4
+                                    -------------------------
+                                  = The part number
+
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+                                    Prior to EnSight Version 7.4
+                                    ----------------------------
+                                  = The part id   This is the part_id label loaded
+                                                  in USERD_get_gold_part_build_info.
+                                                  It is NOT the part table index.
+
+
+   (IN)  which_elem_type
+
+              If Z_PER_NODE, or block part:
+                = Not used
+
+              If Z_PER_ELEM:
+                = The element type.    This is the element type index
+                                       of the number_of_element array
+                                       (see USERD_get_gold_part_build_info)
+
+   (IN)  time_step   = The time step
+
+   (IN)  imag_data   = TRUE if want imaginary value.
+                       FALSE if want real value.
+
+   (OUT) values      = scalar or vector component value(s)
+                        values[0] = scalar or vector[0]
+                        values[1] = vector[1]
+                        values[2] = vector[2]
+
+
+   Notes:
+   -----
+   * This routine is used in node querys over time (or element querys over
+     time for Z_PER_ELEM variables).  If these operations are not critical
+     to you, this can be a dummy routine.
+
+   * The per_node or per_elem classification must be obtainable from the
+     variable number (a var_classify array needs to be retained)
+
+   * The time step given is for the proper variable timeset.
+
+
+----------------------------------------------------------------------
+USERD_load_matf_data
+
+   Description:
+   -----------
+   Get the material id list, mixed-material id list, or
+   mixed-material values list for the given material set and part (and
+   element type if material id list)
+
+   Specification:
+   -------------
+   int USERD_load_matf_data( int set_index,
+                             int part_id,
+                             int wtyp,
+                             int mat_type,
+                             int *ids_list,
+                             float *val_list)
+
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+  (IN)  set_index         = the material set index (zero based)
+
+  (IN)  part_id           = the part number desired
+
+  (IN)  wtyp              = the element type        (used for Z_MAT_INDEX only)
+
+                                  Z_POINT    node point element
+                                  Z_BAR02    2 node bar
+                                  Z_BAR03    3 node bar
+                                  Z_TRI03    3 node triangle
+                                  Z_TRI06    6 node triangle
+                                  Z_QUA04    4 node quad
+                                  Z_QUA08    8 node quad
+                                  Z_TET04    4 node tetrahedron
+                                  Z_TET10   10 node tetrahedron
+                                  Z_PYR05    5 node pyramid
+                                  Z_PYR13   13 node pyramid
+                                  Z_PEN06    6 node pentahedron
+                                  Z_PEN15   15 node pentahedron
+                                  Z_HEX08    8 node hexahedron
+                                  Z_HEX20   20 node hexahedron
+                                  Z_NSIDED  nsided polygon
+                                  Z_NFACED  nfaced polyhedron
+
+                                  Z_G_POINT    ghost node point element
+                                  Z_G_BAR02    2 node ghost bar
+                                  Z_G_BAR03    3 node ghost bar
+                                  Z_G_TRI03    3 node ghost triangle
+                                  Z_G_TRI06    6 node ghost triangle
+                                  Z_G_QUA04    4 node ghost quad
+                                  Z_G_QUA08    8 node ghost quad
+                                  Z_G_TET04    4 node ghost tetrahedron
+                                  Z_G_TET10   10 node ghost tetrahedron
+                                  Z_G_PYR05    5 node ghost pyramid
+                                  Z_G_PYR13   13 node ghost pyramid
+                                  Z_G_PEN06    6 node ghost pentahedron
+                                  Z_G_PEN15   15 node ghost pentahedron
+                                  Z_G_HEX08    8 node ghost hexahedron
+                                  Z_G_HEX20   20 node ghost hexahedron
+                                  Z_G_NSIDED  ghost nsided polygon
+                                  Z_G_NFACED  ghost nfaced polyhedron
+
+  (IN)  mat_type          = Z_MAT_INDEX for material ids list
+                            Z_MIX_INDEX for mixed-material ids list
+                            Z_MIX_VALUE for mixed-material values list
+
+  (OUT) ids_list          = If mat_type is Z_MAT_INDEX:
+                            ---------------------------
+                             1D material id list
+                               (Int array will have been allocated
+                                the appropriate size, as returned in
+                                 USERD_size_matf_data for mat_type Z_MAT_INDEX)
+
+                            If mat_type is Z_MIX_INDEX:
+                            ---------------------------
+                             1D mixed-material id list
+                               (Int array will have been allocated
+                                the appropriate size, as returned in
+                                 USERD_size_matf_data for mat_type Z_MIX_INDEX)
+
+  (OUT) val_list          = 1D mixed-materials values list
+                            (only used if mat_type is Z_MIX_VALUE)
+
+                               (Float array will have been allocated
+                                the appropriate size, as returned in
+                                USERD_size_matf_data for mat_type Z_MIX_VALUE)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero,
+     or Num_materials[set_index] is zero,
+     or the appropriate size from USERD_size_matf_data is zero
+
+
+
+--------------------------------------------------------------------
+USERD_set_filenames
+
+   Description:
+   -----------
+   Receives the geometry and result filenames entered in the data
+   dialog.  The user written code will have to store and use these
+   as needed. The user written code must manage its own files!!
+
+   Specification:
+   -------------
+   int USERD_set_filenames(char filename_1[],
+                           char filename_2[],
+                           char the_path[],
+                           int swapbytes)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN) filename_1   = the filename entered into the geometry
+                         field of the data dialog.
+
+   (IN) param_2      = The usage of this string depends on
+                       'two_fields' in USERD_get_name_of_reader.
+ 
+                       If two_fields is FALSE then it's empty.
+ 
+                       If two_fields is TRUE, this is the 
+                       manditory results file entered 
+                       into the result field of the data dialog.
+ 
+                       If two_fields is -1, then this contains
+                       optional text (filenames, modifiers, etc.)
+                       that can be parsed and used to modify 
+                       reader 
+
+   (IN) the_path     = the path info from the data dialog.
+                       Note: filename_1 and filename_2 have already
+                            had the path prepended to them.  This
+                            is provided in case it is needed for
+                            filenames contained in one of the files
+
+   (IN) swapbytes    = TRUE if should swap bytes when reading data.
+                     = FALSE normally.
+
+   Notes:
+   -----
+   * Since you must manage everything from the input that is entered in
+     these data dialog fields, this is an important routine!
+
+   * It may be that you will need to have an executive type file that contains
+     info and other filenames within it, like EnSight6's case file.
+
+
+--------------------------------------------------------------------
+USERD_set_server_number
+
+   Description:
+   -----------
+   Receives the server number of how many total servers.
+
+   Specification:
+   -------------
+   int USERD_set_server_number(int cur_serv,
+                               int tot_servs)
+
+   Returns:
+   -------
+   nothing
+
+   Arguments:
+   ---------
+   (IN) cur_serv    = the current server.
+
+   (IN) tot_servs   = the total number of servers.
+
+   Notes:
+   -----
+   * Only useful if your user defined reader is being used with EnSight's
+     Server-of-Server capability.  And even then, it may or may not be
+     something that you can take advantage of.  If your data is already
+     partitioned in some manner, such that you can access the proper
+     portions using this information.
+ 
+     For all non-SOS uses, this will simply be 1 of 1
+
+
+
+--------------------------------------------------------------------
+USERD_set_time_set_and_step
+
+   Description:
+   -----------
+   Set the current time step in the desired timeset.  All functions that
+   need time, and that do not explicitly pass it in, will use the timeset
+   and step set by this routine, if needed.
+
+   Specification:
+   -------------
+   void USERD_set_time_set_and_step(int timeset_number,
+                                    int time_step)
+
+   Returns:
+   -------
+   nothing
+
+   Arguments:
+   ---------
+   (IN) timeset_number  = the timeset number (1 based).
+ 
+                          For example:  If USERD_get_number_of_timesets
+                                        returns 2, the valid timeset_number's
+                                        would be 1 and 2.
+
+   (IN) time_step       = The current time step to set
+
+   Notes:
+   -----
+   * Current_time_step and Current_timeset would be set here
+
+
+--------------------------------------------------------------------
+USERD_size_matf_data
+
+   Description:
+   -----------
+   Get the length of the material id list, mixed-material id list, or
+   mixed-material values list for the given material set and part (and
+   element type if material id list)
+
+   Specification:
+   -------------
+   int USERD_size_matf_data( int set_index,
+                             int part_id,
+                             int wtyp,
+                             int mat_type,
+                             int *matf_size)
+
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+  (IN)  set_index         = the material set index (zero based)
+
+  (IN)  part_id           = the part number desired
+
+  (IN)  wtyp              = the element type        (used for Z_MAT_INDEX only)
+
+                                  Z_POINT    node point element
+                                  Z_BAR02    2 node bar
+                                  Z_BAR03    3 node bar
+                                  Z_TRI03    3 node triangle
+                                  Z_TRI06    6 node triangle
+                                  Z_QUA04    4 node quad
+                                  Z_QUA08    8 node quad
+                                  Z_TET04    4 node tetrahedron
+                                  Z_TET10   10 node tetrahedron
+                                  Z_PYR05    5 node pyramid
+                                  Z_PYR13   13 node pyramid
+                                  Z_PEN06    6 node pentahedron
+                                  Z_PEN15   15 node pentahedron
+                                  Z_HEX08    8 node hexahedron
+                                  Z_HEX20   20 node hexahedron
+                                  Z_NSIDED  nsided polygon
+                                  Z_NFACED  nfaced polyhedron
+
+                                  Z_G_POINT    ghost node point element
+                                  Z_G_BAR02    2 node ghost bar
+                                  Z_G_BAR03    3 node ghost bar
+                                  Z_G_TRI03    3 node ghost triangle
+                                  Z_G_TRI06    6 node ghost triangle
+                                  Z_G_QUA04    4 node ghost quad
+                                  Z_G_QUA08    8 node ghost quad
+                                  Z_G_TET04    4 node ghost tetrahedron
+                                  Z_G_TET10   10 node ghost tetrahedron
+                                  Z_G_PYR05    5 node ghost pyramid
+                                  Z_G_PYR13   13 node ghost pyramid
+                                  Z_G_PEN06    6 node ghost pentahedron
+                                  Z_G_PEN15   15 node ghost pentahedron
+                                  Z_G_HEX08    8 node ghost hexahedron
+                                  Z_G_HEX20   20 node ghost hexahedron
+                                  Z_G_NSIDED  ghost nsided polygon
+                                  Z_G_NFACED  ghost nfaced polyhedron
+
+  (IN)  mat_type          = Z_MAT_INDEX for material ids list
+                            Z_MIX_INDEX for mixed-material ids list
+                            Z_MIX_VALUE for mixed-material values list
+
+  (OUT) matf_size         = the length of the material id list, or
+                            mixed-material id list, or
+                            mixed-material values list
+                            for the given material set and part number
+                            (and element type if Z_MAT_INDEX)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero, or
+     Num_materials[set_index] is zero
+
+
+
+
+--------------------------------------------------------------------
+USERD_stop_part_building
+
+   Description:
+   -----------
+   This routine called when the part building dialog is closed.  It is
+   provided in case you desire to release memory, etc. that was only needed
+   during the part building process.
+
+   Specification:
+   -------------
+   void USERD_stop_part_building( void )
+
+   Returns:
+   -------
+   nothing
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+
+--------------------------------------------------------------------
+USERD_rigidbody_existence
+
+   Description:
+   -----------
+   Gets the existence of rigid body values or not in the model
+
+   Specification:
+   -------------
+   int USERD_rigidbody_existence( void )
+
+   Returns:
+   -------
+   Z_OK    if rigid body values exist for the model
+   Z_UNDEF if no rigid body values exist
+   Z_ERR   if an error
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * This will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_rigidbody_values
+
+   Description:
+   -----------
+   Gets the rigid body values for each part
+
+   Specification:
+   -------------
+   int USERD_rigidbody_values(int part_number,
+                              float values[7])
+
+   Returns:
+   -------
+   Z_OK    if rigid body values exist for the model
+   Z_UNDEF if no rigid body values exist
+   Z_ERR   if an error
+
+   Arguments:
+   ---------
+   (IN)  part_number        = The part number
+ 
+                              (1-based index of part table, namely:
+ 
+                                 1 ... Numparts_available.
+ 
+                               It is NOT the part_id that
+                               is loaded in USERD_get_gold_part_build_info)
+ 
+   (OUT) values             values[0] = IX   (x location)
+                            values[1] = IY   (y location)
+                            values[2] = IZ   (z location)
+                            values[3] = E0   (e0 euler value)
+                            values[4] = E1   (e1 euler value)
+                            values[5] = E2   (e2 euler value)
+                            values[6] = E3   (e3 euler value)
+
+
+   Notes:
+   -----
+   * This will be based on Current_time_step
+   * It will not be called unless USERD_rigidbody_existence indicates
+       that there are some values in the model by returning Z_OK.
+
+
+--------------------------------------------------------------------
+USERD_set_right_side
+
+   Description:
+   -----------
+   Informs the reader that the time currently set is the right side of a time
+   span used for variable interpolation between time steps
+
+   Specification:
+   -------------
+   void USERD_set_right_side( void )
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * Applies to Current_time_step
+
+
+
+
+
+------------------------------------------------------------------
+	ENHANCED GUI ROUTINES
+
+--------------------------------------------------------------------
+USERD_get_extra_gui_numbers
+
+   Description:
+   -----------
+   The Enhanced GUI routines are added to allow
+   the user to customize a portion of the Data
+   Reader dialog to pass in options to their
+   user defined reader.
+
+   Specification:
+   -------------
+   void USERD__get_extra_gui_numbers(int *num_Toggles,
+                                     int *num_pulldowns,
+                                     int *num_fields)
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (OUT) num_Toggles    = number of toggles that will be provided
+   
+         num_pulldowns  = number of pulldowns that will be provided
+
+         num_fields     = number of fields that will be provided
+
+   Notes:
+   -----
+     There are three routines that work together:
+     USERD_get_extra_gui_numbers
+     USERD_get_extra_gui_defaults
+     USERD_set_extra_gui_data
+
+     The existence of these routine indicates that
+     you wish to add customize entries to the
+     Data Reader dialog.
+
+     If you don't want the extra GUI features,
+     simply delete these routines, or change their
+     names to something such as
+     USERD_DISABLED_get_extra_gui_defaults
+ 
+     The presence of these routines
+     will ensure that EnSight will call them and
+     use their data to modify the extraction parameters set
+     with some or all of the following:
+     toggles, pulldown menu and fields.
+ 
+     The user can then interact with the enhanced
+     GUI and then send their choices to
+     USERD_set_extra_gui_data
+  
+     Therefore if USERD_get_extra_gui_numbers
+     exists then the other two must exist.
+ 
+     If none exist, then the GUI will be unchanged.
+ 
+     Toggle data will return an integer
+                               TRUE if checked
+                               FALSE if unchecked
+ 
+     Pulldown menu will return an integer representing
+                               the menu item selected
+ 
+     Field will return a string Z_LEN_GUI_FIELD_STR long.
+ 
+     If all the enhanced GUI features are enabled it
+     might look something like this
+
+    ===================================================
+    [] Title 1  [X] Title 3
+    [X]Title 2  [X] Title 4
+ 
+    Pulldown Menu ->
+        Menu Choice 1
+        Menu Choice 2
+        Menu Choice 3
+ 
+    Data Field Title 1 ____________________________
+ 
+    Data Field Title 2 ____________________________
+    =====================================================
+
+    This routine defines the numbers of toggles, pulldowns & fields
+ 
+    The following are defined in the global_extern.h
+           Z_MAX_NUM_GUI_PULL_ITEMS max num GUI pulldowns
+           Z_LEN_GUI_PULL_STR  max length of GUI pulldown string
+           Z_LEN_GUI_FIELD_STR  max length of field string
+           Z_LEN_GUI_TITLE_STR   max length of title string
+ 
+    The library is loaded, this routine is
+     called, then the library is unloaded.
+ 
+    Do not define globals in this routine
+     as when the library is unloaded, you'll
+     lose them.
+ 
+
+--------------------------------------------------------------------
+USERD_get_extra_gui_defaults
+
+   Description:
+   -----------
+   This routine defines the Titles, status,
+   List choices, strings, etc that are fed
+   up to the GUI.
+
+   Specification:
+   -------------
+   int USERD_get_extra_gui_defaults(char **toggle_Title,
+                                    int *toggle_default_status,
+                                    char **pulldown_Title,
+                                    int *pulldown_number_in_list,
+                                    int *pulldown_default_selection,
+                                    char ***pulldown_item_strings,
+                                    char **field_Title,
+                                    char **field_user_string)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) toggle_Title               = title for each toggle
+                                      array dimension is [num_toggles] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         toggle_default_status      = Setting for each toggle (TRUE or FALSE)
+                                      array dimension is [num_toggles] long 
+
+         pulldown_Title             = title for each pulldown
+                                      array dimension is [num_pulldowns] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         pulldown_number_in_list    = number of items in each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_default_selection = pulldown item selection for each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_item_strings      = pulldown item strings
+                                      array is [num_pulldowns] by
+                                               [Z_MAX_NUM_GUI_PULL_ITEMS] by
+                                               [Z_LEN_GUI_PULL_STR] long
+
+         field_Title                = title for each field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         field_user_string          = content of the field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+
+
+   Notes:
+   -----
+   * The library is loaded, this routine is called, then the library is unloaded.
+ 
+   * Do not define globals in this routine as when the library is unloaded, you'll
+     lose them.
+
+
+
+--------------------------------------------------------------------
+USERD_set_extra_gui_data
+
+   Description:
+   -----------
+   This routine sets the new values for the toggles, pulldowns, and fields.
+
+   Specification:
+   -------------
+   void USERD_set_extra_gui_data(
+               int *toggle,       /* [num_toggle] */
+               int *pulldown,     /* [num_pulldown] */
+               char **field_text  /* [num_fields][Z_LEN_GUI_FIELD_STR]*/)
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (IN) toggle               = setting for each toggle.  TRUE or FALSE
+                               array dimension is [num_toggles] long
+
+        pulldown             = item chosen in each pulldown. (0 based)
+                               array dimension is [num_pulldowns] long
+
+        field_text           = content of the field
+                               array dimension is [num_fields] by
+                                                  [Z_LEN_GUI_TITLE_STR] long
+
+
+   Notes:
+   -----
+   * This routine is called when the library is permanently
+     loaded to the EnSight session, so define your globals
+     in this and later routines.
+ 
+   * It's up to you to change your reader behavior according to
+     user entries!
+
+
+
+--------------------------------------------------------------------
+USERD_get_var_extract_gui_numbers
+
+   Description:
+   -----------
+   The Var_Extract_GUI routines are added to allow
+   the user to customize a extraction parameters
+   for variables "after" the file has been read.
+   These things can be modified and the variables will
+   be update/refreshed according to the new parameters set
+
+   Specification:
+   -------------
+   void USERD_get_var_extract_gui_numbers(int *num_Toggles,
+                                          int *num_pulldowns,
+                                          int *num_fields)
+
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (OUT) num_Toggles    = number of toggles that will be provided
+   
+         num_pulldowns  = number of pulldowns that will be provided
+
+         num_fields     = number of fields that will be provided
+
+   Notes:
+   -----
+     There are three routines that work together:
+     USERD_get_var_extract_gui_numbers
+     USERD_get_var_extract_gui_defaults (this one)
+     USERD_set_var_extract_gui_data
+
+     The existence of these routine indicates that
+     you wish to have the Var Extract Parameters dialog.
+
+     If you don't want the extra GUI features,
+     simply delete these routines, or change their
+     names to something such as
+     USERD_DISABLED_get_var_extract_gui_defaults
+ 
+     The presence of these routines
+     will ensure that EnSight will call them and
+     use their data to modify the extraction parameters set
+     with some or all of the following:
+     toggles, pulldown menu and fields.
+ 
+     The user can then interact with the enhanced
+     GUI and then send their choices to
+     USERD_set_extra_gui_data
+  
+     Therefore if USERD_get_var_extract_gui_numbers
+     exists then the other two must exist.
+ 
+     If none exist, then the GUI will be unchanged.
+ 
+     Toggle data will return an integer
+                               TRUE if checked
+                               FALSE if unchecked
+ 
+     Pulldown menu will return an integer representing
+                               the menu item selected
+ 
+     Field will return a string Z_LEN_GUI_FIELD_STR long.
+ 
+     If all the enhanced GUI features are enabled it
+     might look something like this
+
+    ===================================================
+    [] Title 1  [X] Title 3
+    [X]Title 2  [X] Title 4
+ 
+    Pulldown Menu ->
+        Menu Choice 1
+        Menu Choice 2
+        Menu Choice 3
+ 
+    Data Field Title 1 ____________________________
+ 
+    Data Field Title 2 ____________________________
+    =====================================================
+
+    This routine defines the numbers of toggles, pulldowns & fields
+ 
+    The following are defined in the global_extern.h
+           Z_MAX_NUM_GUI_PULL_ITEMS max num GUI pulldowns
+           Z_LEN_GUI_PULL_STR  max length of GUI pulldown string
+           Z_LEN_GUI_FIELD_STR  max length of field string
+           Z_LEN_GUI_TITLE_STR   max length of title string
+ 
+    The library is loaded, this routine is
+     called, then the library is unloaded.
+ 
+    Do not define globals in this routine
+     as when the library is unloaded, you'll
+     lose them.
+ 
+
+--------------------------------------------------------------------
+USERD_get_var_extract_gui_defaults
+
+   Description:
+   -----------
+   This routine defines the Titles, status,
+   List choices, strings, etc that are fed
+   up to the GUI.
+
+   Specification:
+   -------------
+   int USERD_get_var_extract_gui_defaults(char **toggle_Title,
+                                          int *toggle_default_status,
+                                          char **pulldown_Title,
+                                          int *pulldown_number_in_list,
+                                          int *pulldown_default_selection,
+                                          char ***pulldown_item_strings,
+                                          char **field_Title,
+                                          char **field_user_string)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) toggle_Title               = title for each toggle
+                                      array dimension is [num_toggles] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         toggle_default_status      = Setting for each toggle (TRUE or FALSE)
+                                      array dimension is [num_toggles] long 
+
+         pulldown_Title             = title for each pulldown
+                                      array dimension is [num_pulldowns] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         pulldown_number_in_list    = number of items in each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_default_selection = pulldown item selection for each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_item_strings      = pulldown item strings
+                                      array is [num_pulldowns] by
+                                               [Z_MAX_NUM_GUI_PULL_ITEMS] by
+                                               [Z_LEN_GUI_PULL_STR] long
+
+         field_Title                = title for each field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         field_user_string          = content of the field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+
+
+   Notes:
+   -----
+   * The library is loaded, this routine is called, then the library is unloaded.
+ 
+   * Do not define globals in this routine as when the library is unloaded, you'll
+     lose them.
+
+
+
+--------------------------------------------------------------------
+USERD_set_var_extract_gui_data
+
+   Description:
+   -----------
+   This routine sets the new values for the toggles, pulldowns, and fields.
+
+   Specification:
+   -------------
+   void USERD_set_var_extract_gui_data(
+               int *toggle,       /* [num_toggle] */
+               int *pulldown,     /* [num_pulldown] */
+               char **field_text  /* [num_fields][Z_LEN_GUI_FIELD_STR]*/)
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (IN) toggle               = setting for each toggle.  TRUE or FALSE
+                               array dimension is [num_toggles] long
+
+        pulldown             = item chosen in each pulldown. (0 based)
+                               array dimension is [num_pulldowns] long
+
+        field_text           = content of the field
+                               array dimension is [num_fields] by
+                                                  [Z_LEN_GUI_TITLE_STR] long
+
+
+   Notes:
+   -----
+   * This routine is called when the library is permanently
+     loaded to the EnSight session, so define your globals
+     in this and later routines.
+ 
+   * It's up to you to change your reader behavior according to
+     user entries!
+
+
+
+
+
+-----------------------------------------------------------------------------------
+/* ----------------------------------------------------------
+ *  New in EnSight 8 is the capability to remove (fail) elements
+ *   based on variable threshold values.  Basically the variable
+ *   name, a couple of thresholds, a couple of values and a logic 
+ *   criteria are read in from this routine.  Every element that
+ *   satisfies the failure criteria is removed and not used in
+ *   EnSight calculations.
+ *   
+ *  Example Failure criteria 
+ *     Let fail_var_name = "fail_flag"
+ *         threshold_val1 = 0
+ *         threshold_operator1 = Z_EQUAL_TO  
+ *         logic_criteria2 not used
+ *         threshold_val2 not used
+ *         threshold_operator2 not used
+ *     For each value of "fail_flag" at each element, 
+ *         if fail flag == threshold_val1 (0.0) then element fails
+ *   Return (Z_ERR) if this is not used.
+ *   Return (Z_OK) if failed element feature should be used
+ *
+ *  threshold_operator1 & 2 can be one of the following
+ *    Z_ELE_FAILED_NONE,           - disables checking
+ *     Z_ELE_FAILED_GREATER,        - greater than
+ *     Z_ELE_FAILED_LESS,           - less than
+ *     Z_ELE_FAILED_EQUAL,          - equal
+ *     Z_ELE_FAILED_NOT_EQUAL,      - not equal
+ *     Z_ELE_FAILED_MANY            - not used
+ *
+ * logic_criteria2
+ *      Z_ELE_FAILED_LOGIC_NONE,
+ *      Z_ELE_FAILED_LOGIC_AND,
+ *      Z_ELE_FAILED_LOGIC_OR,
+ *      Z_ELE_FAILED_LOGIC_MANY
+ *
+ * ---------------------------------------------------------- */
+int USERD_get_uns_failed_params(
+                char *fail_var_name,           /* variable name to be used in failure
+                                             must be scalar, per elem      */
+                float *threshold_val1,     /* number to compare for failure */
+                float *threshold_val2,     /* number to compare for failure */
+                int *threshold_operator1,   /* Z_GREATER_THAN, Z_LESS_THAN,
+                                            Z_EQUAL_TO */
+                int *threshold_operator2,   /* Z_GREATER_THAN, Z_LESS_THAN,
+                                            Z_EQUAL_TO */
+		int *logic_criteria2
+
+
+/*--------------------------------------------------------------------
+ * USERD_get_structured_reader_cinching -
+ *--------------------------------------------------------------------
+ *
+ *  Gets whether this reader will do structured cinching for block data
+ *  This means that it will handle the min, max, and step values for a
+ *  given block and return the coordinate components or variable components
+ *  in their "cinched" state when partial extraction or striding is used.
+ *  This is as opposed to returning the entire component (ignoring min, max
+ *  and stride) and letting Ensight pick out the values actually used.
+ *
+ *  returns: Z_OK    if the reader will handle the
+ *                   min, max, and stride and return
+ *                   the cinched values only.
+ *
+ *           Z_UNDEF or Z_ERR if will return entire component
+ *                            and rely on EnSight to cinch.
+ *
+ * Notes:
+ *  Unless you can actually pull out the desired min, max, and stride
+ *  without using a full component of memory, don't enable this feature.
+ *--------------------------------------------------------------------*/
+int
+USERD_get_structured_reader_cinching( void )
+
+
+
+/*--------------------------------------------------------------------
+ * USERD_set_block_range_and_stride -
+ *--------------------------------------------------------------------
+ *
+ *  Sets the min, max, and step values in each of the i, j, and k, directions
+ *  for the given part.
+ *
+ *  (IN)  part_number             = The part number
+ *
+ *                                  (1-based index of part table, namely:
+ *
+ *                                     1 ... Numparts_available.
+ *
+ *                                   It is NOT the part_id that
+ *                                   is loaded in
+ *                                               USERD_get_gold_part_build_info)
+ *
+ *  (IN) mini        = min i plane desired  (zero based)
+ *       maxi        = max i plane desired  (zero based)
+ *       stepi       = i stride
+ *       minj        = min j plane desired  (zero based)
+ *       maxj        = max j plane desired  (zero based)
+ *       stepj       = j stride
+ *       mink        = min k plane desired  (zero based)
+ *       maxk        = max k plane desired  (zero based)
+ *       stepk       = k stride
+ *
+ *
+ *  returns: Z_OK    if no problems
+ *           Z_ERR   if an error
+ *
+ *  Notes:
+ *  * It will not be called unless USERD_get_structured_reader_cinching
+ *    indicates that this reader does structured cinching by returning
+ *    a Z_OK.
+ *
+ *  * It will actually be called before each geom component and before
+ *    each part variable - so if you are storing things locally, you should
+ *    make this routine be able to quickly check whether anything needs
+ *    updated or not.
+ *
+ *  * If the stride (step) does not hit right on the max, the last element
+ *    in each direction will be shortened appropriately.
+ *    For example, if a block had 0 to 12 in the i direction,
+ *                 and the user specified min = 1
+ *                                        max = 8
+ *                                        step = 3
+ *
+ *             0   1   2   3   4   5   6   7   8   9   10  11  12
+ *             |   |   |   |   |   |   |   |   |   |   |   |   |
+ *
+ *                 |           |           |   |
+ *
+ *      Namely, the coarser cell boundaries in this direction would be at 1, 4,
+7, and 8
+ *
+ *--------------------------------------------------------------------*/
+int
+USERD_set_block_range_and_stride(int part_number,
+                                 int mini, int maxi, int stepi,
+                                 int minj, int maxj, int stepj,
+                                 int mink, int maxk, int stepk)
+
+
+
+---- end of document ----
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_2.07 b/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_2.07
new file mode 100644
index 0000000000..3b52eed3a3
--- /dev/null
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_2.07
@@ -0,0 +1,4617 @@
+README_USERD_2.07
+=================
+--------------------------------------
+EnSight User Defined Reader Capability   ===> (API 2.07)
+--------------------------------------
+A user defined reader capability is included in EnSight which can allow
+otherwise unsupported structured or unstructured data to be read.  The user
+defined reader capability utilizes dynamic shared libraries composed of
+routines defined in this document but produced by you, the user, (or some
+third party). This capability is currently available for dec, ibm, hp, sgi,
+sun, linux, alpha linux, and NT servers.
+
+You should refer to beginning of README_USERD_2.0  and/or README_1.0_to_2.0
+for a discussion of the differences between API 1.0 and API 2.*.
+
+***>> API 2.07 additional capabilities (beyond API 2.06):
+Optional routine to allow userd defined readers to indicate their auto 
+distribute preference when used with SOS.  This is used to set the auto 
+distribute flag default in the client.  If the function does not exist, 
+then it defaults to 'use auto distribute'.  If the function does exist and 
+indicates 'no auto distribute', then it's up to the UDR to decompose a 
+distributed data set.
+    USERD_prefer_auto_distribute
+Optional routine to allow userd defined readers to indicate their 
+preference for the 'Set file...' button labels in the client's File->Open 
+dialog.  If the function does not exist or it returns a null string for 
+an argument, then the default values are used.
+    USERD_set_filename_button_labels
+
+***>> API 2.06 additional capabilities (beyond API 2.05):
+Routines to allow userd defined readers for structured data
+to deal with min, max, and stride within the reader itself
+instead of within EnSight.
+    USERD_get_structured_reader_cinching
+    USERD_set_block_range_and_stride
+
+
+***>> API 2.05 additional capabilities (beyond API 2.04):
+Routines to handle material species.
+    USERD_get_number_of_species
+    USERD_get_matsp_info
+
+Routines to handle variable extraction parameters after a read, and then
+update the variables accordingly.  Similar to the extra GUI capabilities
+(which are processed before a read).  (Can actually be added to pre-2.05 readers)
+    USERD_get_var_extract_gui_numbers
+    USERD_get_var_extract_gui_defaults
+    USERD_set_var_extract_gui_data
+
+Routines to obtain rigid body values from a reader.
+(Routines were added - EnSight is now using for Nastran and STL readers
+                       with Dynasty rigid body motion data file)
+    USERD_rigidbody_existence
+    USERD_rigidbody_values
+
+Routine that lets reader know when EnSight is getting the right side of a time
+interval for variable interpolation between steps.  Not generally needed for
+most readers - however, may be needed for those that implement rigid body, and
+wish to cache left and right timespan information for interpolation within the
+reader itself.  (Can actually be added to pre-2.05 readers)
+    USERD_set_right_side
+
+
+***>> API 2.04 additional capabilities (beyond API 2.03):
+Routines to handle failed elements.  Basically 
+a.One routine to return a flag indicating the existence of 
+  failed elements in at least one part in at least one 
+  timestep in the model.  
+b.A second routine to return a matrix of flags indexed by part and
+  element type indicating which parts and element types have failed
+  elements at the current time step.
+c.Finally a third routine to return an array of flags for a given
+  part and element type that is number of elements of that type long
+  indicating which elements have failed, and which have not failed.
+
+
+***>> API 2.03 additional capabilities (beyond API 2.01):
+1. Routines to handle materials
+2. Routines to handle nsided and nfaced elements
+3. Modified routine to handle structured ranges
+
+
+****************************************************************************
+Note: Only the the Ensight Gold example reader, has been moved to 
+      this 2.06 API level.  And it is purely for an example - it does not
+      actually provide a benefit.
+****************************************************************************
+
+
+The process for producing a user defined reader is:
+---------------------------------------------------
+1. Write code for all pertinent routines in the library (Unless someone else
+   has done this for you).
+
+        This is of course where the work is done by the user.  The word
+        "pertinent" is used because depending on the nature of the data, some
+        of the routines in the library may be dummy routines.
+
+        The source code for a dummy_gold library and for various other
+        working or sample libraries is copied from the installation CD during
+        installation.  These will be located in directories under:
+
+        $CEI_HOME/ensight76/user_defined_src/readers
+
+        examples:
+        --------
+        Basic dummy_gold routines provide skeleton for a new reader
+          $CEI_HOME/ensight76/user_defined_src/readers/dummy_gold
+
+        Sample library which reads unstructured binary EnSight Gold data
+          $CEI_HOME/ensight76/user_defined_src/readers/ensight_gold
+
+        You may find it useful to place your library source in this area as
+        well, but are not limited to this location.
+
+ * ===>	The descriptions of each library routine and the order that the
+        routines are called, which is provided in this file, along with
+        the example libraries, should make it possible for you to produce
+        code for your own data reader.	
+
+
+2. Produce the dynamic shared library.
+
+   This is a compiling and loading process which varies according to
+   the type of machine you are on.  In the user-defined-reader source
+   tree we have tried to isolate the machine dependent parts of the
+   build process using a set of files in the 'config' directory.  In this
+   directory there is a configuration file for each platform on which
+   EnSight is supported.  Before you can compile the installed readers
+   you should run the script called 'init' in the config directory.
+
+      i.e.  (for UNIX)
+            cd config
+            ./init sgi_6.5_n64
+            cd ..
+            make
+
+   If you are compiling for Windows NT, there are two options.  If you
+   have the Cygwin GNU utilities installed, you can use GNU make as for
+   Unix.  Otherwise, there is a script called makeall.cmd which will
+   build all of the readers using nmake.  The Makefiles in each reader
+   directory will work using either make or nmake.
+
+      i.e.  (WIN32 Cygwin)                 (using nmake)
+            cd config                      cd config
+            sh init win32                  cp win32 config
+            cd ..                          cd ..
+                                           mkdir lib
+            make                           makeall.cmd
+
+   If you have platform-specific portions of code in your reader, the
+   build system defines a set of flags which can be used within
+   #ifdef ... #endif regions in your source, as shown in the table
+   below.
+
+   Because the readers are now dynamically opened by EnSight, you may
+   have to include dependent libraries on your link-line to avoid having
+   unresolved symbols.  If you are having problems with a reader, start
+   ensight as "ensight7 -readerdbg" and you will get feedback on any
+   problems encountered in loading a reader.  If there are unresolved
+   symbols, you need to find the library which contains the missing
+   symbols and link it into your reader by adding it to the example
+   link commands below.
+
+   If you choose to use a different build environment for your reader,
+   you should take care to use compatible compilation flags to ensure
+   compatibilty with the EnSight executables, most notably on the SGI
+   and HP-UX 11.0 platforms, which should use the following flags:
+
+      sgi_6.2_o32: -mips2
+      sgi_6.2_n64: -mips4 -64
+      sgi_6.5_n32: -mips3
+      sgi_6.5_n64: -mips4 -64
+       hp_11.0_32: +DA2.0
+       hp_11.0_64: +DA2.0W
+
+    ______________________________________________________________________
+   | MACHINE | OS flag               |  SHARED LIBRARY NAME PRODUCED      |
+   |  TYPE   |------------------------------------------------------------|
+   |         |         LD COMMAND USED IN MAKEFILE                        |
+    ======================================================================
+    ______________________________________________________________________
+   | sgi     | -DSGI                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -shared -all -o libuserd-X.so libuserd-X.o              |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | hp      | -DHP                  |  libuserd-X.sl                     |
+   |         |------------------------------------------------------------|
+   |         | ld -b -o libuserd-X.sl libuserd-X.o                        |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | sun     | -DSUN                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -G -o libuserd-X.so libuserd-X.o                        |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | dec     | -DDEC                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -shared -all -o libuserd-X.so libuserd-X.o -lc          |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | linux   | -DLINUX               |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -shared -o libuserd-X.so libuserd-X.o -lc               |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | alpha   | -DALINUX              |  libuserd-X.so                     |
+   | linux   |------------------------------------------------------------|
+   |         | ld -shared -o libuserd-X.so libuserd-X.o -lc               |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | ibm     | -DIBM                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -G -o libuserd-X.so libuserd-X.o -bnoentry -bexpall -lc |
+    ----------------------------------------------------------------------
+
+   Once you have created your library, you should place it in a directory
+   of your choice or in the standard reader location:
+
+      $CEI_HOME/ensight76/machines/$CEI_ARCH/lib_readers
+
+   For example, if you created a reader for "mydata", you should create
+   the reader libuserd-mydata.so and place the file in your own reader
+   directory (see section 3 below) or in the standard location:
+
+      $CEI_HOME/ensight76/machines/$CEI_ARCH/lib_readers/libuserd-mydata.so
+
+
+3. By default EnSight will load all readers found in the directory:
+
+      $CEI_HOME/ensight76/machines/$CEI_ARCH/lib_readers
+
+   Files with names "libuserd-X.so" (where X is a name unique to the reader)
+   are assumed to be user-defined readers.
+
+   There are two methods which can be used to supplement the default
+   behavior.
+
+   (1) A feature which is useful for site-level or user-level configuration
+       is the optional environment variable $ENSIGHT7_READER.  This
+       variable directs EnSight to load all readers in the specified reader
+       directory (you should probably specify a full path) before loading
+       the built-in readers.  If the same reader exists in both directories
+       (as determined by the name returned by USERD_get_name_of_reader(),
+       NOT by the filename), the locally configured reader will take
+       precedence.
+
+   (2) A useful feature for end-users is the use of the libuserd-devel
+       reader.  EnSight will search for a reader named libuserd-devel.so
+       (.sl for HP or .dll for NT).  This reader can exist anywhere in the
+       library path (see below) of the user.  This is useful for an
+       individual actively developing a reader because the existence of a
+       libuserd-devel library will take precedence over any other library
+       which returns the same name from USERD_get_name_of_reader().
+
+   As an example, a site may install commonly used readers in a common
+   location, and users can set the ENSIGHT7_READER variable to access them:
+
+      setenv ENSIGHT7_READER /usr/local/lib/e7readers
+  
+   A user working on a new reader may compile the reader and place it in
+   a directory specified by the library path:
+
+      cp libuserd-myreader.so ~/lib/libuserd-devel.so
+      setenv <librarypath> ~/lib:$<librarypath>
+
+   The user is responsible for correctly configuring the library path
+   variable in order to make use of the libuserd-devel feature.  The
+   library environment variables used are:
+
+        Machine type    Environment variable to set
+        ------------    ---------------------------
+        sgi             LD_LIBRARY_PATH
+        dec             LD_LIBRARY_PATH
+        sun             LD_LIBRARY_PATH
+        linux           LD_LIBRARY_PATH
+        alpha linux     LD_LIBRARY_PATH
+        hp              SHLIB_PATH
+        ibm             LIBPATH
+
+As always, EnSight support is available if you need it.
+
+-------------------------------
+Quick Index of Library Routines
+-------------------------------
+
+Generally Needed for UNSTRUCTURED data
+--------------------------------------
+USERD_get_part_coords                 part's node coordinates
+USERD_get_part_node_ids               part's node ids
+USERD_get_part_elements_by_type       part's element connectivites
+USERD_get_part_element_ids_by_type    part's element ids
+
+
+Generally Needed for BLOCK data
+--------------------------------------
+USERD_get_block_coords_by_component   block coordinates
+USERD_get_block_iblanking             block iblanking values
+USERD_get_ghosts_in_block_flag        block ghost cell existence?
+USERD_get_block_ghost_flags           block ghost cell flags
+
+  These routines, which formerly were only for unstructured data, will now
+  also be called for structured data if you specify that ids will be given
+  in the USERD_get_node_label_status and USERD_get_element_label_status rotuines
+  ------------------------------------------------------------------------------ 
+  USERD_get_part_node_ids               part's node ids
+  USERD_get_part_element_ids_by_type    part's element ids
+
+
+Generally needed for either or both kinds of data
+-------------------------------------------------
+USERD_get_name_of_reader              name of reader for GUI
+USERD_get_reader_release              release string of reader
+USERD_get_reader_version              provide reader version number
+USERD_get_reader_descrip              provide GUI more description (optional)
+
+USERD_get_extra_gui_numbers           Gets the number of toggles, pulldowns and fields
+USERD_get_extra_gui_defaults          Gets the default values for the GUI members
+USERD_set_extra_gui_data              Returns the answers provided by the user
+
+USERD_set_filenames                   filenames entered in GUI
+USERD_set_server_number               server which of how many
+
+USERD_get_number_of_timesets          number of timesets
+USERD_get_timeset_description         description of timeset
+USERD_get_geom_timeset_number         timeset # to use for geom
+
+USERD_get_num_of_time_steps           number of time steps
+USERD_get_sol_times                   solution time values
+USERD_set_time_set_and_step           current timeset and time step
+
+USERD_get_changing_geometry_status    changing geometry?
+USERD_get_node_label_status           node labels?
+USERD_get_element_label_status        element labels?
+USERD_get_model_extents               provide model bounding extents
+USERD_get_number_of_files_in_dataset  number of files in model
+USERD_get_dataset_query_file_info     info about each model file
+USERD_get_descrip_lines               file associated description lines
+USERD_get_number_of_model_parts       number of model parts
+USERD_get_gold_part_build_info        Gets the info needed for part building process
+USERD_get_part_build_info             part/block type/descrip etc.
+USERD_get_maxsize_info                part/block allocation maximums
+USERD_get_ghosts_in_model_flag        model contains ghost cells?
+USERD_get_nsided_conn                 Gets the element connectivities for nsided
+                                        elements. (utilizes the number of nodes
+                                        per element obtained in
+                                        USERD_get_part_elements_by_type)
+USERD_get_nfaced_nodes_per_face       Gets the number of nodes per face for nfaced
+                                        elements (utilizes the number of faces
+                                        per element obtained in
+                                        USERD_get_part_elements_by_type)
+USERD_get_nfaced_conn                 Gets the element connectivities for nfaced
+                                        elements (utilizes the number of nodes
+                                        per face obtained in
+                                        USERD_get_nfaced_nodes_per_face)
+
+
+USERD_get_border_availability         part border provided?
+USERD_get_border_elements_by_type     part border conn and parent info
+
+USERD_get_number_of_variables         number of variables
+USERD_get_gold_variable_info          variable type/descrip etc.
+USERD_get_var_by_component            part or block variable values
+USERD_get_constant_val                constant variable's value
+USERD_get_var_value_at_specific       node's or element's variable value over time
+USERD_stop_part_building              cleanup after part build routine
+
+USERD_get_number_of_material_sets     Gets the number of material sets
+USERD_get_matf_set_info               Gets the material set indices and names
+USERD_get_number_of_materials         Gets the number of materials
+USERD_get_matf_var_info               Gets the material indices and descriptions
+USERD_size_matf_data                  Gets the length of either the
+                                        material ids list,
+                                        mixed-material ids list, or
+                                        mixed-material values list
+USERD_load_matf_data                  Gets the material ids list,
+                                        mixed-material ids list, or
+                                        mixed-material values list
+
+USERD_bkup                            archive routine
+
+USERD_exit_routine                    cleanup upon exit routine
+
+USERD_get_uns_failed_params           Gets thresholds/criteria for failure  
+
+USERD_rigidbody_existence             Returns whether rigid body transformation
+                                       data exists for the model.
+USERD_rigidbody_values                Returns the euler and location values for a
+                                       given part
+
+USERD_set_right_side                  Simply informs the reader when the time set
+                                      is for the right side of a time span during
+                                      variable interpolation between time steps.
+
+USERD_get_structured_reader_cinching  Tells if the reader will do structured
+                                        cinching
+USERD_set_block_range_and_stride      Sets the min, max, and stride of a block
+                                        if doing structured cinching
+
+
+-------------------------
+Order Routines are called
+-------------------------
+
+The various main operations are given basically in the order they will
+be performed.  Within each operation, the order the routines will be
+called is given.  
+
+1. Setting name in the gui, and specifying one or two input fields
+
+        USERD_get_name_of_reader
+        USERD_get_reader_descrip        (optional)
+        USERD_get_extra_gui_numbers     (optional)
+	USERD_get_extra_gui_defaults    (optional)
+
+2. Getting the reader version (also distinguishes between API's)
+
+        USERD_get_reader_version
+
+3. Setting filenames and getting timeset and time info
+
+        <USERD_set_extra_gui_data> (optional if reader has
+                                    USERD_get_extra_gui_defaults routine)
+        USERD_get_structured_reader_cinching
+        USERD_set_server_number
+	USERD_set_extra_gui_data        (optional)
+        USERD_set_filenames
+        USERD_get_number_of_timesets
+        USERD_get_geom_timeset_number
+
+        for each timeset:
+          USERD_get_timeset_description
+          USERD_get_num_of_time_steps
+          USERD_get_sol_times
+
+        USERD_set_time_set_and_step
+
+4. Gathering info for part builder
+
+        USERD_set_time_set_and_step
+        USERD_get_changing_geometry_status
+        USERD_get_node_label_status
+        USERD_get_element_label_status
+        USERD_get_number_of_files_in_dataset
+        USERD_get_dataset_query_file_info
+        USERD_get_descrip_lines                 (for geometry)
+        USERD_get_number_of_model_parts
+        USERD_get_gold_part_build_info
+        USERD_get_ghosts_in_model_flag
+        USERD_get_maxsize_info
+        USERD_get_get_ghosts_in_block_flag      (if any ghost cells in model)
+        USERD_get_model_extents     OR          (for model extents)
+             USERD_get_part_coords  AND/OR
+             <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+             USERD_get_block_coords_by_component
+
+5. Gathering Variable info
+
+        USERD_get_number_of_variables
+        USERD_get_gold_variable_info
+              
+6. Part building (per part created)
+
+        both unstructured and structured:
+        --------------------------------
+        USERD_set_time_set_and_step
+
+        if unstructured part:
+        --------------------
+        USERD_get_part_element_ids_by_type
+        USERD_get_part_elements_by_type
+
+        If any nsided elements:
+
+          USERD_get_nsided_conn
+
+        If any nfaced elements:
+
+          USERD_get_nfaced_nodes_per_face
+          USERD_get_nfaced_conn
+
+        USERD_get_part_coords
+        USERD_get_part_node_ids
+
+        else if structured part:
+        -----------------------
+        USERD_get_block_iblanking
+        <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+        USERD_get_block_coords_by_component
+        USERD_get_block_ghost_flags          (If ghost cells in part)
+        USERD_get_part_node_ids              (If node ids given)
+        USERD_get_part_element_ids_by_type   (If element ids given)
+
+        both again:
+        ----------
+        USERD_get_border_availability        (If border representation
+        USERD_get_border_elements_by_type     is selected)
+
+        USERD_stop_part_building      (only once when part builder
+                                       dialog is closed)
+
+7. Loading Variables
+          
+        constants:
+        ---------
+        USERD_set_time_set_and_step
+        USERD_get_constant_val
+          
+        scalars/vectors/tensors:
+        ------------------------
+        USERD_get_descrip_lines
+        USERD_set_time_set_and_step
+         <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+        USERD_get_var_by_component
+
+8. Changing geometry
+
+        changing coords only (per part):
+        --------------------
+        USERD_set_time_set_and_step
+        USERD_get_descrip_lines
+        USERD_get_part_coords
+        <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+        USERD_get_block_coords_by_component
+
+        changing connectivity (per part):
+        ---------------------
+        USERD_set_time_set_and_step
+        USERD_get_descrip_lines
+        USERD_get_number_of_model_parts
+        USERD_get_gold_part_build_info
+        USERD_get_ghosts_in_model_flag
+        USERD_get_get_ghosts_in_block_flag      (if any ghost cells in model)
+        USERD_get_model_extents   OR
+           USERD_get_part_coords  AND/OR
+           <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+           USERD_get_block_coords_by_component
+        USERD_get_part_element_ids_by_type
+        USERD_get_part_elements_by_type
+        USERD_get_part_coords
+        USERD_get_part_node_ids
+        USERD_get_block_iblanking
+        <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+        USERD_get_block_coords_by_component
+        USERD_get_block_ghost_flags          (If ghost cells in part)
+        USERD_get_part_node_ids              (If node ids given)
+        USERD_get_part_element_ids_by_type   (If element ids given)
+
+        USERD_get_border_availability        (If border representation
+        USERD_get_border_elements_by_type     is selected)
+
+  
+9. Node or Element queries over time
+
+        USERD_get_var_value_at_specific
+
+10. To see if materials in the model
+
+        USERD_get_number_of_material_sets
+        USERD_get_matf_set_info
+
+        If any material sets in the model (calls these once per material set):
+          USERD_get_number_of_materials
+          USERD_get_matf_var_info
+
+        For each elment type of each part containing material ids, calls:
+          USERD_size_matf_data
+          USERD_load_matf_data
+
+        If there are any elements with mixed materials, when a domain or
+        interface is created, calls these again per part:
+
+          USERD_size_matf_data
+          USERD_load_matf_data
+
+11. To modify the variable extraction parameters and have the variables
+    update accordingly.
+
+        USERD_get_var_extract_gui_numbers
+        USERD_get_var_extract_gui_defaults
+        USERD_set_var_extract_gui_data
+
+
+
+-----------------------
+Detailed Specifications
+-----------------------
+
+Include files:
+--------------
+The following header file is required in any file containing these library
+routines. 
+
+       #include "global_extern.h"
+
+And it references:
+
+       #include "global_extern_proto.h"
+
+
+
+*******************************************************************************
+****************************** Special Note ***********************************
+*******************************************************************************
+
+Make sure you use the proper define in the global_extern.h header file, namely:
+#define USERD_API_204
+
+Also, Make sure the api version in the USERD_get_reader_version routine is set
+to "2.04" or larger.
+
+Make sure your reader has access to the global_extern_proto.h   This is a new
+file which is accessed from the new global_extern.h
+
+*******************************************************************************
+*******************************************************************************
+
+
+Basis of arrays:
+---------------
+Unless explicitly stated otherwise, all arrays are zero based - in true C
+fashion.
+
+
+Global variables:
+----------------
+You will generally need to have a few global variables which are shared by
+the various library routines. The detailed specifications below have assumed
+the following are available.  (Their names describe their purpose, and they
+will be used in helping describe the details of the routines below).
+
+static int Numparts_available         = 0;
+static int Num_unstructured_parts     = 0;
+static int Num_structured_blocks      = 0;
+
+/* Note: Numparts_available = Num_unstructured_parts + Num_structured_blocks */
+
+static int Num_timesets               = 1;
+static int Current_timeset            = 1;
+static int Geom_timeset_number        = 1;
+
+static int Num_time_steps[Z_MAXSETS]  = 1;
+static int Current_time_step          = 0;
+static int Num_variables              = 0;
+static int Num_dataset_files          = 0;
+
+static int Server_Number              = 1;    Which server of
+static int Tot_Servers                = 1;    the total number of servers
+
+
+
+_________________________________________
+-----------------------------------------
+Library Routines (in alphabetical order):
+_________________________________________
+-----------------------------------------
+
+--------------------------------------------------------------------
+USERD_bkup
+
+   Description:
+   -----------
+   This routine is called during the EnSight archive process.  You can
+   use it to save or restore info relating to your user defined reader.
+
+   Specification:
+   -------------
+   int USERD_bkup(FILE *archive_file,
+                  int backup_type)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  archive_file         = The archive file pointer
+
+   (IN)  backup_type          = Z_SAVE_ARCHIVE for saving archive
+                                Z_REST_ARCHIVE for restoring archive
+
+   Notes:
+   -----
+   * Since EnSight's archive file is saved in binary form, you should
+     also do any writing to it or reading from it in binary.
+
+   * You should archive any variables, which will be needed for
+     future operations, that will not be read or computed again
+     before they will be needed.  These are typically global
+     variables.
+
+   * Make sure that the number of bytes that you write on a save and
+     the number of bytes that you read on a restore are identical!!
+
+   * If any of the variables you save are allocated arrays, you must
+     do the allocations before restoring into them.
+
+--------------------------------------------------------------------
+USERD_exit_routine
+
+   Description:
+   -----------
+   This routine is called as EnSight is exiting. It can be used to clean
+   up anything needed - such as removing temporary files, etc. - or can simply
+   be a dummy.
+
+   Specification:
+   -------------
+   void USERD_exit_routine( void )
+
+   Arguments:
+   ---------
+   none
+
+--------------------------------------------------------------------
+USERD_get_block_coords_by_component
+
+   Description:
+   -----------
+   Get the coordinates of a given structured block, a component at a time.
+
+   Specification:
+   -------------
+   int USERD_get_block_coords_by_component(int block_number,
+                                           int which_component,
+                                           float *coord_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  block_number            = The block part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  which_component         = Z_COMPX if x component wanted
+                                 = Z_COMPY if y component wanted
+                                 = Z_COMPZ if z component wanted
+
+   (OUT) coord_array             = 1D array containing x,y, or z
+                                   coordinate component of each node
+
+                                  (Array will have been allocated
+                                   i*j*k for the block long)
+
+   Notes:
+   -----
+   * Not called unless Num_structured_blocks is > 0
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_block_iblanking
+
+   Description:
+   -----------
+   Get the iblanking value at each node of a block (if the block is
+   iblanked).
+
+   Specification:
+   -------------
+   int USERD_get_block_iblanking(int block_number,
+                                 int *iblank_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  block_number            = The block part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) iblank_array            = 1D array containing iblank value
+                                   for each node.
+
+                                  (Array will have been allocated
+                                   i*j*k for the block long)
+
+          possible values are:   Z_EXT     = exterior
+                                 Z_INT     = interior
+                                 Z_BND     = boundary
+                                 Z_INTBND  = internal boundary
+                                 Z_SYM     = symmetry plane
+
+   Notes:
+   -----
+   * Not called unless Num_structured_blocks is > 0  and you have
+     some iblanked blocks
+
+   * Will be based on Current_time_step
+
+
+
+----------------------------------------------------------------------
+USERD_get_block_ghost_flags
+
+   Description:
+   -----------
+   Get the ghost_flags value at each element of a block containing ghost cells.
+
+   Specification:
+   -------------
+   int USERD_get_block_ghost_flags(int block_number,
+                                   int *ghost_flags)
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  block_number            = The block number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) ghost_flags             = 1D array containing ghost flag value
+                                     for each block cell.
+  
+                                    (Array will have been allocated
+                                     (i-1)*(j-1)*(k-1) for the block long)
+  
+            possible values are:    0  = non-ghost cell  (normal cell)
+                                   >0  = ghost cell
+  
+    Notes:
+    -----
+    * This routine is new in the 2.01 API
+
+    * This will be based on Current_time_step
+  
+    * Only called for structured "block" parts that have some ghost cells
+      as indicated by the USERD_get_ghost_in_block_flag.  The model must
+      of course also have been indicated to have some ghost cells in the
+      USERD_get_ghost_in_model_flag routine.
+  
+    * It is sufficient to set the value to be 1 to flag as a ghost cell,
+      but the value can be any non-zero value, so you could use it to
+      indicate which block or which server (for Server-of-server use) the
+      cell is actually in.
+
+
+
+--------------------------------------------------------------------
+USERD_get_border_availability
+
+   Description:
+   -----------
+   Finds out if border elements are provided by the reader for the
+   desired part, or will need to be computed internally by EnSight.
+
+   Specification:
+   -------------
+   int USERD_get_border_availability(int part_number,
+                                     int number_of_elements[Z_MAXTYPE])
+
+   Returns:
+   -------
+   Z_OK  if border elements will be provided by the reader.
+          (number_of_elements array will be loaded and
+           USERD_get_border_elements_by_type will be called)
+
+   Z_ERR if border elements are not available - thus EnSight must compute.
+          (USERD_get_border_elements_by_type will not be called)
+
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) number_of_elements     = 2D array containing number of
+                                  each type of border element in
+                                  the part.
+                                  ------------
+                                  Possible types are:
+
+                                Z_POINT   =  point
+                                Z_BAR02   =  2-noded bar
+                                Z_BAR03   =  3-noded bar
+                                Z_TRI03   =  3-noded triangle
+                                Z_TRI06   =  6-noded triangle
+                                Z_QUA04   =  4-noded quadrilateral
+                                Z_QUA08   =  8-noded quadrilateral
+
+   Notes:
+   -----
+   * Only called if border representation is used.
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_border_elements_by_type
+
+   Description:
+   -----------
+   Provides border element connectivity and parent information. 
+
+   Specification:
+   -------------
+   int USERD_get_border_elements_by_type(int part_number,
+                                         int element_type,
+                                         int **conn_array,
+                                         short *parent_element_type,
+                                         int *parent_element_num)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number           = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  element_type          = One of the following (See global_extern.h)
+                                 Z_POINT    node point element
+                                 Z_BAR02    2 node bar
+                                 Z_BAR03    3 node bar
+                                 Z_TRI03    3 node triangle
+                                 Z_TRI06    6 node triangle
+                                 Z_QUA04    4 node quad
+                                 Z_QUA08    8 node quad
+
+   (OUT) conn_array            = 2D array containing connectivity
+                                 of each border element of the type.
+
+                                (Array will have been allocated
+                                 num_of_elements of the type by
+                                 connectivity length of the type)
+
+                       ex) If number_of_elements[Z_TRI03] = 25
+                              number_of_elements[Z_QUA04] = 100
+                              number_of_elements[Z_QUA08] = 30
+                           as obtained in:
+                            USERD_get_border_availability
+
+                           Then the allocated dimensions available
+                           for this routine will be:
+                              conn_array[25][3]   when called with Z_TRI03
+
+                              conn_array[100][4]  when called with Z_QUA04
+
+                              conn_array[30][8]   when called with Z_QUA08
+
+   (OUT) parent_element_type   = 1D array containing element type of the
+                                 parent element (the one that the border
+                                 element is a face/edge of).
+
+                                (Array will have been allocated
+                                 num_of_elements of the type long)
+
+   (OUT) parent_element_num   = 1D array containing element number of the
+                                 parent element (the one that the border
+                                 element is a face/edge of).
+
+                                (Array will have been allocated
+                                 num_of_elements of the type long)
+
+   
+   Notes:
+   -----
+   * Not called unless USERD_get_border_availability returned Z_OK
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_changing_geometry_status
+
+   Description:
+   -----------
+   Gets the changing geometry status for the model
+
+   Specification:
+   -------------
+   int USERD_get_changing_geometry_status( void )
+
+   Returns:
+   -------
+   Z_STATIC        if geometry does not change
+   Z_CHANGE_COORDS if changing coordinates only
+   Z_CHANGE_CONN   if changing connectivity
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * EnSight does not support changing number of parts.  But the
+     coords and/or the connectivity of the parts can change.  Note that
+     a part is allowed to be empty (number of nodes and elements equal
+     to zero).
+
+
+--------------------------------------------------------------------
+USERD_get_constant_val
+
+   Description:
+   -----------
+   Get the value of a constant at a time step
+
+   Specification:
+   -------------
+   float USERD_get_constant_value(int which_var,
+                                  int imag_data)
+
+   Returns:
+   -------
+   Value of the requested constant variable
+
+   Arguments:
+   ---------
+   (IN)  which_var            = The variable number
+
+   (IN)  imag_data            = TRUE if want imaginary data value.
+                                FALSE if want real data value.
+
+   Notes:
+   -----
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_dataset_query_file_info
+
+   Description:
+   -----------
+   Get the information about files in the dataset.  Used for the
+   dataset query option within EnSight.
+
+   Specification:
+   -------------
+   int USERD_get_dataset_query_file_info(Z_QFILES *qfiles)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) qfiles   = Structure containing information about each file
+                    of the dataset. The Z_QFILES structure is defined
+                    in the global_extern.h file
+
+                   (The structure will have been allocated
+                    Num_dataset_files long, with 10 description
+                    lines per file).
+
+      qfiles[].name        = The name of the file
+                             (Z_MAXFILENP is the dimensioned length
+                              of the name)
+
+      qfiles[].sizeb       = The number of bytes in the file
+                             (Typically obtained with a call to the
+                              "stat" system routine) (Is a long)
+
+      qfiles[].timemod     = The time the file was last modified 
+                             (Z_MAXTIMLEN is the dimensioned length
+                              of this string)
+                             (Typically obtained with a call to the
+                              "stat" system routine)
+
+      qfiles[].num_d_lines = The number of description lines you
+                              are providing from the file. Max = 10
+
+      qfiles[].f_desc[]    = The description line(s) per file,
+                              qfiles[].num_d_lines of them
+                              (Z_MAXFILENP is the allocated length of
+                               each line)
+
+   Notes:
+   -----
+   * If Num_dataset_files is 0, this routine will not be called.
+     (See USERD_get_number_of_files_in_dataset)
+
+
+--------------------------------------------------------------------
+USERD_get_descrip_lines
+
+   Description:
+   -----------
+   Get two description lines associated with geometry per time step,
+   or one description line associated with a variable per time step.
+
+   Specification:
+   -------------
+   int USERD_get_descrip_lines(int which_type,
+                               int which_var,
+                               int imag_data,
+                               char line1[Z_BUFL],
+                               char line2[Z_BUFL])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  which_type           = Z_GEOM for geometry (2 lines)
+                              = Z_VARI for variable (1 line)
+
+   (IN)  which_var            = If it is a variable, which one.
+                                Ignored if geometry type.
+
+   (IN)  imag_data            = TRUE if want imaginary data file.
+                                FALSE if want real data file.
+
+   (OUT) line1                = The 1st geometry description line,
+                                or the variable description line.
+
+   (OUT) line2                = The 2nd geometry description line
+                                Not used if variable type.
+
+   Notes:
+   -----
+   * Will be based on Current_time_step
+
+   * These are the lines EnSight can echo to the screen in
+     annotation mode.
+
+
+
+--------------------------------------------------------------------
+USERD_get_element_label_status
+
+   Description:
+   -----------
+   Answers the question as to whether element labels will be provided.
+
+   Specification:
+   -------------
+   int USERD_get_element_label_status( void )
+
+   Returns:
+   -------
+   TRUE        if element labels will be provided
+   FALSE       if element labels will NOT be provided
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * element lables are needed in order to do any element querying, or
+     element labeling on-screen within EnSight.
+
+   * Prior to API 2.01:
+     -----------------
+       For unstructured parts, you can read them from your file if
+       available, or can assign them, etc. They need to be unique
+       per part, and are often unique per model.
+
+       API 1.0:
+         USERD_get_element_ids_for_part is used to obtain the ids,
+         on a part by part basis, if TRUE status is returned here.
+
+       API 2.0:
+         USERD_get_part_element_ids_by_type is used to obtain the ids,
+         on a per part, per type basis, if TRUE status is returned here.
+
+       For structured parts, EnSight will assign ids if you return a
+         status of TRUE here.  You cannot assign them youself!!
+
+   * Starting at API 2.01:
+     --------------------
+       For both unstructured and structured parts, you can read them
+       from your file if available, or can assign them, etc. They need
+       to be unique per part, and are often unique per model (especially
+       if you are dealing with a decomposed dataset).
+
+       USERD_get_part_element_ids_by_type is used to obtain the ids,
+       on an element type by part basis, if TRUE status is returned here.
+
+   * Will call USERD_get_part_element_ids_by_type for each type of
+     of each part if this routine returns TRUE.
+--------------------------------------------------------------------
+USERD_get_geom_timeset_number -
+
+   Description:
+   -----------
+    Gets the timeset number to be used for geometry
+
+   Specification:
+   -------------
+   int USERD_get_geom_timeset_number( void )
+
+   Returns:
+   -------
+   Geom_timeset_number = The timeset number that will be used for geometry.   
+                         For example, if USERD_get_number_of timesets
+                         returns 2, the valid timeset numbers would be
+                         1 or 2.
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   *  If your model is static, which you indicated by returning a zero
+      in USERD_get_number_of_timesets, you can return a zero here as well.
+
+
+
+--------------------------------------------------------------------
+USERD_get_gold_part_build_info
+
+   Description:
+   -----------
+   Gets the info needed for the part building process.
+
+   Specification:
+   -------------
+   int USERD_get_gold_part_build_info(int *part_id,
+                                      int *part_types,
+                                      char *part_description[Z_BUFL],
+                                      int *number_of_nodes,
+                                      int *number_of_elements[Z_MAXTYPE],
+                                      int *ijk_dimensions[9],
+                                      int *iblanking_options[6])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+    (OUT) part_id                = Array containing the external part
+                                   ids for each of the model parts.
+
+                                   IMPORTANT:
+                                    Parts numbers must be >= 1, because
+                                    of the way they are used in the GUI
+
+               *******************************************
+                The ids provided here are the numbers by
+                which the parts will be referred to in the
+                GUI (if possible). They are basically
+                labels as far as you are concerned.
+
+                Note: The part numbers you pass to routines
+                which receive a part_number or block_number
+                or which_part as an argument are the 1-based
+                table index of the parts!
+
+                example:  If Numparts_available = 3
+
+                          Table index        part_id
+                          -----------        -------
+                           1                  13
+                           2                  57
+                           3                  125
+
+                           ^                   ^
+                           |                   |
+                           |                    These are placed in:
+                           |                      part_id[0] = 13
+                           |                      part_id[1] = 57
+                           |                      part_id[2] = 125
+                           |                    for GUI labeling purposes.
+                           |
+                            These implied table indices are the part_number,
+                            block_number, or which_part numbers that you would
+                            pass to routines like:
+
+                           USERD_get_part_coords(int part_number,...
+                           USERD_get_part_node_ids(int part_number,...
+                           USERD_get_part_elements_by_type(int part_number,...
+                           USERD_get_part_element_ids_by_type(int part_number,...
+                           USERD_get_block_coords_by_component(int block_number,...
+                           USERD_get_block_iblanking(int block_number,...
+                           USERD_get_block_ghost_flags(int block_number,...
+                           USERD_get_ghosts_in_block_flag(int block_number)
+                           USERD_get_border_availability(int part_number,...
+                           USERD_get_border_elements_by_type(int part_number,...
+                           USERD_get_var_by_component(int which_variable,
+                                                      int which_part,...
+                           USERD_get_var_value_at_specific(int which_var,
+                                                           int which_node_or_elem,
+                                                           int which_part,...
+               ********************************************
+
+                                    (Array will have been allocated
+                                     Numparts_available long)
+
+   (OUT) part_types             = Array containing one of the
+                                  following for each model part:
+
+                                       Z_UNSTRUCTURED or
+                                       Z_STRUCTURED  or
+                                       Z_IBLANKED
+
+                                  (Array will have been allocated
+                                   Numparts_available long)
+
+   (OUT) part_description       = Array containing a description
+                                  for each of the model parts
+
+                                  (Array will have been allocated
+                                   Numparts_available by Z_BUFL
+                                   long)
+
+   (OUT) number_of_nodes        = Number of unstructured nodes in the part
+ 
+                                   (Array will have been allocated
+                                    Numparts_available long)
+
+   (OUT) number_of_elements     = 2D array containing number of
+                                  each type of element for each
+                                  unstructured model part.
+                                  ------------
+                                  Possible types are:
+
+                                Z_POINT   =  point
+                                Z_BAR02   =  2-noded bar
+                                Z_BAR03   =  3-noded bar
+                                Z_TRI03   =  3-noded triangle
+                                Z_TRI06   =  6-noded triangle
+                                Z_QUA04   =  4-noded quadrilateral
+                                Z_QUA08   =  8-noded quadrilateral
+                                Z_TET04   =  4-noded tetrahedron
+                                Z_TET10   = 10-noded tetrahedron
+                                Z_PYR05   =  5-noded pyramid
+                                Z_PYR13   = 13-noded pyramid
+                                Z_PEN06   =  6-noded pentahedron
+                                Z_PEN15   = 15-noded pentahedron
+                                Z_HEX08   =  8-noded hexahedron
+                                Z_HEX20   = 20-noded hexahedron
+
+                                Z_G_POINT =  ghost node point element
+                                Z_G_BAR02 =  2 node ghost bar
+                                Z_G_BAR03 =  3 node ghost bar
+                                Z_G_TRI03 =  3 node ghost triangle
+                                Z_G_TRI06 =  6 node ghost triangle
+                                Z_G_QUA04 =  4 node ghost quad
+                                Z_G_QUA08 =  8 node ghost quad
+                                Z_G_TET04 =  4 node ghost tetrahedron
+                                Z_G_TET10 = 10 node ghost tetrahedron
+                                Z_G_PYR05 =  5 node ghost pyramid
+                                Z_G_PYR13 = 13 node ghost pyramid
+                                Z_G_PEN06 =  6 node ghost pentahedron
+                                Z_G_PEN15 = 15 node ghost pentahedron
+                                Z_G_HEX08 =  8 node ghost hexahedron
+                                Z_G_HEX20 = 20 node ghost hexahedron
+
+                               (Ignored unless Z_UNSTRUCTURED type)
+
+                                  (Array will have been allocated
+                                   Numparts_available by
+                                   Z_MAXTYPE long)
+
+   (OUT) ijk_dimensions         = 2D array containing ijk dimension info
+                                  for structured blocks
+
+                                  For Z_UNSTRUCTURED - is ignored
+
+                                  For Z_STRUCTURED or Z_IBLANKED
+
+        Prior to version 2.03:
+        ----------------------
+                                   (Array will have been allocated
+                                    Numparts_available by 3 long)
+
+                              ijk_dimensions[][0] = I dimension
+                              ijk_dimensions[][1] = J dimension
+                              ijk_dimensions[][2] = K dimension
+
+
+        Starting at version 2.03:
+        ------------------------
+                                   (Array will have been allocated
+                                    Numparts_available by 9 long)
+
+                              There are two ways to do this:
+                              ------------------------------
+                              1. The simple one, without ranges.
+
+                                   This is good for all structured models
+                                   that will NOT be used in EnSight's
+                                   Server of Servers
+
+                                   Simply provide the ijk dimensions in the
+                                   first three slots and place a -1 in
+                                   the 4th slot.  (The remaining slots will
+                                   be ignored).
+
+                              Thus,
+                              ijk_dimensions[][0] = I dimension of block
+                              ijk_dimensions[][1] = J dimension of block
+                              ijk_dimensions[][2] = K dimension of block
+                              ijk_dimensions[][3] = -1
+
+                        (J planes)
+                            4 *-------*-------*
+                              |       |       |    ijk_dimension[0][0] = 3
+                              |       |       |    ijk_dimension[0][1] = 4
+                              |       |       |    ijk_dimension[0][2] = 1
+                            3 *-------*-------*
+                              |       |       |    ijk_dimension[0][4] = -1
+                              |       |       |
+                              |       |       |
+                            2 *-------*-------*
+                              |       |       |
+                              |       |       |
+                              |       |       |
+                            1 *-------*-------*
+                              1       2       3  (I planes)
+
+
+
+                              2. Using ranges.
+
+                                  This one can be used anytime, but MUST
+                                  be used if EnSight's Server of Servers
+                                  is to be used!
+
+                                  The first 3 slots contain the ijk dimension
+                                  of the complete block (of which this may be
+                                  a portion).  The last 6 slots contain the
+                                  ijk min and max ranges within the complete.
+
+                              Thus,
+                              ijk_dimensions[][0] = I dim of complete block
+                              ijk_dimensions[][1] = J dim of complete block
+                              ijk_dimensions[][2] = K dim of complete block
+
+                              ijk_dimensions[][3] = Imin of portion (1-based)
+                              ijk_dimensions[][4] = Imax of portion (1-based)
+                              ijk_dimensions[][5] = Jmin of portion (1-based)
+                              ijk_dimensions[][6] = Jmax of portion (1-based)
+                              ijk_dimensions[][7] = Kmin of portion (1-based)
+                              ijk_dimensions[][8] = Kmax of portion (1-based)
+
+
+                              example1: (Model has one part, a simple 2D block,
+                                         and want whole thing)
+
+                        (J planes)
+                            4 *-------*-------*
+                              |       |       |    ijk_dimension[0][0] = 3
+                              |       |       |    ijk_dimension[0][1] = 4
+                              |       |       |    ijk_dimension[0][2] = 1
+                            3 *-------*-------*
+                              |       |       |    ijk_dimension[0][3] = 1
+                              |       |       |    ijk_dimension[0][4] = 3
+                              |       |       |    ijk_dimension[0][5] = 1
+                            2 *-------*-------*    ijk_dimension[0][6] = 4
+                              |       |       |    ijk_dimension[0][7] = 1
+                              |       |       |    ijk_dimension[0][8] = 1
+                              |       |       |
+                            1 *-------*-------*
+                              1       2       3  (I planes)
+
+
+                              example2: (Want to have the block represented
+                                         in two portions - 2 parts)
+
+                        (J planes)                 top portion
+                            4 *-------*-------*
+                              |       |       |    ijk_dimension[0][0] = 3
+                              |       |       |    ijk_dimension[0][1] = 4
+                              |       |       |    ijk_dimension[0][2] = 1
+                            3 *-------*-------*
+                              .       .       .    ijk_dimension[0][3] = 1
+                              .       .       .    ijk_dimension[0][4] = 3
+                              .       .       .    ijk_dimension[0][5] = 3
+                            2 .................    ijk_dimension[0][6] = 4
+                              .       .       .    ijk_dimension[0][7] = 1
+                              .       .       .    ijk_dimension[0][8] = 1
+                              .       .       .
+                            1 .................
+                              1       2       3  (I planes)
+
+
+                        (J planes)                 bottom portion
+                            4 .................
+                              .       .       .    ijk_dimension[1][0] = 3
+                              .       .       .    ijk_dimension[2][1] = 4
+                              .       .       .    ijk_dimension[3][2] = 1
+                            3 *-------*-------*
+                              |       |       |    ijk_dimension[1][3] = 1
+                              |       |       |    ijk_dimension[1][4] = 3
+                              |       |       |    ijk_dimension[1][5] = 1
+                            2 *-------*-------*    ijk_dimension[1][6] = 3
+                              |       |       |    ijk_dimension[1][7] = 1
+                              |       |       |    ijk_dimension[1][8] = 1
+                              |       |       |
+                            1 *-------*-------*
+                              1       2       3  (I planes)
+
+
+        And note that if you were partioning this block for
+        EnSight's Server of Servers, you would only have one part,
+        instead of two.  Each SOS server would return its appropriate
+        ranges in the last 6 slots. The first 3 slots would remain constant.
+
+
+   (OUT) iblanking_options      = 2D array containing iblanking
+                                  options possible for each
+                                  structured model part.
+                                  ----------
+                                  (Ignored unless Z_IBLANKED type)
+
+                                  (Array will have been allocated
+                                   Numparts_available by 6 long)
+
+      iblanking_options[][Z_EXT]     = TRUE if external (outside)
+                       [][Z_INT]     = TRUE if internal (inside)
+                       [][Z_BND]     = TRUE if boundary
+                       [][Z_INTBND]  = TRUE if internal boundary
+                       [][Z_SYM]     = TRUE if symmetry surface
+
+
+   Notes:
+   -----
+   * If you haven't built a table of pointers to the different parts,
+     you might want to do so here as you gather the needed info.
+
+   * Will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_gold_variable_info
+
+   Description:
+   -----------
+   Get the variable descriptions, types and filenames
+
+   Specification:
+   -------------
+   int USERD_get_gold_variable_info(char **var_description,
+                                    char **var_filename,
+                                    int *var_type,
+                                    int *var_classify,
+                                    int *var_complex,
+                                    char **var_ifilename,
+                                    float *var_freq,
+                                    int *var_contran,
+                                    int *var_timeset)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) var_description      = Variable descriptions
+
+                                (Array will have been allocated
+                                 Num_variables by Z_BUFL long)
+
+           variable description restrictions:
+           ----------------------------------
+           1. Only first 19 characters used in EnSight.
+           2. Leading and trailing whitespace will be removed by EnSight.
+           3. Illegal characters will be replaced by underscores.
+           4. Thay may not start with a numeric digit.
+           4. No two variables may have the same description.
+
+
+   (OUT) var_filename         = Variable real filenames
+
+                                (Array will have been allocated
+                                 Num_variables by Z_BUFL long)
+
+   (OUT) var_type             = Variable type
+
+                                (Array will have been allocated
+                                 Num_variables long)
+
+                                types are:  Z_CONSTANT
+                                            Z_SCALAR
+                                            Z_VECTOR
+                                            Z_TENSOR
+                                            Z_TENSOR9
+
+   (OUT) var_classify         = Variable classification
+
+                                (Array will have been allocated
+                                 Num_variables long)
+
+                                types are:  Z_PER_NODE
+                                            Z_PER_ELEM
+
+   (OUT) var_complex          = TRUE if complex, FALSE otherwise
+ 
+                                (Array will have been allocated
+                                 Num_variables long)
+ 
+   (OUT) var_ifilename        = Variable imaginary filenames (if complex)
+ 
+                                (Array will have been allocated
+                                 Num_variables by Z_BUFL long)
+
+   (OUT) var_freq             = complex frequency  (if complex)
+ 
+                                (Array will have been allocated
+                                 Num_variables long)
+ 
+   (OUT) var_contran          = TRUE if constant changes per time step
+                                FALSE if constant truly same at all time steps
+ 
+                                (Array will have been allocated
+                                 Num_variables long)
+
+   (OUT) var_timeset          = Timeset the variable will use (1 based).
+                                (For static models, set it to 1)
+
+                                (Array will have been allocated
+                                 Num_variables long)
+
+                                 For example:  If USERD_get_number_of_timesets
+                                               returns 2, the valid
+                                               timeset_number's would be 1 or 2
+
+
+   Notes:
+   -----
+   * The implied variable numbers apply, but be aware that the
+     arrays are zero based.
+     So for variable 1, will need to provide   var_description[0]
+                                               var_filename[0]
+                                               var_type[0]
+                                               var_classify[0]
+                                               var_complex[0]
+                                               var_ifilename[0]
+                                               var_freq[0]
+                                               var_contran[0]
+                                               var_timeset[0]
+
+
+        for variable 2, will need to provide   var_description[1]
+                                               var_filename[1]
+                                               var_type[1]
+                                               var_classify[1]
+                                               var_complex[1]
+                                               var_ifilename[1]
+                                               var_freq[1]
+                                               var_contran[1]
+                                               var_timeset[1]
+              etc.
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_ghosts_in_block_flag
+
+   Description:
+   -----------
+   Gets whether ghost cells present in block or not
+
+   Specification:
+   -------------
+  int USERD_get_ghosts_in_block_flag(int block_number)
+
+   Returns:
+   -------
+   TRUE  if any ghost cells in this structured part
+   FALSE if no ghost cells in this structured part
+
+   Arguments:
+   ---------
+   (IN) block_number      = The block part number
+                              (1-based index of part table, namely:
+
+                                1 ... Numparts_available.
+
+                              It is NOT the part_id that
+                              is loaded in USERD_get_gold_part_build_info)
+
+   Notes:
+   -----
+    * This routine is new in the 2.01 API
+    * This will be based on Current_time_step
+  
+    * Intended for structured parts only, value will be ignored for
+      unstructured parts
+
+
+
+--------------------------------------------------------------------
+USERD_get_ghosts_in_model_flag
+
+   Description:
+   -----------
+   Answers the question as to whether any ghost cells in the model.
+
+   Specification:
+   -------------
+  int USERD_get_ghosts_in_model_flag( void )
+
+   Returns:
+   -------
+   TRUE  if any ghost cells in the model
+   FALSE if no ghost cells in the model
+
+   Arguments:
+   ---------
+  
+   Notes:
+   -----
+    * This routine is new in the 2.01 API
+
+-------------------------------------------------------------------------
+USERD_get_matf_set_info
+
+   Description:
+   -----------
+   Get the material set ids and names
+
+   Specification:
+   -------------
+   int USERD_get_matf_set_info(int *mat_set_ids,
+                               char **mat_set_name)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) mat_set_ids  = 1D material set ids array
+
+                               (Array will have been allocated
+                                Num_material_sets long)
+
+   (OUT) mat_set_name = 2D material set name array
+
+                               (Array will have been allocated
+                                Num_material_sets by Z_BUFL long)
+
+   Notes:
+   -----
+   * Will not be called if Num_material_sets is zero
+   * See USERD_get_number_of_material_sets header for explanatory example
+
+
+--------------------------------------------------------------------
+USERD_get_matf_var_info
+
+   Description:
+   -----------
+   Gets the material ids and descriptions for the material set
+
+   Specification:
+   -------------
+   int USERD_get_matf_var_info(int set_index,
+                               int *mat_ids,
+                               char **mat_desc)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  set_index               = the material set index (zero based)
+
+   (OUT) mat_ids[set_index]      = 1D integer array containing the material
+                                   ids to associated with each material
+
+                                    (Array will have been allocated
+                                     Num_materials[set_index] long)
+
+   (OUT) mat_desc[set_index]     = 2D char array containing the material
+                                   descriptions to associated with each material
+
+                                    (Array will have been allocated
+                                     Num_materials[set_index] by Z_BUFL long)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero, or
+     Num_materials[set_index] is zero
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_maxsize_info
+
+   Description:
+   -----------
+   Gets maximum part sizes for efficient memory allocation.
+
+   Transient models (especially those that increase in size) can cause
+   reallocations, at time step changes, to keep chewing up more and
+   more memory.   The way to avoid this is to know what the maximum
+   size of such memory will be, and allocate for this maximum initially.
+
+   Accordingly, if you choose to provide this information (it is optional),
+   EnSight will take advantage of it.
+
+
+   Specification:
+   -------------
+   int USERD_get_maxsize_info(int *max_number_of_nodes,
+                              int *max_number_of_elements[Z_MAXTYPE],
+                              int *max_ijk_dimensions[3])
+
+   Returns:
+   -------
+   Z_OK  if supplying maximum data
+   Z_ERR if not supplying maximum data, or some error occurred
+           while trying to obtain it.
+
+   Arguments:
+   ---------
+   (OUT) max_number_of_nodes    = Maximum number of unstructured nodes
+                                  in the part (over all time).
+ 
+                                   (Array will have been allocated
+                                    Numparts_available long)
+
+   (OUT) max_number_of_elements = 2D array containing maximum number of
+                                  each type of element for each
+                                  unstructured model part (over all time).
+                                  ------------
+                                  Possible types are:
+
+                                Z_POINT   =  point
+                                Z_BAR02   =  2-noded bar
+                                Z_BAR03   =  3-noded bar
+                                Z_TRI03   =  3-noded triangle
+                                Z_TRI06   =  6-noded triangle
+                                Z_QUA04   =  4-noded quadrilateral
+                                Z_QUA08   =  8-noded quadrilateral
+                                Z_TET04   =  4-noded tetrahedron
+                                Z_TET10   = 10-noded tetrahedron
+                                Z_PYR05   =  5-noded pyramid
+                                Z_PYR13   = 13-noded pyramid
+                                Z_PEN06   =  6-noded pentahedron
+                                Z_PEN15   = 15-noded pentahedron
+                                Z_HEX08   =  8-noded hexahedron
+                                Z_HEX20   = 20-noded hexahedron
+
+                                Z_G_POINT =  ghost node point element
+                                Z_G_BAR02 =  2 node ghost bar
+                                Z_G_BAR03 =  3 node ghost bar
+                                Z_G_TRI03 =  3 node ghost triangle
+                                Z_G_TRI06 =  6 node ghost triangle
+                                Z_G_QUA04 =  4 node ghost quad
+                                Z_G_QUA08 =  8 node ghost quad
+                                Z_G_TET04 =  4 node ghost tetrahedron
+                                Z_G_TET10 = 10 node ghost tetrahedron
+                                Z_G_PYR05 =  5 node ghost pyramid
+                                Z_G_PYR13 = 13 node ghost pyramid
+                                Z_G_PEN06 =  6 node ghost pentahedron
+                                Z_G_PEN15 = 15 node ghost pentahedron
+                                Z_G_HEX08 =  8 node ghost hexahedron
+                                Z_G_HEX20 = 20 node ghost hexahedron
+
+                               (Ignored unless Z_UNSTRUCTURED type)
+
+                                  (Array will have been allocated
+                                   Numparts_available by
+                                   Z_MAXTYPE long)
+
+   (OUT) max_ijk_dimensions  = 2D array containing maximum ijk dimensions
+                               for each structured model part (over all time).
+                                           ----------
+                                (Ignored if Z_UNSTRUCTURED type)
+
+                                (Array will have been allocated
+                                 Numparts_available by 3 long)
+
+                             max_ijk_dimensions[][0] = maximum I dimension
+                             max_ijk_dimensions[][1] = maximum J dimension
+                             max_ijk_dimensions[][2] = maximum K dimension
+
+   Notes:
+   -----
+   * You need to have first called USERD_get_number_of_model_parts and
+     USERD_get_gold_part_build_info, so Numparts_available is known and
+     so EnSight will know what the type is (Z_UNSTRUCTURED, Z_STRUCTURED,
+     or Z_IBLANKED) of each part.
+
+   * This will NOT be based on Current_time_step - it is to be the maximum
+     values over all time!!
+
+   * This information is optional.  If you return Z_ERR, Ensight will still
+     process things fine, reallocating as needed, etc.  However, for
+     large transient models you will likely use considerably more memory
+     and take more processing time for the memory reallocations. So, if it
+     is possible to provide this information "up front", it is recommended
+     to do so.
+
+
+--------------------------------------------------------------------
+USERD_get_model_extents
+
+   Description:
+   -----------
+   Gets the model bounding box extents.  If this routine supplys them
+   EnSight will not have to spend time doing so.  If this routine
+   returns Z_ERR, EnSight will have to take the time to touch all the
+   nodes and gather the extent info.
+
+   Specification:
+   -------------
+   int USERD_get_model_extents(float extents[6])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful  (whereupon EnSight will determine by reading
+                             all coords of all parts)
+
+   Arguments:
+   ---------
+   (OUT) extents[0]   = min x
+                [1]   = max x
+                [2]   = min y
+                [3]   = max y
+                [4]   = min z
+                [5]   = max z
+
+   Notes:
+   -----
+   * This will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_name_of_reader
+
+   Description:
+   -----------
+   Gets the name of your user defined reader.  The user interface will
+   ask for this and include it in the available reader list.
+
+   Specification:
+   -------------
+   int USERD_get_name_of_reader(char reader_name[Z_MAX_USERD_NAME],
+				int *two_fields)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) reader_name          = the name of the your reader or data format.
+                              (max length is Z_MAX_USERD_NAME, which is 20)
+
+   (OUT) two_fields          = FALSE if only one data field is      
+                                      required.                      
+                                TRUE if two data fields required     
+ 
+                                -1   if one field (Geom) required 
+                                     and one field (Param) is optional
+                                     Param field can contain any text
+                                     for example a file name, modifiers,
+                                     etc. that can be used to modify the
+                                     reader's behavior.
+ 
+
+   Notes:
+   -----
+   * Always called.  Please be sure to provide a name for your custom
+     reader format.
+
+--------------------------------------------------------------------
+USERD_get_nfaced_conn
+
+   Description:
+   -----------
+   Gets the array containing the connectivity of nsided faces of nfaced elements
+
+   Specification:
+   -------------int
+   int USERD_get_nfaced_conn(int part_number,
+                             int *nfaced_conn_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number        = the part number
+
+   (OUT) nfaced_conn_array  = 1D array of nsided face connectivies of nfaced
+                              elements
+
+                              (int array will have been allocated long enough to
+                               hold all the nsided face connectivities. Which is
+                               the sum of all the nodes per face values in the
+                               nfaced_npf_array of USERD_get_nfaced_nodes_per_face)
+
+   Notes:
+   -----
+ * Will not be called unless there are some nfaced elements in the part
+
+ * Providing nfaced information to Ensight:
+
+     1. In USERD_get_gold_part_build_info, provide the number of nfaced
+        polyhedral elements in the part.
+
+     2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+        the number of faces per nfaced element. (as if connectivity
+        length of an nfaced element is one)
+
+     3. In this routine, provide the streamed number of nodes per face
+        for each of the faces of the nfaced elements.
+
+
+     Simple example:         11        10   12
+                            +--------+-----+
+     2 nfaced elements:    /|        |\   /|
+     (1 7-faced           / |        | \ / |
+      1 5-sided)         /  |        |  +9 |
+                        /   |        | /|  |
+                       /7   |      8 /  |  |
+                      +-----------+/ |  |  |
+                      |     |5    |  |4 |  |6
+                      |     +-----|--+--|--+
+                      |    /      |   \ | /
+                      |   /       |    \|/3
+                      |  /        |     +
+                      | /         |    /
+                      |/1         |2 /
+                      +-----------+/
+
+      1. In USERD_get_gold_part_build_info:
+              number_of_elements[Z_NFACED] = 2
+                                             .
+                                            /|\
+                                             |
+      2. In USERD_get_part_elements_by_type:
+          length of conn_array will be:      2 x 1
+          for element_type of Z_NFACED:
+              conn_array[0][0] = 7           (for the 7-faced element)
+              conn_array[1][0] = 5           (for the 5-faced element)
+
+                                ==
+                           Sum  12    <---------+
+                                                |
+      3. In USERD_get_faced_nodes_per_face:     |
+           length of nfaced_npf_array will be:  12
+
+            nfaced_npf_array[0]  = 5  (5-noded top face of 7-faced element)
+            nfaced_npf_array[1]  = 5  (5-noded bot face of 7-faced element)
+            nfaced_npf_array[2]  = 4  (4-noded front face of 7-faced element)
+            nfaced_npf_array[3]  = 4  (4-noded left face of 7-faced element)
+            nfaced_npf_array[4]  = 4  (4-noded back face of 7-faced element)
+            nfaced_npf_array[5]  = 4  (4-noded right front face of 7-faced element)
+            nfaced_npf_array[6]  = 4  (4-noded right back face of 7-faced element)
+
+            nfaced_npf_array[7]  = 3  (3-noded top face of 5-faced element)
+            nfaced_npf_array[8]  = 3  (3-noded bot face of 5-faced element)
+            nfaced_npf_array[9]  = 4  (4-noded back face of 5-faced element)
+            nfaced_npf_array[10] = 4  (4-noded right face of 5-faced element)
+            nfaced_npf_array[11] = 4  (4-noded left front face of 5-faced element)
+
+                                   ==
+                             Sum   48   <-------------+
+                                                      |
+      4. In this function:                            |
+            length of the nfaced_conn_array will be:  48
+
+            nsided_conn_array[0] = 7   (conn of 5-noded top face of 7-faced elem)
+            nsided_conn_array[1] = 8
+            nsided_conn_array[2] = 9
+            nsided_conn_array[3] = 10
+            nsided_conn_array[4] = 11
+
+            nsided_conn_array[5] = 1   (conn of 5-noded bot face of 7-faced elem)
+            nsided_conn_array[6] = 5
+            nsided_conn_array[7] = 4
+            nsided_conn_array[8] = 3
+            nsided_conn_array[9] = 2
+
+            nsided_conn_array[10] = 1  (conn of 4-noded front face of 7-faced elem)
+            nsided_conn_array[11] = 2
+            nsided_conn_array[12] = 8
+            nsided_conn_array[13] = 7
+
+            nsided_conn_array[14] = 5  (conn of 4-noded left face of 7-faced elem)
+            nsided_conn_array[15] = 1
+            nsided_conn_array[16] = 7
+            nsided_conn_array[17] = 11
+
+            nsided_conn_array[18] = 4  (conn of 4-noded back face of 7-faced elem)
+            nsided_conn_array[19] = 5
+            nsided_conn_array[20] = 11
+            nsided_conn_array[21] = 10
+
+            nsided_conn_array[22] = 2  (conn of 4-noded right front face of 7-faced)
+            nsided_conn_array[23] = 3
+            nsided_conn_array[24] = 9
+            nsided_conn_array[25] = 8
+
+            nsided_conn_array[26] = 3  (conn of 4-noded right back face of 7-faced)
+            nsided_conn_array[27] = 4
+            nsided_conn_array[28] = 10
+            nsided_conn_array[29] = 9
+
+            nsided_conn_array[30] = 9  (conn of 3-noded top face of 5-faced elem)
+            nsided_conn_array[32] = 12
+            nsided_conn_array[32] = 10
+
+            nsided_conn_array[33] = 3  (conn of 3-noded bot face of 5-faced elem)
+            nsided_conn_array[34] = 4
+            nsided_conn_array[35] = 6
+
+            nsided_conn_array[36] = 6  (conn of 4-noded back face of 5-faced elem)
+            nsided_conn_array[37] = 4
+            nsided_conn_array[38] = 10
+            nsided_conn_array[39] = 12
+
+            nsided_conn_array[40] = 3  (conn of 4-noded right face of 5-faced elem)
+            nsided_conn_array[41] = 6
+            nsided_conn_array[42] = 12
+            nsided_conn_array[43] = 9
+
+            nsided_conn_array[44] = 4  (conn of 4-noded left front face of 5-faced)
+            nsided_conn_array[45] = 3
+            nsided_conn_array[46] = 9
+            nsided_conn_array[47] = 10
+
+
+
+--------------------------------------------------------------------
+USERD_get_nfaced_nodes_per_face -
+
+   Description:
+   -----------
+   Gets the array containing the number of nodes per face for each face
+   of the nfaced elements.
+
+   Specification:
+   -------------
+   int USERD_get_nfaced_nodes_per_face(int part_number,
+                                       int *nfaced_npf_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number       = the part number
+
+   (OUT) nfaced_npf_array  = 1D array of nodes per face for all faces of
+                             nfaced elements
+
+                             (int array will have been allocated long enough
+                              to hold all the nodes_per_face values. Which is
+                              the sum of all the number of faces per element
+                              values in the conn_array of
+                              USERD_get_part_elements_by_type)
+
+   Notes:
+   -----
+   * Will not be called unless there are some nfaced elements in the
+     the part
+
+   * Providing nfaced information to Ensight:
+
+     1. In USERD_get_gold_part_build_info, provide the number of nfaced
+        polyhedral elements in the part.
+
+     2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+        the number of faces per nfaced element. (as if connectivity
+        length of an nfaced element is one)
+
+     3. In this routine, provide the streamed number of nodes per face
+        for each of the faces of the nfaced elements.
+
+
+     Simple example:         11        10   12
+                            +--------+-----+
+     2 nfaced elements:    /|        |\   /|
+     (1 7-faced           / |        | \ / |
+      1 5-sided)         /  |        |  +9 |
+                        /   |        | /|  |
+                       /7   |      8 /  |  |
+                      +-----------+/ |  |  |
+                      |     |5    |  |4 |  |6
+                      |     +-----|--+--|--+
+                      |    /      |   \ | /
+                      |   /       |    \|/3
+                      |  /        |     +
+                      | /         |    /
+                      |/1         |2 /
+                      +-----------+/
+
+      1. In USERD_get_gold_part_build_info:
+              number_of_elements[Z_NFACED] = 2
+                                             .
+                                            /|\
+                                             |
+      2. In USERD_get_part_elements_by_type:
+          length of conn_array will be:      2 x 1
+          for element_type of Z_NFACED:
+              conn_array[0][0] = 7           (for the 7-faced element)
+              conn_array[1][0] = 5           (for the 5-faced element)
+
+                                ==
+                           Sum  12    <---------+
+                                                |
+      3. In this routine:                       |
+           length of nfaced_npf_array will be:  12
+
+            nfaced_npf_array[0]  = 5  (5-noded top face of 7-faced element)
+            nfaced_npf_array[1]  = 5  (5-noded bot face of 7-faced element)
+            nfaced_npf_array[2]  = 4  (4-noded front face of 7-faced element)
+            nfaced_npf_array[3]  = 4  (4-noded left face of 7-faced element)
+            nfaced_npf_array[4]  = 4  (4-noded back face of 7-faced element)
+            nfaced_npf_array[5]  = 4  (4-noded right front face of 7-faced element)
+            nfaced_npf_array[6]  = 4  (4-noded right back face of 7-faced element)
+
+            nfaced_npf_array[7]  = 3  (3-noded top face of 5-faced element)
+            nfaced_npf_array[8]  = 3  (3-noded bot face of 5-faced element)
+            nfaced_npf_array[9]  = 4  (4-noded back face of 5-faced element)
+            nfaced_npf_array[10] = 4  (4-noded right face of 5-faced element)
+            nfaced_npf_array[11] = 4  (4-noded left front face of 5-faced element)
+
+                                   ==
+                             Sum   48   <-------------+
+                                                      |
+      4. In USERD_get_nfaced_conn:                    |
+            length of the nfaced_conn_array will be:  48
+
+            nsided_conn_array[0] = 7   (conn of 5-noded top face of 7-faced elem)
+            nsided_conn_array[1] = 8
+            nsided_conn_array[2] = 9
+            nsided_conn_array[3] = 10
+            nsided_conn_array[4] = 11
+
+            nsided_conn_array[5] = 1   (conn of 5-noded bot face of 7-faced elem)
+            nsided_conn_array[6] = 5
+            nsided_conn_array[7] = 4
+            nsided_conn_array[8] = 3
+            nsided_conn_array[9] = 2
+
+            nsided_conn_array[10] = 1  (conn of 4-noded front face of 7-faced elem)
+            nsided_conn_array[11] = 2
+            nsided_conn_array[12] = 8
+            nsided_conn_array[13] = 7
+
+            nsided_conn_array[14] = 5  (conn of 4-noded left face of 7-faced elem)
+            nsided_conn_array[15] = 1
+            nsided_conn_array[16] = 7
+            nsided_conn_array[17] = 11
+
+            nsided_conn_array[18] = 4  (conn of 4-noded back face of 7-faced elem)
+            nsided_conn_array[19] = 5
+            nsided_conn_array[20] = 11
+            nsided_conn_array[21] = 10
+
+            nsided_conn_array[22] = 2  (conn of 4-noded right front face of 7-faced)
+            nsided_conn_array[23] = 3
+            nsided_conn_array[24] = 9
+            nsided_conn_array[25] = 8
+
+            nsided_conn_array[26] = 3  (conn of 4-noded right back face of 7-faced)
+            nsided_conn_array[27] = 4
+            nsided_conn_array[28] = 10
+            nsided_conn_array[29] = 9
+
+            nsided_conn_array[30] = 9  (conn of 3-noded top face of 5-faced elem)
+            nsided_conn_array[32] = 12
+            nsided_conn_array[32] = 10
+
+            nsided_conn_array[33] = 3  (conn of 3-noded bot face of 5-faced elem)
+            nsided_conn_array[34] = 4
+            nsided_conn_array[35] = 6
+
+            nsided_conn_array[36] = 6  (conn of 4-noded back face of 5-faced elem)
+            nsided_conn_array[37] = 4
+            nsided_conn_array[38] = 10
+            nsided_conn_array[39] = 12
+
+            nsided_conn_array[40] = 3  (conn of 4-noded right face of 5-faced elem)
+            nsided_conn_array[41] = 6
+            nsided_conn_array[42] = 12
+            nsided_conn_array[43] = 9
+
+            nsided_conn_array[44] = 4  (conn of 4-noded left front face of 5-faced)
+            nsided_conn_array[45] = 3
+            nsided_conn_array[46] = 9
+            nsided_conn_array[47] = 10
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_node_label_status
+
+   Description:
+   -----------
+   Answers the question as to whether node labels will be provided.
+
+   Specification:
+   -------------
+   int USERD_get_node_label_status( void )
+
+   Returns:
+   -------
+   TRUE        if node labels will be provided
+   FALSE       if node labels will NOT be provided
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * Node ids are needed in order to do any node querying, or node
+     labeling on-screen within EnSight.
+
+   * Prior to API 2.01:
+     -----------------
+       For unstructured parts, you can read them from your file if
+       available, or can assign them, etc. They need to be unique
+       per part, and are often unique per model.  They must also be
+       positive numbers greater than zero.
+
+         USERD_get_part_node_ids is used to obtain the ids, if the
+         status returned here is TRUE.
+
+         (Unlike API 1.0, where the connectivity of elements had to be
+          according to the node ids - API 2.0's element connectivities
+          are not affected either way by the status here.)
+
+       For structured parts, EnSight will assign ids if you return a
+         status of TRUE here.  You cannot assign them yourself!!
+
+   * Starting at API 2.01:
+     --------------------
+       For both unstructured and structured parts, you can read them
+       from your file if available, or can assign them, etc. They need
+       to be unique per part, and are often unique per model. They must
+       also be positive numbers greater than zero.
+
+       USERD_get_part_node_ids is used to obtain the ids, if the
+       status returned here is TRUE.
+
+   * Will call USERD_get_part_node_ids for each part if this routine
+     returns TRUE.
+
+--------------------------------------------------------------------
+USERD_get_nsided_conn -
+
+   Description:
+   -----------
+   Gets the array containing the connectivity of nsided elements
+
+   Specification:
+   -------------
+   int USERD_get_nsided_conn(int part_number,
+                             int *nsided_conn_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number         = the part number
+
+   (OUT) nsided_conn_array   = 1D array of nsided connectivies
+
+                               (int array will have been allocated long enough
+                                to hold all the nsided connectivities. Which is
+                                the sum of all the nodes_per_element values in
+                                the conn_array of USERD_get_part_elements_by_type)
+
+
+   Notes:
+   -----
+   * Will not be called unless there are some nsided elements in the the part.
+
+   * Providing nsided information to Ensight:
+
+     1. In USERD_get_gold_part_build_info, provide the number of nsided
+        elements in the part.
+
+     2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+        the number of nodes per nsided element. (as if connectivity
+        length of an nsided element is one)
+
+     3. In this routine, provide the streamed connectivities for each of the
+        nsided elements.
+
+
+     Simple example:         5        6
+                            +--------+
+     3 nsided elements:    /|         \
+     (1 4-sided           / |          \
+      1 3-sided          /  |           \
+      1 7-sided)        /   |            \ 7
+                       /3   |4            +
+                      +-----+             |
+                      |     |             |
+                      |     |             |8
+                      |     |             +
+                      |     |            /
+                      |     |           /
+                      |     |          /
+                      |1    |2        /9
+                      +-----+--------+
+
+      1. In USERD_get_gold_part_build_info:
+              number_of_elements[Z_NSIDED] = 3
+                                             .
+                                            /|\
+                                             |
+      2. In USERD_get_part_elements_by_type:
+          length of conn_array will be:      3 x 1
+
+          for element_type of Z_NSIDED:
+              conn_array[0][0] = 4           (for the 4-sided element)
+              conn_array[1][0] = 3           (for the 3-sided element)
+              conn_array[2][0] = 7           (for the 7-sided element)
+
+                           Sum  ===
+                                 14    <---------+
+                                                 |
+      3. In this routine:                        |
+           length of nsided_conn_array will be:  14
+
+              nsided_conn_array[0]  = 1      (connectivity of 4-sided element)
+              nsided_conn_array[1]  = 2
+              nsided_conn_array[2]  = 4
+              nsided_conn_array[3]  = 3
+
+              nsided_conn_array[4]  = 3      (connectivity of 3-sided element)
+              nsided_conn_array[5]  = 4
+              nsided_conn_array[6]  = 5
+
+              nsided_conn_array[7]  = 2      (connectivity of 7-sided element)
+              nsided_conn_array[8]  = 9
+              nsided_conn_array[9]  = 8
+              nsided_conn_array[10] = 7
+              nsided_conn_array[11] = 6
+              nsided_conn_array[12] = 5
+              nsided_conn_array[13] = 4
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_num_of_time_steps
+
+   Description:
+   -----------
+   Gets the number of time steps of data available for desired timeset.
+
+   Specification:
+   -------------
+   int USERD_get_num_of_time_steps( int timeset_number )
+
+   Returns:
+   -------
+   Number of time steps in timeset  (>0 if okay, <=0 if problems).
+
+   Arguments:
+   ---------
+   (IN) timeset number = the timeset number
+
+                         For example: If USERD_get_number_of_timesets
+                                      returns 2, the valid
+                                      timeset_number's would be 1 and 2
+
+   Notes:
+   -----
+   * This should be >= 1       1 indicates a static model
+                              >1 indicates a transient model
+
+   * Num_time_steps[timeset_number] would be set here
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_files_in_dataset
+
+   Description:
+   -----------
+   Get the total number of files in the dataset.  Used for the
+   dataset query option within EnSight.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_files_in_dataset( void )
+
+   Returns:
+   -------
+   The total number of files in the dataset.
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * You can be as complete as you want about this.  If you don't
+     care about the dataset query option, return a value of 0
+     If you only want certain files, you can just include them. But,
+     you will need to supply the info in USERD_get_dataset_query_file_info
+     for each file you include here.
+
+   * Num_dataset_files would be set here
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_material_sets -
+
+   Description:
+   -----------
+   Get the number of material sets in the model
+
+   Specification:
+   -------------
+   int USERD_get_number_of_material_sets( void )
+
+
+   Returns:
+   -------
+   Num_material_sets = number of material sets
+                       (Zero would indicate that you have no materials
+                        to deal with in the model)
+
+                       or
+
+                       -1 if an error condition
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+  * You may want to keep this as a global for use in other routines.
+
+   ###############################################################
+   NOTE:  For EnSight 7.6, only one material set is supported
+          within EnSight.
+          Thus the only valid returns here are:
+               0 (no materials)
+               1 (for the one material set allowed)
+          or  -1 (if an error)
+
+          If the casefile has more than this, this reader will
+          read them, but EnSight will issue an error message and
+          choke on them!
+   ###############################################################
+
+  ================================================================
+  A very simple explanatory example, to use as a reference for the
+  materials routines:
+
+  Given a 2D mesh composed of 9 quad (Z_QUA04) elements, with two materials.
+  Most of the model is material 1, but the top left corner is material 9 -
+  basically as shown:
+
+
+        *--------*--------*--------*
+        |        |   /    |        |
+        |     Mat 9 /     |        |
+        |        | /      |        |
+        |        |/       |        |
+        |  e7    /   e8   |   e9   |
+        |       /|        |        |
+        |      / |        |        |
+        |     /  |        |        |
+        *----/---*--------*--------*
+        |   /    |        |        |
+        |  /     |        |        |
+        | /      |      Mat 1      |
+        |/       |        |        |
+        |   e4   |   e5   |   e6   |
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        *--------*--------*--------*
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        |   e1   |   e2   |   e3   |
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        *--------*--------*--------*
+
+
+  Thus, in this routine, set:
+    Num_material_sets = 1
+
+  In USERD_get_matf_set_info, set:
+    mat_set_ids[0]    = 1
+    mat_set_name[0]   = "Material Set 1"  (or whatever name desired)
+
+  In USERD_get_number_of_materials, input would be set_index = 0, and
+  would need to set:
+    Num_materials[0] = 2
+
+  For simplicity, the ids and descriptions that would be returned in
+  USERD_get_matf_var_info could be:
+    mat_ids[0] = 1
+    mat_ids[1] = 9
+    mat_desc[0] = "mat 1"   (or whatever desired)
+    mat_desc[2] = "mat 9"
+
+  The per element material ids list would need to be:
+
+     material ids:
+     -------------
+     ids_list[0] = 1  (material id 1, for elem e1)
+     ids_list[1] = 1  (     "                  e2)
+     ids_list[2] = 1  (     "                  e3)
+     ids_list[3] = -1 (negative of index into mixed-material id list, for elem e4)
+     ids_list[5] = 1  (material id 1, for elem e5)
+     ids_list[5] = 1  (     "                  e6)
+     ids_list[5] = -5 (negative of index into mixed-material id list, for elem e7)
+     ids_list[5] = -9 (     "                  e8)
+     ids_list[5] = 1  (material id 1, for elem e9)
+
+  Finally we need the mixed material ids list and the mixed materials values list,
+  which would need to be:
+
+       mixed-material ids:
+       -------------------
+   ==> 1  ids_list[0]  =  2  (the -1 in the material variable points here,
+                                      2 indicates that two materials are present)
+       2  ids_list[1]  =  1  (1st material is 1)
+       3  ids_list[2]  =  9  (2nd material is 9)
+       4  ids_list[3]  = -1  (negative of index into mixed-material val_list)
+   ==> 5  ids_list[4]  =  2  (the -5 in the material variable points here,
+                                      2 indicates that two materials are present)
+       6  ids_list[5]  =  1  (1st material is 1)
+       7  ids_list[6]  =  9  (2nd material is 9)
+       8  ids_list[7]  = -3  (negative of index into mixed-material val_list)
+   ==> 9  ids_list[8]  =  2     etc.
+       10 ids_list[9]  =  1
+       11 ids_list[10] =  9
+       12 ids_list[11] = -5
+
+       mixed-material values:
+       ----------------------
+   ==> 1 val_list[0] = 0.875 (the -1 in the  mixed-material ids_list points here,
+                                       and this is the value for material 1)
+       2 val_list[1] = 0.125 (the value for material 9)
+   ==> 3 val_list[2] = 0.125 (the -3 in the mixed-materials ids_list points here)
+       4 val_list[3] = 0.875
+   ==> 5 val_list[4] = 0.875 (the -5 in the mixed-materials ids_list points here)
+       6 val_list[5] = 0.125
+
+  So, USERD_size_matf_data would need to return
+       matf_size = 8, when called with set_id    = 1
+                                       part_id   = 1
+                                       wtyp      = Z_QUA04
+                                       mat_type  = Z_MAT_INDEX
+
+       matf_size = 12, when called with set_id   = 1
+                                        part_id  = 1
+                                        mat_type = Z_MIX_INDEX
+
+                 = 6, when called with set_id   = 1
+                                       part_id  = 1
+                                       mat_type = Z_MIX_VALUE
+
+  And, USERD_load_matf_data would need to return:
+    the int array ids_list as shown above when called with:
+       set_id   = 1
+       part_id  = 1
+       wtyp     = Z_QUA04
+       mat_type = Z_MAT_INDEX (indicating id list).
+
+    the int array ids_list as shown above when called with:
+       set_id   = 1
+       part_id  = 1
+       mat_type = Z_MIX_INDEX (indicating id list).
+
+    the float array val_list as shown above when called with:
+       set_id   = 1
+       part_id  = 1
+       mat_type = Z_MIX_VALUE (indicating val list).
+
+
+-------------------------------------------------------------------------
+USERD_get_number_of_materials
+
+   Description:
+   -----------
+   Gets the number of materials in the material set
+
+   Specification:
+   -------------
+   int USERD_get_number_of_materials( int set_index )
+
+   Returns:
+   -------
+   Num_materials[set_index]   = Number of materials in the set
+                                 0 indicates no materials information present
+                                -1 indicates an error
+   Arguments:
+   ---------
+   (IN) set_index             = the material set index (zero based)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero
+  * You may want to keep this as a global for use in other routines.
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_model_parts
+
+   Description:
+   -----------
+   Gets the total number of unstructured and structured parts
+   in the model, for which you can supply information.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_model_parts( void )
+
+   Returns:
+   -------
+   Number of parts  (>0 if okay, <=0 if problems).
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * If going to have to read down through the parts in order to
+     know how many, you may want to build a table of pointers to
+     the various parts, so you can easily get to particular parts in
+     later processes.  If you can simply read the number of parts
+     at the head of the file, then you would probably not build the
+     table at this time.
+
+   * This routine would set Numparts_available, which is equal to
+     Num_unstructured_parts + Num_structured_blocks.
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_timesets
+
+   Description:
+   -----------
+    Gets the number of timesets used in the model.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_timesets( void )
+
+   Returns:
+   -------
+   Number of timesets in the model
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * Num_timesets would be set here
+
+   * If you have a static model, both geometry and variables, you should
+     return a value of zero.
+ 
+   * If you have a transient model, then you should return one or more.
+ 
+   For example:
+ 
+      Geometry    Variables                                 No. of timesets
+      ---------   ------------------------------            ---------------
+      static      static                                      0
+      static      transient, all using same timeset           1
+ 
+      transient   transient, all using same timeset as geom   1
+ 
+      static      transient, using 3 different timesets       3
+ 
+      transient   transient, using 3 different timesets and
+                             none of them the same as the
+                             geometry timeset                 4
+          etc.
+ 
+   NOTE: ALL GEOMETRY MUST USE THE SAME TIMESET!!! You will have to provide
+                                                   the timeset number to use
+                                                   for geometry in:
+                                               USERD_get_geom_timeset_number
+ 
+         Variables can use the same timeset as the geometry, or can use
+         other timesets. More than one variable can use the same timeset.
+ 
+   example:  changing geometry at 5 steps, 0.0, 1.0, 2.0, 3.0, 4.0
+             variable 1 provided at these same five steps
+             variable 2 provided at 3 steps, 0.5, 1.25, 3.33
+ 
+        This routine should return a value of 2, because only
+        two different timesets are needed. Timeset 1 would be for the
+        geometry and variable 1 (they both use it). Timeset 2 would
+        be for variable 2, which needs its own in this case.
+
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_variables
+
+   Description:
+   -----------
+   Get the number of variables for which you will be providing info.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_variables( void )
+
+   Returns:
+   -------
+   Number of variables (includes constant, scalar, vector and tensor types)
+                       (>=0 if okay, <0 if problem)
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+    *****************************************************************
+   * Variable numbers, by which references will be made, are implied
+     here. If you say there are 3 variables, the variable numbers
+     will be 1, 2, and 3.
+    *****************************************************************
+
+   * Num_variables would be set here
+
+
+
+--------------------------------------------------------------------
+USERD_get_part_coords
+
+   Description:
+   -----------
+   Gets the coordinates for an unstructured part.
+
+   Specification:
+   -------------
+   int USERD_get_part_coords(int part_number, float **coord_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) coord_array             = 2D float array which contains,
+                                   x,y,z coordinates of each node
+                                   in the part.
+
+       (IMPORTANT: The second dimension of this aray is 1-based!!!)
+
+                                (Array will have been allocated
+                                 3 by (number_of_nodes + 1) for the part
+                                 long - see USERD_get_gold_part_build_info)
+
+
+                       ex) If number_of_nodes = 100
+                           as obtained in:
+                             USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions of the
+                           pointer sent to this routine will be:
+                             coord_array[3][101]
+
+                           Ignore the coord_array[0][0]
+                                      coord_array[1][0]
+                                      coord_array[2][0] locations and start
+                           the node coordinates at:
+                             coord_array[0][1]
+                             coord_array[1][1]
+                             coord_array[2][1]
+
+                             coord_array[0][2]
+                             coord_array[1][2]
+                             coord_array[2][2]
+
+                                   etc.
+
+   Notes:
+   -----
+   * Not called unless Num_unstructured_parts is > 0
+
+   * Will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_part_element_ids_by_type
+
+   Description:
+   -----------
+   Gets the ids for the elements of a particular type for an unstructured
+   or structured part.
+
+   Specification:
+   -------------
+   int USERD_get_part_element_ids_by_type(int part_number,
+                                          int element_type,
+                                          int *elemid_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  element_type            = One of the following (See global_extern.h)
+                                   Z_POINT      node point element
+                                   Z_BAR02      2 node bar
+                                   Z_BAR03      3 node bar
+                                   Z_TRI03      3 node triangle
+                                   Z_TRI06      6 node triangle
+                                   Z_QUA04      4 node quad
+                                   Z_QUA08      8 node quad
+                                   Z_TET04      4 node tetrahedron
+                                   Z_TET10     10 node tetrahedron
+                                   Z_PYR05      5 node pyramid
+                                   Z_PYR13     13 node pyramid
+                                   Z_PEN06      6 node pentahedron
+                                   Z_PEN15     15 node pentahedron
+                                   Z_HEX08      8 node hexahedron
+                                   Z_HEX20     20 node hexahedron
+
+                                   Z_G_POINT    ghost node point element
+                                   Z_G_BAR02    2 node ghost bar
+                                   Z_G_BAR03    3 node ghost bar
+                                   Z_G_TRI03    3 node ghost triangle
+                                   Z_G_TRI06    6 node ghost triangle
+                                   Z_G_QUA04    4 node ghost quad
+                                   Z_G_QUA08    8 node ghost quad
+                                   Z_G_TET04    4 node ghost tetrahedron
+                                   Z_G_TET10   10 node ghost tetrahedron
+                                   Z_G_PYR05    5 node ghost pyramid
+                                   Z_G_PYR13   13 node ghost pyramid
+                                   Z_G_PEN06    6 node ghost pentahedron
+                                   Z_G_PEN15   15 node ghost pentahedron
+                                   Z_G_HEX08    8 node ghost hexahedron
+                                   Z_G_HEX20   20 node ghost hexahedron
+
+   (OUT) elemid_array            = 1D array containing id of each
+                                   element of the type.
+
+                                  (Array will have been allocated
+                                   number_of_elements of the type long)
+
+                       ex) If number_of_elements[Z_TRI03] = 25
+                              number_of_elements[Z_QUA04] = 100
+                              number_of_elements[Z_HEX08] = 30
+                           as obtained in:
+                            USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions available
+                           for this routine will be:
+                              conn_array[25]   when called with Z_TRI03
+
+                              conn_array[100]  when called with Z_QUA04
+
+                              conn_array[30]  when called with Z_HEX08
+
+   Notes:
+   -----
+   * Not called unless element label status is set to TRUE in
+     USERD_get_element_label_status
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_part_elements_by_type
+
+   Description:
+   -----------
+   Gets the connectivities for the elements of a particular type in an
+   unstructured part
+
+   Specification:
+   -------------
+   int USERD_get_part_elements_by_type(int part_number,
+                                       int element_type,
+                                       int **conn_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number           = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  element_type          = One of the following (See global_extern.h)
+                                 Z_POINT      node point element
+                                 Z_BAR02      2 node bar
+                                 Z_BAR03      3 node bar
+                                 Z_TRI03      3 node triangle
+                                 Z_TRI06      6 node triangle
+                                 Z_QUA04      4 node quad
+                                 Z_QUA08      8 node quad
+                                 Z_TET04      4 node tetrahedron
+                                 Z_TET10     10 node tetrahedron
+                                 Z_PYR05      5 node pyramid
+                                 Z_PYR13     13 node pyramid
+                                 Z_PEN06      6 node pentahedron
+                                 Z_PEN15     15 node pentahedron
+                                 Z_HEX08      8 node hexahedron
+                                 Z_HEX20     20 node hexahedron
+
+                                 Z_G_POINT    ghost node point element
+                                 Z_G_BAR02    2 node ghost bar
+                                 Z_G_BAR03    3 node ghost bar
+                                 Z_G_TRI03    3 node ghost triangle
+                                 Z_G_TRI06    6 node ghost triangle
+                                 Z_G_QUA04    4 node ghost quad
+                                 Z_G_QUA08    8 node ghost quad
+                                 Z_G_TET04    4 node ghost tetrahedron
+                                 Z_G_TET10   10 node ghost tetrahedron
+                                 Z_G_PYR05    5 node ghost pyramid
+                                 Z_G_PYR13   13 node ghost pyramid
+                                 Z_G_PEN06    6 node ghost pentahedron
+                                 Z_G_PEN15   15 node ghost pentahedron
+                                 Z_G_HEX08    8 node ghost hexahedron
+                                 Z_G_HEX20   20 node ghost hexahedron
+
+
+   (OUT) conn_array            = 2D array containing connectivity
+                                 of each element of the type.
+
+                                (Array will have been allocated
+                                 num_of_elements of the type by
+                                 connectivity length of the type)
+
+                       ex) If number_of_elements[Z_TRI03] = 25
+                              number_of_elements[Z_QUA04] = 100
+                              number_of_elements[Z_HEX08] = 30
+                           as obtained in:
+                            USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions available
+                           for this routine will be:
+                              conn_array[25][3]   when called with Z_TRI03
+
+                              conn_array[100][4]  when called with Z_QUA04
+
+                              conn_array[30][8]   when called with Z_HEX08
+   
+   Notes:
+   -----
+   * Not called unless Num_unstructured_parts is > 0
+
+   * Will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_part_node_ids
+
+   Description:
+   -----------
+   Gets the node ids of an unstructured or structured part.
+
+   Specification:
+   -------------
+   int USERD_get_part_node_ids(int part_number, int *nodeid_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) nodeid_array            = 1D array containing node ids of
+                                    each node in the part.
+
+           (IMPORTANT: This array is 1-based!!!)
+
+                                   (Array will have been allocated
+                                    (number_of_nodes + 1) for the part long
+                                    see USERD_get_gold_part_build_info)
+
+                       ex) If number_of_nodes = 100
+                           as obtained in:
+                             USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions of the
+                           pointer sent to this routine will be:
+                             nodeid_array[101]
+
+                           Ignore the nodeid_array[0] location and start
+                           the node ids at:
+                             nodeid_array[1]
+
+                             nodeid_array[2]
+
+                                   etc.
+
+   Notes:
+   -----
+   * Not called unless node label status is TRUE, as returned from
+     USERD_get_node_label_status
+
+   * Will be based on Current_time_step
+
+   * The ids are purely labels, used when displaying or querying node ids.
+     However, any node id < 0 will never be displayed
+
+
+--------------------------------------------------------------------
+USERD_get_reader_descrip
+
+   Description:
+   -----------
+   Gets the description of the reader, so gui can give more info
+
+   Specification:
+   -------------
+   int USERD_get_reader_descrip(char descrip[Z_MAXFILENP])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) descrip  = the description of the reader (max length is MAXFILENP,
+                                                   which is 255)
+
+   Notes:
+   -----
+   * OPTIONAL ROUTINE!   You can have it or not.
+
+
+
+--------------------------------------------------------------------
+USERD_get_reader_version
+
+   Description:
+   -----------
+   Gets the version number of the user defined reader
+
+   Specification:
+   -------------
+   int USERD_get_reader_version(char version_number[Z_MAX_USERD_NAME])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful (and will assume is version 1.0)
+
+   Arguments:
+   ---------
+   (OUT) version_number       = the version number of the reader
+                                (max length is Z_MAX_USERD_NAME, which
+                                 is 20)
+
+   Notes:
+   -----
+   * This needs to be "2.000" or greater. Otherwise EnSight will assume
+     this reader is API 1.0
+
+   * should set it to "2.010" for this version of the API
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_sol_times
+
+   Description:
+   -----------
+   Get the solution times associated with each time step for 
+   desired timeset.
+
+   Specification:
+   -------------
+   int USERD_get_sol_times(int timeset_number,
+                           float *solution_times)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  timeset_number     = the timeset number
+ 
+                              For example: If USERD_get_number_of_timesets
+                                           returns 2, the valid
+                                           timeset_number's would be 1 and 2
+
+   (OUT) solution_times       = 1D array of solution times per time step
+
+                                  (Array will have been allocated
+                                   Num_time_steps[timeset_number] long)
+
+   Notes:
+   -----
+   * The solution times must be non-negative and increasing.
+
+
+
+--------------------------------------------------------------------
+USERD_get_timeset_description -
+
+   Description:
+   -----------
+   Get the description to associate with the desired timeset.
+
+   Specification:
+   -------------
+   int USERD_get_timeset_description(int timeset_number,
+                                     char timeset_description[Z_BUFL])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  timeset_number     = the timeset number
+ 
+                              For example: If USERD_get_number_of_timesets
+                                           returns 2, the valid
+                                           timeset_number's would be 1 and 2
+
+   (OUT) timeset_description  = timeset description string
+
+
+   Notes:
+   -----
+   * A string of NULLs is valid for timeset_description
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_var_by_component
+
+   Description:
+   -----------
+   Gets the values of a variable component.  Both unstructured and structured
+   parts use this routine.
+
+   if Z_PER_NODE:
+     Get the component value at each node for a given variable in the part.
+
+   or if Z_PER_ELEM:
+     Get the component value at each element of a specific part and type
+     for a given variable.
+
+   Specification:
+   -------------
+   int USERD_get_var_by_component(int which_variable,
+                                  int which_part,
+                                  int var_type,
+                                  int which_type,
+                                  int imag_data,
+                                  int component,
+                                  float *var_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   or:  Z_UNDEF, in which case you need not load any values into var_array
+
+
+   Arguments:
+   ---------
+   (IN)  which_variable          = The variable number
+
+   (IN)  which_part                 Since EnSight Version 7.4
+                                    -------------------------
+                                  = The part number
+
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+                                    Prior to EnSight Version 7.4
+                                    ----------------------------
+                                  = The part id   This is the part_id label loaded
+                                                  in USERD_get_gold_part_build_info.
+                                                  It is NOT the part table index.
+
+   (IN)  var_type                = Z_SCALAR
+                                   Z_VECTOR
+                                   Z_TENSOR   (symmetric tensor)
+                                   Z_TENSOR9  (asymmetric tensor)
+
+   (IN)  which_type
+
+            if Z_PER_NODE:         Not used
+
+            if Z_PER_ELEM:       = The element type
+                                   Z_POINT      node point element
+                                   Z_BAR02      2 node bar
+                                   Z_BAR03      3 node bar
+                                   Z_TRI03      3 node triangle
+                                   Z_TRI06      6 node triangle
+                                   Z_QUA04      4 node quad
+                                   Z_QUA08      8 node quad
+                                   Z_TET04      4 node tetrahedron
+                                   Z_TET10     10 node tetrahedron
+                                   Z_PYR05      5 node pyramid
+                                   Z_PYR13     13 node pyramid
+                                   Z_PEN06      6 node pentahedron
+                                   Z_PEN15     15 node pentahedron
+                                   Z_HEX08      8 node hexahedron
+                                   Z_HEX20     20 node hexahedron
+
+                                   Z_G_POINT    ghost node point element
+                                   Z_G_BAR02    2 node ghost bar
+                                   Z_G_BAR03    3 node ghost bar
+                                   Z_G_TRI03    3 node ghost triangle
+                                   Z_G_TRI06    6 node ghost triangle
+                                   Z_G_QUA04    4 node ghost quad
+                                   Z_G_QUA08    8 node ghost quad
+                                   Z_G_TET04    4 node ghost tetrahedron
+                                   Z_G_TET10   10 node ghost tetrahedron
+                                   Z_G_PYR05    5 node ghost pyramid
+                                   Z_G_PYR13   13 node ghost pyramid
+                                   Z_G_PEN06    6 node ghost pentahedron
+                                   Z_G_PEN15   15 node ghost pentahedron
+                                   Z_G_HEX08    8 node ghost hexahedron
+                                   Z_G_HEX20   20 node ghost hexahedron
+
+   (IN)  imag_data               = TRUE if imag component
+                                   FALSE if real component
+ 
+   (IN)  component               = The component: (0       if Z_SCALAR)
+                                                  (0 - 2   if Z_VECTOR)
+                                                  (0 - 5   if Z_TENSOR)
+                                                  (0 - 8   if Z_TENSOR9)
+ 
+                                 * 6 Symmetric Indicies, 0:5    *
+                                 * ---------------------------- *
+                                 *     | 11 12 13 |   | 0 3 4 | *
+                                 *     |          |   |       | *
+                                 * T = |    22 23 | = |   1 5 | *
+                                 *     |          |   |       | *
+                                 *     |       33 |   |     2 | *
+ 
+
+                                 * 9 General   Indicies, 0:8    *
+                                 * ---------------------------- *
+                                 *     | 11 12 13 |   | 0 3 4 | *
+                                 *     |          |   |       | *
+                                 * T = | 21 22 23 | = | 6 1 5 | *
+                                 *     |          |   |       | *
+                                 *     | 31 32 33 |   | 7 8 2 | *
+
+   (OUT) var_array 
+
+      -----------------------------------------------------------------------
+      (IMPORTANT: this array is 1-based for both Z_PER_NODE and Z_PER_ELEM!!!)
+      -----------------------------------------------------------------------
+
+            if Z_PER_NODE:    = 1D array containing variable component value
+                                for each node.
+
+                                (Array will have been allocated
+                                 (number_of_nodes + 1) long)
+
+                      Info stored in this fashion:
+                            var_array[0] = not used
+                            var_array[1] = var component for node 1 of part
+                            var_array[2] = var_component for node 2 of part
+                            var_array[3] = var_component for node 3 of part
+                            etc.
+
+            if Z_PER_ELEM:    = 1D array containing variable component
+                                value for each element of a particular
+                                part and type.
+                                    
+                              (Array will have been allocated
+                               (number_of_elements[which_part][which_type] + 1)
+                                long.  See USERD_get_gold_part_build_info)
+
+                  Info stored in this fashion:
+                    var_array[1] = var component for elem 1 (of part and type)
+                    var_array[2] = var component for elem 2 (of part and type)
+                    var_array[3] = var component for elem 3 (of part and type)
+                    etc.
+
+   Notes:
+   -----
+   * Not called unless Num_variables is > 0
+
+   * The per_node or per_elem classification must be obtainable from the
+     variable number (a var_classify array needs to be retained)
+
+   * Will be based on Current_time_step
+
+   * If the variable is not defined for this part, simply return with a
+     value of Z_UNDEF.  EnSight will treat the variable as undefined for
+     this part.
+
+
+--------------------------------------------------------------------
+USERD_get_var_value_at_specific
+
+   Description:
+   -----------
+   if Z_PER_NODE:
+     Get the value of a particular variable at a particular node in a
+     particular part at a particular time.
+
+   or if Z_PER_ELEM:
+     Get the value of a particular variable at a particular element of
+     a particular type in a particular part at a particular time.
+
+
+   Specification:
+   -------------
+   int USERD_get_var_value_at_specific(int which_var,
+                                       int which_node_or_elem,
+                                       int which_part,
+                                       int which_elem_type,
+                                       int time_step,
+                                       float values[3],
+                                       int imag_data)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  which_var   = The variable number
+
+   (IN)  which_node_or_elem
+
+              If Z_PER_NODE:
+                = The node number.  This is not the id, but is
+                                    the index of the global node 
+                                    list (1 based), or the block's
+                                    node list (1 based).
+
+                  Thus,  coord_array[1]
+                         coord_array[2]
+                         coord_array[3]
+                              .      |
+                              .      |which_node_or_elem index
+                              .             ----
+
+
+              If Z_PER_ELEM:
+                = The element number.  This is not the id, but is
+                                       the element number index
+                                       of the number_of_element array
+                                       (see USERD_get_gold_part_build_info),
+                                        or the block's element list (1 based).
+
+                  Thus,  for which_part:
+                         conn_array[which_elem_type][0]
+                         conn_array[which_elem_type][1]
+                         conn_array[which_elem_type][2]
+                              .                      |
+                              .          which_node_or_elem index
+                              .                        ----
+
+
+   (IN)  which_part                 Since EnSight Version 7.4
+                                    -------------------------
+                                  = The part number
+
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+                                    Prior to EnSight Version 7.4
+                                    ----------------------------
+                                  = The part id   This is the part_id label loaded
+                                                  in USERD_get_gold_part_build_info.
+                                                  It is NOT the part table index.
+
+
+   (IN)  which_elem_type
+
+              If Z_PER_NODE, or block part:
+                = Not used
+
+              If Z_PER_ELEM:
+                = The element type.    This is the element type index
+                                       of the number_of_element array
+                                       (see USERD_get_gold_part_build_info)
+
+   (IN)  time_step   = The time step
+
+   (IN)  imag_data   = TRUE if want imaginary value.
+                       FALSE if want real value.
+
+   (OUT) values      = scalar or vector component value(s)
+                        values[0] = scalar or vector[0]
+                        values[1] = vector[1]
+                        values[2] = vector[2]
+
+
+   Notes:
+   -----
+   * This routine is used in node querys over time (or element querys over
+     time for Z_PER_ELEM variables).  If these operations are not critical
+     to you, this can be a dummy routine.
+
+   * The per_node or per_elem classification must be obtainable from the
+     variable number (a var_classify array needs to be retained)
+
+   * The time step given is for the proper variable timeset.
+
+
+----------------------------------------------------------------------
+USERD_load_matf_data
+
+   Description:
+   -----------
+   Get the material id list, mixed-material id list, or
+   mixed-material values list for the given material set and part (and
+   element type if material id list)
+
+   Specification:
+   -------------
+   int USERD_load_matf_data( int set_index,
+                             int part_id,
+                             int wtyp,
+                             int mat_type,
+                             int *ids_list,
+                             float *val_list)
+
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+  (IN)  set_index         = the material set index (zero based)
+
+  (IN)  part_id           = the part number desired
+
+  (IN)  wtyp              = the element type        (used for Z_MAT_INDEX only)
+
+                                  Z_POINT    node point element
+                                  Z_BAR02    2 node bar
+                                  Z_BAR03    3 node bar
+                                  Z_TRI03    3 node triangle
+                                  Z_TRI06    6 node triangle
+                                  Z_QUA04    4 node quad
+                                  Z_QUA08    8 node quad
+                                  Z_TET04    4 node tetrahedron
+                                  Z_TET10   10 node tetrahedron
+                                  Z_PYR05    5 node pyramid
+                                  Z_PYR13   13 node pyramid
+                                  Z_PEN06    6 node pentahedron
+                                  Z_PEN15   15 node pentahedron
+                                  Z_HEX08    8 node hexahedron
+                                  Z_HEX20   20 node hexahedron
+                                  Z_NSIDED  nsided polygon
+                                  Z_NFACED  nfaced polyhedron
+
+                                  Z_G_POINT    ghost node point element
+                                  Z_G_BAR02    2 node ghost bar
+                                  Z_G_BAR03    3 node ghost bar
+                                  Z_G_TRI03    3 node ghost triangle
+                                  Z_G_TRI06    6 node ghost triangle
+                                  Z_G_QUA04    4 node ghost quad
+                                  Z_G_QUA08    8 node ghost quad
+                                  Z_G_TET04    4 node ghost tetrahedron
+                                  Z_G_TET10   10 node ghost tetrahedron
+                                  Z_G_PYR05    5 node ghost pyramid
+                                  Z_G_PYR13   13 node ghost pyramid
+                                  Z_G_PEN06    6 node ghost pentahedron
+                                  Z_G_PEN15   15 node ghost pentahedron
+                                  Z_G_HEX08    8 node ghost hexahedron
+                                  Z_G_HEX20   20 node ghost hexahedron
+                                  Z_G_NSIDED  ghost nsided polygon
+                                  Z_G_NFACED  ghost nfaced polyhedron
+
+  (IN)  mat_type          = Z_MAT_INDEX for material ids list
+                            Z_MIX_INDEX for mixed-material ids list
+                            Z_MIX_VALUE for mixed-material values list
+
+  (OUT) ids_list          = If mat_type is Z_MAT_INDEX:
+                            ---------------------------
+                             1D material id list
+                               (Int array will have been allocated
+                                the appropriate size, as returned in
+                                 USERD_size_matf_data for mat_type Z_MAT_INDEX)
+
+                            If mat_type is Z_MIX_INDEX:
+                            ---------------------------
+                             1D mixed-material id list
+                               (Int array will have been allocated
+                                the appropriate size, as returned in
+                                 USERD_size_matf_data for mat_type Z_MIX_INDEX)
+
+  (OUT) val_list          = 1D mixed-materials values list
+                            (only used if mat_type is Z_MIX_VALUE)
+
+                               (Float array will have been allocated
+                                the appropriate size, as returned in
+                                USERD_size_matf_data for mat_type Z_MIX_VALUE)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero,
+     or Num_materials[set_index] is zero,
+     or the appropriate size from USERD_size_matf_data is zero
+
+
+
+--------------------------------------------------------------------
+USERD_set_filenames
+
+   Description:
+   -----------
+   Receives the geometry and result filenames entered in the data
+   dialog.  The user written code will have to store and use these
+   as needed. The user written code must manage its own files!!
+
+   Specification:
+   -------------
+   int USERD_set_filenames(char filename_1[],
+                           char filename_2[],
+                           char the_path[],
+                           int swapbytes)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN) filename_1   = the filename entered into the geometry
+                         field of the data dialog.
+
+   (IN) param_2      = The usage of this string depends on
+                       'two_fields' in USERD_get_name_of_reader.
+ 
+                       If two_fields is FALSE then it's empty.
+ 
+                       If two_fields is TRUE, this is the 
+                       manditory results file entered 
+                       into the result field of the data dialog.
+ 
+                       If two_fields is -1, then this contains
+                       optional text (filenames, modifiers, etc.)
+                       that can be parsed and used to modify 
+                       reader 
+
+   (IN) the_path     = the path info from the data dialog.
+                       Note: filename_1 and filename_2 have already
+                            had the path prepended to them.  This
+                            is provided in case it is needed for
+                            filenames contained in one of the files
+
+   (IN) swapbytes    = TRUE if should swap bytes when reading data.
+                     = FALSE normally.
+
+   Notes:
+   -----
+   * Since you must manage everything from the input that is entered in
+     these data dialog fields, this is an important routine!
+
+   * It may be that you will need to have an executive type file that contains
+     info and other filenames within it, like EnSight6's case file.
+
+
+--------------------------------------------------------------------
+USERD_set_server_number
+
+   Description:
+   -----------
+   Receives the server number of how many total servers.
+
+   Specification:
+   -------------
+   int USERD_set_server_number(int cur_serv,
+                               int tot_servs)
+
+   Returns:
+   -------
+   nothing
+
+   Arguments:
+   ---------
+   (IN) cur_serv    = the current server.
+
+   (IN) tot_servs   = the total number of servers.
+
+   Notes:
+   -----
+   * Only useful if your user defined reader is being used with EnSight's
+     Server-of-Server capability.  And even then, it may or may not be
+     something that you can take advantage of.  If your data is already
+     partitioned in some manner, such that you can access the proper
+     portions using this information.
+ 
+     For all non-SOS uses, this will simply be 1 of 1
+
+
+
+--------------------------------------------------------------------
+USERD_set_time_set_and_step
+
+   Description:
+   -----------
+   Set the current time step in the desired timeset.  All functions that
+   need time, and that do not explicitly pass it in, will use the timeset
+   and step set by this routine, if needed.
+
+   Specification:
+   -------------
+   void USERD_set_time_set_and_step(int timeset_number,
+                                    int time_step)
+
+   Returns:
+   -------
+   nothing
+
+   Arguments:
+   ---------
+   (IN) timeset_number  = the timeset number (1 based).
+ 
+                          For example:  If USERD_get_number_of_timesets
+                                        returns 2, the valid timeset_number's
+                                        would be 1 and 2.
+
+   (IN) time_step       = The current time step to set
+
+   Notes:
+   -----
+   * Current_time_step and Current_timeset would be set here
+
+
+--------------------------------------------------------------------
+USERD_size_matf_data
+
+   Description:
+   -----------
+   Get the length of the material id list, mixed-material id list, or
+   mixed-material values list for the given material set and part (and
+   element type if material id list)
+
+   Specification:
+   -------------
+   int USERD_size_matf_data( int set_index,
+                             int part_id,
+                             int wtyp,
+                             int mat_type,
+                             int *matf_size)
+
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+  (IN)  set_index         = the material set index (zero based)
+
+  (IN)  part_id           = the part number desired
+
+  (IN)  wtyp              = the element type        (used for Z_MAT_INDEX only)
+
+                                  Z_POINT    node point element
+                                  Z_BAR02    2 node bar
+                                  Z_BAR03    3 node bar
+                                  Z_TRI03    3 node triangle
+                                  Z_TRI06    6 node triangle
+                                  Z_QUA04    4 node quad
+                                  Z_QUA08    8 node quad
+                                  Z_TET04    4 node tetrahedron
+                                  Z_TET10   10 node tetrahedron
+                                  Z_PYR05    5 node pyramid
+                                  Z_PYR13   13 node pyramid
+                                  Z_PEN06    6 node pentahedron
+                                  Z_PEN15   15 node pentahedron
+                                  Z_HEX08    8 node hexahedron
+                                  Z_HEX20   20 node hexahedron
+                                  Z_NSIDED  nsided polygon
+                                  Z_NFACED  nfaced polyhedron
+
+                                  Z_G_POINT    ghost node point element
+                                  Z_G_BAR02    2 node ghost bar
+                                  Z_G_BAR03    3 node ghost bar
+                                  Z_G_TRI03    3 node ghost triangle
+                                  Z_G_TRI06    6 node ghost triangle
+                                  Z_G_QUA04    4 node ghost quad
+                                  Z_G_QUA08    8 node ghost quad
+                                  Z_G_TET04    4 node ghost tetrahedron
+                                  Z_G_TET10   10 node ghost tetrahedron
+                                  Z_G_PYR05    5 node ghost pyramid
+                                  Z_G_PYR13   13 node ghost pyramid
+                                  Z_G_PEN06    6 node ghost pentahedron
+                                  Z_G_PEN15   15 node ghost pentahedron
+                                  Z_G_HEX08    8 node ghost hexahedron
+                                  Z_G_HEX20   20 node ghost hexahedron
+                                  Z_G_NSIDED  ghost nsided polygon
+                                  Z_G_NFACED  ghost nfaced polyhedron
+
+  (IN)  mat_type          = Z_MAT_INDEX for material ids list
+                            Z_MIX_INDEX for mixed-material ids list
+                            Z_MIX_VALUE for mixed-material values list
+
+  (OUT) matf_size         = the length of the material id list, or
+                            mixed-material id list, or
+                            mixed-material values list
+                            for the given material set and part number
+                            (and element type if Z_MAT_INDEX)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero, or
+     Num_materials[set_index] is zero
+
+
+
+
+--------------------------------------------------------------------
+USERD_stop_part_building
+
+   Description:
+   -----------
+   This routine called when the part building dialog is closed.  It is
+   provided in case you desire to release memory, etc. that was only needed
+   during the part building process.
+
+   Specification:
+   -------------
+   void USERD_stop_part_building( void )
+
+   Returns:
+   -------
+   nothing
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+
+--------------------------------------------------------------------
+USERD_rigidbody_existence
+
+   Description:
+   -----------
+   Gets the existence of rigid body values or not in the model
+
+   Specification:
+   -------------
+   int USERD_rigidbody_existence( void )
+
+   Returns:
+   -------
+   Z_OK    if rigid body values exist for the model
+   Z_UNDEF if no rigid body values exist
+   Z_ERR   if an error
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * This will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_rigidbody_values
+
+   Description:
+   -----------
+   Gets the rigid body values for each part
+
+   Specification:
+   -------------
+   int USERD_rigidbody_values(int part_number,
+                              float values[7])
+
+   Returns:
+   -------
+   Z_OK    if rigid body values exist for the model
+   Z_UNDEF if no rigid body values exist
+   Z_ERR   if an error
+
+   Arguments:
+   ---------
+   (IN)  part_number        = The part number
+ 
+                              (1-based index of part table, namely:
+ 
+                                 1 ... Numparts_available.
+ 
+                               It is NOT the part_id that
+                               is loaded in USERD_get_gold_part_build_info)
+ 
+   (OUT) values             values[0] = IX   (x location)
+                            values[1] = IY   (y location)
+                            values[2] = IZ   (z location)
+                            values[3] = E0   (e0 euler value)
+                            values[4] = E1   (e1 euler value)
+                            values[5] = E2   (e2 euler value)
+                            values[6] = E3   (e3 euler value)
+
+
+   Notes:
+   -----
+   * This will be based on Current_time_step
+   * It will not be called unless USERD_rigidbody_existence indicates
+       that there are some values in the model by returning Z_OK.
+
+
+--------------------------------------------------------------------
+USERD_set_right_side
+
+   Description:
+   -----------
+   Informs the reader that the time currently set is the right side of a time
+   span used for variable interpolation between time steps
+
+   Specification:
+   -------------
+   void USERD_set_right_side( void )
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * Applies to Current_time_step
+
+
+
+
+
+------------------------------------------------------------------
+	ENHANCED GUI ROUTINES
+
+--------------------------------------------------------------------
+USERD_get_extra_gui_numbers
+
+   Description:
+   -----------
+   The Enhanced GUI routines are added to allow
+   the user to customize a portion of the Data
+   Reader dialog to pass in options to their
+   user defined reader.
+
+   Specification:
+   -------------
+   void USERD__get_extra_gui_numbers(int *num_Toggles,
+                                     int *num_pulldowns,
+                                     int *num_fields)
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (OUT) num_Toggles    = number of toggles that will be provided
+   
+         num_pulldowns  = number of pulldowns that will be provided
+
+         num_fields     = number of fields that will be provided
+
+   Notes:
+   -----
+     There are three routines that work together:
+     USERD_get_extra_gui_numbers
+     USERD_get_extra_gui_defaults
+     USERD_set_extra_gui_data
+
+     The existence of these routine indicates that
+     you wish to add customize entries to the
+     Data Reader dialog.
+
+     If you don't want the extra GUI features,
+     simply delete these routines, or change their
+     names to something such as
+     USERD_DISABLED_get_extra_gui_defaults
+ 
+     The presence of these routines
+     will ensure that EnSight will call them and
+     use their data to modify the extraction parameters set
+     with some or all of the following:
+     toggles, pulldown menu and fields.
+ 
+     The user can then interact with the enhanced
+     GUI and then send their choices to
+     USERD_set_extra_gui_data
+  
+     Therefore if USERD_get_extra_gui_numbers
+     exists then the other two must exist.
+ 
+     If none exist, then the GUI will be unchanged.
+ 
+     Toggle data will return an integer
+                               TRUE if checked
+                               FALSE if unchecked
+ 
+     Pulldown menu will return an integer representing
+                               the menu item selected
+ 
+     Field will return a string Z_LEN_GUI_FIELD_STR long.
+ 
+     If all the enhanced GUI features are enabled it
+     might look something like this
+
+    ===================================================
+    [] Title 1  [X] Title 3
+    [X]Title 2  [X] Title 4
+ 
+    Pulldown Menu ->
+        Menu Choice 1
+        Menu Choice 2
+        Menu Choice 3
+ 
+    Data Field Title 1 ____________________________
+ 
+    Data Field Title 2 ____________________________
+    =====================================================
+
+    This routine defines the numbers of toggles, pulldowns & fields
+ 
+    The following are defined in the global_extern.h
+           Z_MAX_NUM_GUI_PULL_ITEMS max num GUI pulldowns
+           Z_LEN_GUI_PULL_STR  max length of GUI pulldown string
+           Z_LEN_GUI_FIELD_STR  max length of field string
+           Z_LEN_GUI_TITLE_STR   max length of title string
+ 
+    The library is loaded, this routine is
+     called, then the library is unloaded.
+ 
+    Do not define globals in this routine
+     as when the library is unloaded, you'll
+     lose them.
+ 
+
+--------------------------------------------------------------------
+USERD_get_extra_gui_defaults
+
+   Description:
+   -----------
+   This routine defines the Titles, status,
+   List choices, strings, etc that are fed
+   up to the GUI.
+
+   Specification:
+   -------------
+   int USERD_get_extra_gui_defaults(char **toggle_Title,
+                                    int *toggle_default_status,
+                                    char **pulldown_Title,
+                                    int *pulldown_number_in_list,
+                                    int *pulldown_default_selection,
+                                    char ***pulldown_item_strings,
+                                    char **field_Title,
+                                    char **field_user_string)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) toggle_Title               = title for each toggle
+                                      array dimension is [num_toggles] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         toggle_default_status      = Setting for each toggle (TRUE or FALSE)
+                                      array dimension is [num_toggles] long 
+
+         pulldown_Title             = title for each pulldown
+                                      array dimension is [num_pulldowns] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         pulldown_number_in_list    = number of items in each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_default_selection = pulldown item selection for each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_item_strings      = pulldown item strings
+                                      array is [num_pulldowns] by
+                                               [Z_MAX_NUM_GUI_PULL_ITEMS] by
+                                               [Z_LEN_GUI_PULL_STR] long
+
+         field_Title                = title for each field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         field_user_string          = content of the field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+
+
+   Notes:
+   -----
+   * The library is loaded, this routine is called, then the library is unloaded.
+ 
+   * Do not define globals in this routine as when the library is unloaded, you'll
+     lose them.
+
+
+
+--------------------------------------------------------------------
+USERD_set_extra_gui_data
+
+   Description:
+   -----------
+   This routine sets the new values for the toggles, pulldowns, and fields.
+
+   Specification:
+   -------------
+   void USERD_set_extra_gui_data(
+               int *toggle,       /* [num_toggle] */
+               int *pulldown,     /* [num_pulldown] */
+               char **field_text  /* [num_fields][Z_LEN_GUI_FIELD_STR]*/)
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (IN) toggle               = setting for each toggle.  TRUE or FALSE
+                               array dimension is [num_toggles] long
+
+        pulldown             = item chosen in each pulldown. (0 based)
+                               array dimension is [num_pulldowns] long
+
+        field_text           = content of the field
+                               array dimension is [num_fields] by
+                                                  [Z_LEN_GUI_TITLE_STR] long
+
+
+   Notes:
+   -----
+   * This routine is called when the library is permanently
+     loaded to the EnSight session, so define your globals
+     in this and later routines.
+ 
+   * It's up to you to change your reader behavior according to
+     user entries!
+
+
+
+--------------------------------------------------------------------
+USERD_get_var_extract_gui_numbers
+
+   Description:
+   -----------
+   The Var_Extract_GUI routines are added to allow
+   the user to customize a extraction parameters
+   for variables "after" the file has been read.
+   These things can be modified and the variables will
+   be update/refreshed according to the new parameters set
+
+   Specification:
+   -------------
+   void USERD_get_var_extract_gui_numbers(int *num_Toggles,
+                                          int *num_pulldowns,
+                                          int *num_fields)
+
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (OUT) num_Toggles    = number of toggles that will be provided
+   
+         num_pulldowns  = number of pulldowns that will be provided
+
+         num_fields     = number of fields that will be provided
+
+   Notes:
+   -----
+     There are three routines that work together:
+     USERD_get_var_extract_gui_numbers
+     USERD_get_var_extract_gui_defaults (this one)
+     USERD_set_var_extract_gui_data
+
+     The existence of these routine indicates that
+     you wish to have the Var Extract Parameters dialog.
+
+     If you don't want the extra GUI features,
+     simply delete these routines, or change their
+     names to something such as
+     USERD_DISABLED_get_var_extract_gui_defaults
+ 
+     The presence of these routines
+     will ensure that EnSight will call them and
+     use their data to modify the extraction parameters set
+     with some or all of the following:
+     toggles, pulldown menu and fields.
+ 
+     The user can then interact with the enhanced
+     GUI and then send their choices to
+     USERD_set_extra_gui_data
+  
+     Therefore if USERD_get_var_extract_gui_numbers
+     exists then the other two must exist.
+ 
+     If none exist, then the GUI will be unchanged.
+ 
+     Toggle data will return an integer
+                               TRUE if checked
+                               FALSE if unchecked
+ 
+     Pulldown menu will return an integer representing
+                               the menu item selected
+ 
+     Field will return a string Z_LEN_GUI_FIELD_STR long.
+ 
+     If all the enhanced GUI features are enabled it
+     might look something like this
+
+    ===================================================
+    [] Title 1  [X] Title 3
+    [X]Title 2  [X] Title 4
+ 
+    Pulldown Menu ->
+        Menu Choice 1
+        Menu Choice 2
+        Menu Choice 3
+ 
+    Data Field Title 1 ____________________________
+ 
+    Data Field Title 2 ____________________________
+    =====================================================
+
+    This routine defines the numbers of toggles, pulldowns & fields
+ 
+    The following are defined in the global_extern.h
+           Z_MAX_NUM_GUI_PULL_ITEMS max num GUI pulldowns
+           Z_LEN_GUI_PULL_STR  max length of GUI pulldown string
+           Z_LEN_GUI_FIELD_STR  max length of field string
+           Z_LEN_GUI_TITLE_STR   max length of title string
+ 
+    The library is loaded, this routine is
+     called, then the library is unloaded.
+ 
+    Do not define globals in this routine
+     as when the library is unloaded, you'll
+     lose them.
+ 
+
+--------------------------------------------------------------------
+USERD_get_var_extract_gui_defaults
+
+   Description:
+   -----------
+   This routine defines the Titles, status,
+   List choices, strings, etc that are fed
+   up to the GUI.
+
+   Specification:
+   -------------
+   int USERD_get_var_extract_gui_defaults(char **toggle_Title,
+                                          int *toggle_default_status,
+                                          char **pulldown_Title,
+                                          int *pulldown_number_in_list,
+                                          int *pulldown_default_selection,
+                                          char ***pulldown_item_strings,
+                                          char **field_Title,
+                                          char **field_user_string)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) toggle_Title               = title for each toggle
+                                      array dimension is [num_toggles] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         toggle_default_status      = Setting for each toggle (TRUE or FALSE)
+                                      array dimension is [num_toggles] long 
+
+         pulldown_Title             = title for each pulldown
+                                      array dimension is [num_pulldowns] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         pulldown_number_in_list    = number of items in each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_default_selection = pulldown item selection for each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_item_strings      = pulldown item strings
+                                      array is [num_pulldowns] by
+                                               [Z_MAX_NUM_GUI_PULL_ITEMS] by
+                                               [Z_LEN_GUI_PULL_STR] long
+
+         field_Title                = title for each field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         field_user_string          = content of the field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+
+
+   Notes:
+   -----
+   * The library is loaded, this routine is called, then the library is unloaded.
+ 
+   * Do not define globals in this routine as when the library is unloaded, you'll
+     lose them.
+
+
+
+--------------------------------------------------------------------
+USERD_set_var_extract_gui_data
+
+   Description:
+   -----------
+   This routine sets the new values for the toggles, pulldowns, and fields.
+
+   Specification:
+   -------------
+   void USERD_set_var_extract_gui_data(
+               int *toggle,       /* [num_toggle] */
+               int *pulldown,     /* [num_pulldown] */
+               char **field_text  /* [num_fields][Z_LEN_GUI_FIELD_STR]*/)
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (IN) toggle               = setting for each toggle.  TRUE or FALSE
+                               array dimension is [num_toggles] long
+
+        pulldown             = item chosen in each pulldown. (0 based)
+                               array dimension is [num_pulldowns] long
+
+        field_text           = content of the field
+                               array dimension is [num_fields] by
+                                                  [Z_LEN_GUI_TITLE_STR] long
+
+
+   Notes:
+   -----
+   * This routine is called when the library is permanently
+     loaded to the EnSight session, so define your globals
+     in this and later routines.
+ 
+   * It's up to you to change your reader behavior according to
+     user entries!
+
+
+
+
+
+-----------------------------------------------------------------------------------
+/* ----------------------------------------------------------
+ *  New in EnSight 8 is the capability to remove (fail) elements
+ *   based on variable threshold values.  Basically the variable
+ *   name, a couple of thresholds, a couple of values and a logic 
+ *   criteria are read in from this routine.  Every element that
+ *   satisfies the failure criteria is removed and not used in
+ *   EnSight calculations.
+ *   
+ *  Example Failure criteria 
+ *     Let fail_var_name = "fail_flag"
+ *         threshold_val1 = 0
+ *         threshold_operator1 = Z_EQUAL_TO  
+ *         logic_criteria2 not used
+ *         threshold_val2 not used
+ *         threshold_operator2 not used
+ *     For each value of "fail_flag" at each element, 
+ *         if fail flag == threshold_val1 (0.0) then element fails
+ *   Return (Z_ERR) if this is not used.
+ *   Return (Z_OK) if failed element feature should be used
+ *
+ *  threshold_operator1 & 2 can be one of the following
+ *    Z_ELE_FAILED_NONE,           - disables checking
+ *     Z_ELE_FAILED_GREATER,        - greater than
+ *     Z_ELE_FAILED_LESS,           - less than
+ *     Z_ELE_FAILED_EQUAL,          - equal
+ *     Z_ELE_FAILED_NOT_EQUAL,      - not equal
+ *     Z_ELE_FAILED_MANY            - not used
+ *
+ * logic_criteria2
+ *      Z_ELE_FAILED_LOGIC_NONE,
+ *      Z_ELE_FAILED_LOGIC_AND,
+ *      Z_ELE_FAILED_LOGIC_OR,
+ *      Z_ELE_FAILED_LOGIC_MANY
+ *
+ * ---------------------------------------------------------- */
+int USERD_get_uns_failed_params(
+                char *fail_var_name,           /* variable name to be used in failure
+                                             must be scalar, per elem      */
+                float *threshold_val1,     /* number to compare for failure */
+                float *threshold_val2,     /* number to compare for failure */
+                int *threshold_operator1,   /* Z_GREATER_THAN, Z_LESS_THAN,
+                                            Z_EQUAL_TO */
+                int *threshold_operator2,   /* Z_GREATER_THAN, Z_LESS_THAN,
+                                            Z_EQUAL_TO */
+		int *logic_criteria2
+
+
+/*--------------------------------------------------------------------
+ * USERD_get_structured_reader_cinching -
+ *--------------------------------------------------------------------
+ *
+ *  Gets whether this reader will do structured cinching for block data
+ *  This means that it will handle the min, max, and step values for a
+ *  given block and return the coordinate components or variable components
+ *  in their "cinched" state when partial extraction or striding is used.
+ *  This is as opposed to returning the entire component (ignoring min, max
+ *  and stride) and letting Ensight pick out the values actually used.
+ *
+ *  returns: Z_OK    if the reader will handle the
+ *                   min, max, and stride and return
+ *                   the cinched values only.
+ *
+ *           Z_UNDEF or Z_ERR if will return entire component
+ *                            and rely on EnSight to cinch.
+ *
+ * Notes:
+ *  Unless you can actually pull out the desired min, max, and stride
+ *  without using a full component of memory, don't enable this feature.
+ *--------------------------------------------------------------------*/
+int
+USERD_get_structured_reader_cinching( void )
+
+
+
+/*--------------------------------------------------------------------
+ * USERD_set_block_range_and_stride -
+ *--------------------------------------------------------------------
+ *
+ *  Sets the min, max, and step values in each of the i, j, and k, directions
+ *  for the given part.
+ *
+ *  (IN)  part_number             = The part number
+ *
+ *                                  (1-based index of part table, namely:
+ *
+ *                                     1 ... Numparts_available.
+ *
+ *                                   It is NOT the part_id that
+ *                                   is loaded in
+ *                                               USERD_get_gold_part_build_info)
+ *
+ *  (IN) mini        = min i plane desired  (zero based)
+ *       maxi        = max i plane desired  (zero based)
+ *       stepi       = i stride
+ *       minj        = min j plane desired  (zero based)
+ *       maxj        = max j plane desired  (zero based)
+ *       stepj       = j stride
+ *       mink        = min k plane desired  (zero based)
+ *       maxk        = max k plane desired  (zero based)
+ *       stepk       = k stride
+ *
+ *
+ *  returns: Z_OK    if no problems
+ *           Z_ERR   if an error
+ *
+ *  Notes:
+ *  * It will not be called unless USERD_get_structured_reader_cinching
+ *    indicates that this reader does structured cinching by returning
+ *    a Z_OK.
+ *
+ *  * It will actually be called before each geom component and before
+ *    each part variable - so if you are storing things locally, you should
+ *    make this routine be able to quickly check whether anything needs
+ *    updated or not.
+ *
+ *  * If the stride (step) does not hit right on the max, the last element
+ *    in each direction will be shortened appropriately.
+ *    For example, if a block had 0 to 12 in the i direction,
+ *                 and the user specified min = 1
+ *                                        max = 8
+ *                                        step = 3
+ *
+ *             0   1   2   3   4   5   6   7   8   9   10  11  12
+ *             |   |   |   |   |   |   |   |   |   |   |   |   |
+ *
+ *                 |           |           |   |
+ *
+ *      Namely, the coarser cell boundaries in this direction would be at 1, 4,
+7, and 8
+ *
+ *--------------------------------------------------------------------*/
+int
+USERD_set_block_range_and_stride(int part_number,
+                                 int mini, int maxi, int stepi,
+                                 int minj, int maxj, int stepj,
+                                 int mink, int maxk, int stepk)
+
+
+
+---- end of document ----
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_2.08 b/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_2.08
new file mode 100644
index 0000000000..29e185d4d0
--- /dev/null
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_2.08
@@ -0,0 +1,4653 @@
+README_USERD_2.08
+=================
+--------------------------------------
+EnSight User Defined Reader Capability   ===> (API 2.08)
+--------------------------------------
+A user defined reader capability is included in EnSight which can allow
+otherwise unsupported structured or unstructured data to be read.  The user
+defined reader capability utilizes dynamic shared libraries composed of
+routines defined in this document but produced by you, the user, (or some
+third party). This capability is currently available for dec, ibm, hp, sgi,
+sun, linux, alpha linux, and NT servers.
+
+You should refer to beginning of README_USERD_2.0  and/or README_1.0_to_2.0
+for a discussion of the differences between API 1.0 and API 2.*.
+
+***>> API 2.08 invloves a slight change to API 2.05 and later:
+Namely, rotational (yaw,pitch,roll) values were added to the values
+argument of USERD_rigidbody_values routine.
+
+***>> API 2.07 additional capabilities (beyond API 2.06):
+Optional routine to allow userd defined readers to indicate their auto 
+distribute preference when used with SOS.  This is used to set the auto 
+distribute flag default in the client.  If the function does not exist, 
+then it defaults to 'use auto distribute'.  If the function does exist and 
+indicates 'no auto distribute', then it's up to the UDR to decompose a 
+distributed data set.
+    USERD_prefer_auto_distribute
+Optional routine to allow userd defined readers to indicate their 
+preference for the 'Set file...' button labels in the client's File->Open 
+dialog.  If the function does not exist or it returns a null string for 
+an argument, then the default values are used.
+    USERD_set_filename_button_labels
+
+***>> API 2.06 additional capabilities (beyond API 2.05):
+Routines to allow userd defined readers for structured data
+to deal with min, max, and stride within the reader itself
+instead of within EnSight.
+    USERD_get_structured_reader_cinching
+    USERD_set_block_range_and_stride
+
+
+***>> API 2.05 additional capabilities (beyond API 2.04):
+Routines to handle material species.
+    USERD_get_number_of_species
+    USERD_get_matsp_info
+
+Routines to handle variable extraction parameters after a read, and then
+update the variables accordingly.  Similar to the extra GUI capabilities
+(which are processed before a read).  (Can actually be added to pre-2.05 readers)
+    USERD_get_var_extract_gui_numbers
+    USERD_get_var_extract_gui_defaults
+    USERD_set_var_extract_gui_data
+
+Routines to obtain rigid body values from a reader.
+(Routines were added - EnSight is now using for Nastran and STL readers
+                       with Dynasty rigid body motion data file)
+    USERD_rigidbody_existence
+    USERD_rigidbody_values
+
+Routine that lets reader know when EnSight is getting the right side of a time
+interval for variable interpolation between steps.  Not generally needed for
+most readers - however, may be needed for those that implement rigid body, and
+wish to cache left and right timespan information for interpolation within the
+reader itself.  (Can actually be added to pre-2.05 readers)
+    USERD_set_right_side
+
+
+***>> API 2.04 additional capabilities (beyond API 2.03):
+Routines to handle failed elements.  Basically 
+a.One routine to return a flag indicating the existence of 
+  failed elements in at least one part in at least one 
+  timestep in the model.  
+b.A second routine to return a matrix of flags indexed by part and
+  element type indicating which parts and element types have failed
+  elements at the current time step.
+c.Finally a third routine to return an array of flags for a given
+  part and element type that is number of elements of that type long
+  indicating which elements have failed, and which have not failed.
+
+
+***>> API 2.03 additional capabilities (beyond API 2.01):
+1. Routines to handle materials
+2. Routines to handle nsided and nfaced elements
+3. Modified routine to handle structured ranges
+
+
+****************************************************************************
+Note: Only the the Ensight Gold example reader, has been moved to 
+      this 2.06 API level.  And it is purely for an example - it does not
+      actually provide a benefit.
+****************************************************************************
+
+
+The process for producing a user defined reader is:
+---------------------------------------------------
+1. Write code for all pertinent routines in the library (Unless someone else
+   has done this for you).
+
+        This is of course where the work is done by the user.  The word
+        "pertinent" is used because depending on the nature of the data, some
+        of the routines in the library may be dummy routines.
+
+        The source code for a dummy_gold library and for various other
+        working or sample libraries is copied from the installation CD during
+        installation.  These will be located in directories under:
+
+        $CEI_HOME/ensight76/user_defined_src/readers
+
+        examples:
+        --------
+        Basic dummy_gold routines provide skeleton for a new reader
+          $CEI_HOME/ensight76/user_defined_src/readers/dummy_gold
+
+        Sample library which reads unstructured binary EnSight Gold data
+          $CEI_HOME/ensight76/user_defined_src/readers/ensight_gold
+
+        You may find it useful to place your library source in this area as
+        well, but are not limited to this location.
+
+ * ===>	The descriptions of each library routine and the order that the
+        routines are called, which is provided in this file, along with
+        the example libraries, should make it possible for you to produce
+        code for your own data reader.	
+
+
+2. Produce the dynamic shared library.
+
+   This is a compiling and loading process which varies according to
+   the type of machine you are on.  In the user-defined-reader source
+   tree we have tried to isolate the machine dependent parts of the
+   build process using a set of files in the 'config' directory.  In this
+   directory there is a configuration file for each platform on which
+   EnSight is supported.  Before you can compile the installed readers
+   you should run the script called 'init' in the config directory.
+
+      i.e.  (for UNIX)
+            cd config
+            ./init sgi_6.5_n64
+            cd ..
+            make
+
+   If you are compiling for Windows NT, there are two options.  If you
+   have the Cygwin GNU utilities installed, you can use GNU make as for
+   Unix.  Otherwise, there is a script called makeall.cmd which will
+   build all of the readers using nmake.  The Makefiles in each reader
+   directory will work using either make or nmake.
+
+      i.e.  (WIN32 Cygwin)                 (using nmake)
+            cd config                      cd config
+            sh init win32                  cp win32 config
+            cd ..                          cd ..
+                                           mkdir lib
+            make                           makeall.cmd
+
+   If you have platform-specific portions of code in your reader, the
+   build system defines a set of flags which can be used within
+   #ifdef ... #endif regions in your source, as shown in the table
+   below.
+
+   Because the readers are now dynamically opened by EnSight, you may
+   have to include dependent libraries on your link-line to avoid having
+   unresolved symbols.  If you are having problems with a reader, start
+   ensight as "ensight7 -readerdbg" and you will get feedback on any
+   problems encountered in loading a reader.  If there are unresolved
+   symbols, you need to find the library which contains the missing
+   symbols and link it into your reader by adding it to the example
+   link commands below.
+
+   If you choose to use a different build environment for your reader,
+   you should take care to use compatible compilation flags to ensure
+   compatibilty with the EnSight executables, most notably on the SGI
+   and HP-UX 11.0 platforms, which should use the following flags:
+
+      sgi_6.2_o32: -mips2
+      sgi_6.2_n64: -mips4 -64
+      sgi_6.5_n32: -mips3
+      sgi_6.5_n64: -mips4 -64
+       hp_11.0_32: +DA2.0
+       hp_11.0_64: +DA2.0W
+
+    ______________________________________________________________________
+   | MACHINE | OS flag               |  SHARED LIBRARY NAME PRODUCED      |
+   |  TYPE   |------------------------------------------------------------|
+   |         |         LD COMMAND USED IN MAKEFILE                        |
+    ======================================================================
+    ______________________________________________________________________
+   | sgi     | -DSGI                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -shared -all -o libuserd-X.so libuserd-X.o              |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | hp      | -DHP                  |  libuserd-X.sl                     |
+   |         |------------------------------------------------------------|
+   |         | ld -b -o libuserd-X.sl libuserd-X.o                        |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | sun     | -DSUN                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -G -o libuserd-X.so libuserd-X.o                        |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | dec     | -DDEC                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -shared -all -o libuserd-X.so libuserd-X.o -lc          |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | linux   | -DLINUX               |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -shared -o libuserd-X.so libuserd-X.o -lc               |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | alpha   | -DALINUX              |  libuserd-X.so                     |
+   | linux   |------------------------------------------------------------|
+   |         | ld -shared -o libuserd-X.so libuserd-X.o -lc               |
+    ----------------------------------------------------------------------
+    ______________________________________________________________________
+   | ibm     | -DIBM                 |  libuserd-X.so                     |
+   |         |------------------------------------------------------------|
+   |         | ld -G -o libuserd-X.so libuserd-X.o -bnoentry -bexpall -lc |
+    ----------------------------------------------------------------------
+
+   Once you have created your library, you should place it in a directory
+   of your choice or in the standard reader location:
+
+      $CEI_HOME/ensight76/machines/$CEI_ARCH/lib_readers
+
+   For example, if you created a reader for "mydata", you should create
+   the reader libuserd-mydata.so and place the file in your own reader
+   directory (see section 3 below) or in the standard location:
+
+      $CEI_HOME/ensight76/machines/$CEI_ARCH/lib_readers/libuserd-mydata.so
+
+
+3. By default EnSight will load all readers found in the directory:
+
+      $CEI_HOME/ensight76/machines/$CEI_ARCH/lib_readers
+
+   Files with names "libuserd-X.so" (where X is a name unique to the reader)
+   are assumed to be user-defined readers.
+
+   There are two methods which can be used to supplement the default
+   behavior.
+
+   (1) A feature which is useful for site-level or user-level configuration
+       is the optional environment variable $ENSIGHT7_READER.  This
+       variable directs EnSight to load all readers in the specified reader
+       directory (you should probably specify a full path) before loading
+       the built-in readers.  If the same reader exists in both directories
+       (as determined by the name returned by USERD_get_name_of_reader(),
+       NOT by the filename), the locally configured reader will take
+       precedence.
+
+   (2) A useful feature for end-users is the use of the libuserd-devel
+       reader.  EnSight will search for a reader named libuserd-devel.so
+       (.sl for HP or .dll for NT).  This reader can exist anywhere in the
+       library path (see below) of the user.  This is useful for an
+       individual actively developing a reader because the existence of a
+       libuserd-devel library will take precedence over any other library
+       which returns the same name from USERD_get_name_of_reader().
+
+   As an example, a site may install commonly used readers in a common
+   location, and users can set the ENSIGHT7_READER variable to access them:
+
+      setenv ENSIGHT7_READER /usr/local/lib/e7readers
+  
+   A user working on a new reader may compile the reader and place it in
+   a directory specified by the library path:
+
+      cp libuserd-myreader.so ~/lib/libuserd-devel.so
+      setenv <librarypath> ~/lib:$<librarypath>
+
+   The user is responsible for correctly configuring the library path
+   variable in order to make use of the libuserd-devel feature.  The
+   library environment variables used are:
+
+        Machine type    Environment variable to set
+        ------------    ---------------------------
+        sgi             LD_LIBRARY_PATH
+        dec             LD_LIBRARY_PATH
+        sun             LD_LIBRARY_PATH
+        linux           LD_LIBRARY_PATH
+        alpha linux     LD_LIBRARY_PATH
+        hp              SHLIB_PATH
+        ibm             LIBPATH
+
+As always, EnSight support is available if you need it.
+
+-------------------------------
+Quick Index of Library Routines
+-------------------------------
+
+Generally Needed for UNSTRUCTURED data
+--------------------------------------
+USERD_get_part_coords                 part's node coordinates
+USERD_get_part_node_ids               part's node ids
+USERD_get_part_elements_by_type       part's element connectivites
+USERD_get_part_element_ids_by_type    part's element ids
+
+
+Generally Needed for BLOCK data
+--------------------------------------
+USERD_get_block_coords_by_component   block coordinates
+USERD_get_block_iblanking             block iblanking values
+USERD_get_ghosts_in_block_flag        block ghost cell existence?
+USERD_get_block_ghost_flags           block ghost cell flags
+
+  These routines, which formerly were only for unstructured data, will now
+  also be called for structured data if you specify that ids will be given
+  in the USERD_get_node_label_status and USERD_get_element_label_status rotuines
+  ------------------------------------------------------------------------------ 
+  USERD_get_part_node_ids               part's node ids
+  USERD_get_part_element_ids_by_type    part's element ids
+
+
+Generally needed for either or both kinds of data
+-------------------------------------------------
+USERD_get_name_of_reader              name of reader for GUI
+USERD_get_reader_release              release string of reader
+USERD_get_reader_version              provide reader version number
+USERD_get_reader_descrip              provide GUI more description (optional)
+
+USERD_get_extra_gui_numbers           Gets the number of toggles, pulldowns and fields
+USERD_get_extra_gui_defaults          Gets the default values for the GUI members
+USERD_set_extra_gui_data              Returns the answers provided by the user
+
+USERD_set_filenames                   filenames entered in GUI
+USERD_set_server_number               server which of how many
+
+USERD_get_number_of_timesets          number of timesets
+USERD_get_timeset_description         description of timeset
+USERD_get_geom_timeset_number         timeset # to use for geom
+
+USERD_get_num_of_time_steps           number of time steps
+USERD_get_sol_times                   solution time values
+USERD_set_time_set_and_step           current timeset and time step
+
+USERD_get_changing_geometry_status    changing geometry?
+USERD_get_node_label_status           node labels?
+USERD_get_element_label_status        element labels?
+USERD_get_model_extents               provide model bounding extents
+USERD_get_number_of_files_in_dataset  number of files in model
+USERD_get_dataset_query_file_info     info about each model file
+USERD_get_descrip_lines               file associated description lines
+USERD_get_number_of_model_parts       number of model parts
+USERD_get_gold_part_build_info        Gets the info needed for part building process
+USERD_get_part_build_info             part/block type/descrip etc.
+USERD_get_maxsize_info                part/block allocation maximums
+USERD_get_ghosts_in_model_flag        model contains ghost cells?
+USERD_get_nsided_conn                 Gets the element connectivities for nsided
+                                        elements. (utilizes the number of nodes
+                                        per element obtained in
+                                        USERD_get_part_elements_by_type)
+USERD_get_nfaced_nodes_per_face       Gets the number of nodes per face for nfaced
+                                        elements (utilizes the number of faces
+                                        per element obtained in
+                                        USERD_get_part_elements_by_type)
+USERD_get_nfaced_conn                 Gets the element connectivities for nfaced
+                                        elements (utilizes the number of nodes
+                                        per face obtained in
+                                        USERD_get_nfaced_nodes_per_face)
+
+
+USERD_get_border_availability         part border provided?
+USERD_get_border_elements_by_type     part border conn and parent info
+
+USERD_get_number_of_variables         number of variables
+USERD_get_gold_variable_info          variable type/descrip etc.
+USERD_get_var_by_component            part or block variable values
+USERD_get_constant_val                constant variable's value
+USERD_get_var_value_at_specific       node's or element's variable value over time
+USERD_stop_part_building              cleanup after part build routine
+
+USERD_get_number_of_material_sets     Gets the number of material sets
+USERD_get_matf_set_info               Gets the material set indices and names
+USERD_get_number_of_materials         Gets the number of materials
+USERD_get_matf_var_info               Gets the material indices and descriptions
+USERD_size_matf_data                  Gets the length of either the
+                                        material ids list,
+                                        mixed-material ids list, or
+                                        mixed-material values list
+USERD_load_matf_data                  Gets the material ids list,
+                                        mixed-material ids list, or
+                                        mixed-material values list
+
+USERD_bkup                            archive routine
+
+USERD_exit_routine                    cleanup upon exit routine
+
+USERD_get_uns_failed_params           Gets thresholds/criteria for failure  
+
+USERD_rigidbody_existence             Returns whether rigid body transformation
+                                       data exists for the model.
+USERD_rigidbody_values                Returns the euler and location values for a
+                                       given part
+
+USERD_set_right_side                  Simply informs the reader when the time set
+                                      is for the right side of a time span during
+                                      variable interpolation between time steps.
+
+USERD_get_structured_reader_cinching  Tells if the reader will do structured
+                                        cinching
+USERD_set_block_range_and_stride      Sets the min, max, and stride of a block
+                                        if doing structured cinching
+
+
+-------------------------
+Order Routines are called
+-------------------------
+
+The various main operations are given basically in the order they will
+be performed.  Within each operation, the order the routines will be
+called is given.  
+
+1. Setting name in the gui, and specifying one or two input fields
+
+        USERD_get_name_of_reader
+        USERD_get_reader_descrip        (optional)
+        USERD_get_extra_gui_numbers     (optional)
+	USERD_get_extra_gui_defaults    (optional)
+
+2. Getting the reader version (also distinguishes between API's)
+
+        USERD_get_reader_version
+
+3. Setting filenames and getting timeset and time info
+
+        <USERD_set_extra_gui_data> (optional if reader has
+                                    USERD_get_extra_gui_defaults routine)
+        USERD_get_structured_reader_cinching
+        USERD_set_server_number
+	USERD_set_extra_gui_data        (optional)
+        USERD_set_filenames
+        USERD_get_number_of_timesets
+        USERD_get_geom_timeset_number
+
+        for each timeset:
+          USERD_get_timeset_description
+          USERD_get_num_of_time_steps
+          USERD_get_sol_times
+
+        USERD_set_time_set_and_step
+
+4. Gathering info for part builder
+
+        USERD_set_time_set_and_step
+        USERD_get_changing_geometry_status
+        USERD_get_node_label_status
+        USERD_get_element_label_status
+        USERD_get_number_of_files_in_dataset
+        USERD_get_dataset_query_file_info
+        USERD_get_descrip_lines                 (for geometry)
+        USERD_get_number_of_model_parts
+        USERD_get_gold_part_build_info
+        USERD_get_ghosts_in_model_flag
+        USERD_get_maxsize_info
+        USERD_get_get_ghosts_in_block_flag      (if any ghost cells in model)
+        USERD_get_model_extents     OR          (for model extents)
+             USERD_get_part_coords  AND/OR
+             <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+             USERD_get_block_coords_by_component
+
+5. Gathering Variable info
+
+        USERD_get_number_of_variables
+        USERD_get_gold_variable_info
+              
+6. Part building (per part created)
+
+        both unstructured and structured:
+        --------------------------------
+        USERD_set_time_set_and_step
+
+        if unstructured part:
+        --------------------
+        USERD_get_part_element_ids_by_type
+        USERD_get_part_elements_by_type
+
+        If any nsided elements:
+
+          USERD_get_nsided_conn
+
+        If any nfaced elements:
+
+          USERD_get_nfaced_nodes_per_face
+          USERD_get_nfaced_conn
+
+        USERD_get_part_coords
+        USERD_get_part_node_ids
+
+        else if structured part:
+        -----------------------
+        USERD_get_block_iblanking
+        <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+        USERD_get_block_coords_by_component
+        USERD_get_block_ghost_flags          (If ghost cells in part)
+        USERD_get_part_node_ids              (If node ids given)
+        USERD_get_part_element_ids_by_type   (If element ids given)
+
+        both again:
+        ----------
+        USERD_get_border_availability        (If border representation
+        USERD_get_border_elements_by_type     is selected)
+
+        USERD_stop_part_building      (only once when part builder
+                                       dialog is closed)
+
+7. Loading Variables
+          
+        constants:
+        ---------
+        USERD_set_time_set_and_step
+        USERD_get_constant_val
+          
+        scalars/vectors/tensors:
+        ------------------------
+        USERD_get_descrip_lines
+        USERD_set_time_set_and_step
+         <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+        USERD_get_var_by_component
+
+8. Changing geometry
+
+        changing coords only (per part):
+        --------------------
+        USERD_set_time_set_and_step
+        USERD_get_descrip_lines
+        USERD_get_part_coords
+        <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+        USERD_get_block_coords_by_component
+
+        changing connectivity (per part):
+        ---------------------
+        USERD_set_time_set_and_step
+        USERD_get_descrip_lines
+        USERD_get_number_of_model_parts
+        USERD_get_gold_part_build_info
+        USERD_get_ghosts_in_model_flag
+        USERD_get_get_ghosts_in_block_flag      (if any ghost cells in model)
+        USERD_get_model_extents   OR
+           USERD_get_part_coords  AND/OR
+           <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+           USERD_get_block_coords_by_component
+        USERD_get_part_element_ids_by_type
+        USERD_get_part_elements_by_type
+        USERD_get_part_coords
+        USERD_get_part_node_ids
+        USERD_get_block_iblanking
+        <USERD_set_block_range_and_stride>  (if doing structured reader cinching
+        USERD_get_block_coords_by_component
+        USERD_get_block_ghost_flags          (If ghost cells in part)
+        USERD_get_part_node_ids              (If node ids given)
+        USERD_get_part_element_ids_by_type   (If element ids given)
+
+        USERD_get_border_availability        (If border representation
+        USERD_get_border_elements_by_type     is selected)
+
+  
+9. Node or Element queries over time
+
+        USERD_get_var_value_at_specific
+
+10. To see if materials in the model
+
+        USERD_get_number_of_material_sets
+        USERD_get_matf_set_info
+
+        If any material sets in the model (calls these once per material set):
+          USERD_get_number_of_materials
+          USERD_get_matf_var_info
+
+        For each elment type of each part containing material ids, calls:
+          USERD_size_matf_data
+          USERD_load_matf_data
+
+        If there are any elements with mixed materials, when a domain or
+        interface is created, calls these again per part:
+
+          USERD_size_matf_data
+          USERD_load_matf_data
+
+11. To modify the variable extraction parameters and have the variables
+    update accordingly.
+
+        USERD_get_var_extract_gui_numbers
+        USERD_get_var_extract_gui_defaults
+        USERD_set_var_extract_gui_data
+
+
+
+-----------------------
+Detailed Specifications
+-----------------------
+
+Include files:
+--------------
+The following header file is required in any file containing these library
+routines. 
+
+       #include "global_extern.h"
+
+And it references:
+
+       #include "global_extern_proto.h"
+
+
+
+*******************************************************************************
+****************************** Special Note ***********************************
+*******************************************************************************
+
+Make sure you use the proper define in the global_extern.h header file, namely:
+#define USERD_API_204
+
+Also, Make sure the api version in the USERD_get_reader_version routine is set
+to "2.04" or larger.
+
+Make sure your reader has access to the global_extern_proto.h   This is a new
+file which is accessed from the new global_extern.h
+
+*******************************************************************************
+*******************************************************************************
+
+
+Basis of arrays:
+---------------
+Unless explicitly stated otherwise, all arrays are zero based - in true C
+fashion.
+
+
+Global variables:
+----------------
+You will generally need to have a few global variables which are shared by
+the various library routines. The detailed specifications below have assumed
+the following are available.  (Their names describe their purpose, and they
+will be used in helping describe the details of the routines below).
+
+static int Numparts_available         = 0;
+static int Num_unstructured_parts     = 0;
+static int Num_structured_blocks      = 0;
+
+/* Note: Numparts_available = Num_unstructured_parts + Num_structured_blocks */
+
+static int Num_timesets               = 1;
+static int Current_timeset            = 1;
+static int Geom_timeset_number        = 1;
+
+static int Num_time_steps[Z_MAXSETS]  = 1;
+static int Current_time_step          = 0;
+static int Num_variables              = 0;
+static int Num_dataset_files          = 0;
+
+static int Server_Number              = 1;    Which server of
+static int Tot_Servers                = 1;    the total number of servers
+
+
+
+_________________________________________
+-----------------------------------------
+Library Routines (in alphabetical order):
+_________________________________________
+-----------------------------------------
+
+--------------------------------------------------------------------
+USERD_bkup
+
+   Description:
+   -----------
+   This routine is called during the EnSight archive process.  You can
+   use it to save or restore info relating to your user defined reader.
+
+   Specification:
+   -------------
+   int USERD_bkup(FILE *archive_file,
+                  int backup_type)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  archive_file         = The archive file pointer
+
+   (IN)  backup_type          = Z_SAVE_ARCHIVE for saving archive
+                                Z_REST_ARCHIVE for restoring archive
+
+   Notes:
+   -----
+   * Since EnSight's archive file is saved in binary form, you should
+     also do any writing to it or reading from it in binary.
+
+   * You should archive any variables, which will be needed for
+     future operations, that will not be read or computed again
+     before they will be needed.  These are typically global
+     variables.
+
+   * Make sure that the number of bytes that you write on a save and
+     the number of bytes that you read on a restore are identical!!
+
+   * If any of the variables you save are allocated arrays, you must
+     do the allocations before restoring into them.
+
+--------------------------------------------------------------------
+USERD_exit_routine
+
+   Description:
+   -----------
+   This routine is called as EnSight is exiting. It can be used to clean
+   up anything needed - such as removing temporary files, etc. - or can simply
+   be a dummy.
+
+   Specification:
+   -------------
+   void USERD_exit_routine( void )
+
+   Arguments:
+   ---------
+   none
+
+--------------------------------------------------------------------
+USERD_get_block_coords_by_component
+
+   Description:
+   -----------
+   Get the coordinates of a given structured block, a component at a time.
+
+   Specification:
+   -------------
+   int USERD_get_block_coords_by_component(int block_number,
+                                           int which_component,
+                                           float *coord_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  block_number            = The block part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  which_component         = Z_COMPX if x component wanted
+                                 = Z_COMPY if y component wanted
+                                 = Z_COMPZ if z component wanted
+
+   (OUT) coord_array             = 1D array containing x,y, or z
+                                   coordinate component of each node
+
+                                  (Array will have been allocated
+                                   i*j*k for the block long)
+
+   Notes:
+   -----
+   * Not called unless Num_structured_blocks is > 0
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_block_iblanking
+
+   Description:
+   -----------
+   Get the iblanking value at each node of a block (if the block is
+   iblanked).
+
+   Specification:
+   -------------
+   int USERD_get_block_iblanking(int block_number,
+                                 int *iblank_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  block_number            = The block part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) iblank_array            = 1D array containing iblank value
+                                   for each node.
+
+                                  (Array will have been allocated
+                                   i*j*k for the block long)
+
+          possible values are:   Z_EXT     = exterior
+                                 Z_INT     = interior
+                                 Z_BND     = boundary
+                                 Z_INTBND  = internal boundary
+                                 Z_SYM     = symmetry plane
+
+   Notes:
+   -----
+   * Not called unless Num_structured_blocks is > 0  and you have
+     some iblanked blocks
+
+   * Will be based on Current_time_step
+
+
+
+----------------------------------------------------------------------
+USERD_get_block_ghost_flags
+
+   Description:
+   -----------
+   Get the ghost_flags value at each element of a block containing ghost cells.
+
+   Specification:
+   -------------
+   int USERD_get_block_ghost_flags(int block_number,
+                                   int *ghost_flags)
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  block_number            = The block number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) ghost_flags             = 1D array containing ghost flag value
+                                     for each block cell.
+  
+                                    (Array will have been allocated
+                                     (i-1)*(j-1)*(k-1) for the block long)
+  
+            possible values are:    0  = non-ghost cell  (normal cell)
+                                   >0  = ghost cell
+  
+    Notes:
+    -----
+    * This routine is new in the 2.01 API
+
+    * This will be based on Current_time_step
+  
+    * Only called for structured "block" parts that have some ghost cells
+      as indicated by the USERD_get_ghost_in_block_flag.  The model must
+      of course also have been indicated to have some ghost cells in the
+      USERD_get_ghost_in_model_flag routine.
+  
+    * It is sufficient to set the value to be 1 to flag as a ghost cell,
+      but the value can be any non-zero value, so you could use it to
+      indicate which block or which server (for Server-of-server use) the
+      cell is actually in.
+
+
+
+--------------------------------------------------------------------
+USERD_get_border_availability
+
+   Description:
+   -----------
+   Finds out if border elements are provided by the reader for the
+   desired part, or will need to be computed internally by EnSight.
+
+   Specification:
+   -------------
+   int USERD_get_border_availability(int part_number,
+                                     int number_of_elements[Z_MAXTYPE])
+
+   Returns:
+   -------
+   Z_OK  if border elements will be provided by the reader.
+          (number_of_elements array will be loaded and
+           USERD_get_border_elements_by_type will be called)
+
+   Z_ERR if border elements are not available - thus EnSight must compute.
+          (USERD_get_border_elements_by_type will not be called)
+
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) number_of_elements     = 2D array containing number of
+                                  each type of border element in
+                                  the part.
+                                  ------------
+                                  Possible types are:
+
+                                Z_POINT   =  point
+                                Z_BAR02   =  2-noded bar
+                                Z_BAR03   =  3-noded bar
+                                Z_TRI03   =  3-noded triangle
+                                Z_TRI06   =  6-noded triangle
+                                Z_QUA04   =  4-noded quadrilateral
+                                Z_QUA08   =  8-noded quadrilateral
+
+   Notes:
+   -----
+   * Only called if border representation is used.
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_border_elements_by_type
+
+   Description:
+   -----------
+   Provides border element connectivity and parent information. 
+
+   Specification:
+   -------------
+   int USERD_get_border_elements_by_type(int part_number,
+                                         int element_type,
+                                         int **conn_array,
+                                         short *parent_element_type,
+                                         int *parent_element_num)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number           = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  element_type          = One of the following (See global_extern.h)
+                                 Z_POINT    node point element
+                                 Z_BAR02    2 node bar
+                                 Z_BAR03    3 node bar
+                                 Z_TRI03    3 node triangle
+                                 Z_TRI06    6 node triangle
+                                 Z_QUA04    4 node quad
+                                 Z_QUA08    8 node quad
+
+   (OUT) conn_array            = 2D array containing connectivity
+                                 of each border element of the type.
+
+                                (Array will have been allocated
+                                 num_of_elements of the type by
+                                 connectivity length of the type)
+
+                       ex) If number_of_elements[Z_TRI03] = 25
+                              number_of_elements[Z_QUA04] = 100
+                              number_of_elements[Z_QUA08] = 30
+                           as obtained in:
+                            USERD_get_border_availability
+
+                           Then the allocated dimensions available
+                           for this routine will be:
+                              conn_array[25][3]   when called with Z_TRI03
+
+                              conn_array[100][4]  when called with Z_QUA04
+
+                              conn_array[30][8]   when called with Z_QUA08
+
+   (OUT) parent_element_type   = 1D array containing element type of the
+                                 parent element (the one that the border
+                                 element is a face/edge of).
+
+                                (Array will have been allocated
+                                 num_of_elements of the type long)
+
+   (OUT) parent_element_num   = 1D array containing element number of the
+                                 parent element (the one that the border
+                                 element is a face/edge of).
+
+                                (Array will have been allocated
+                                 num_of_elements of the type long)
+
+   
+   Notes:
+   -----
+   * Not called unless USERD_get_border_availability returned Z_OK
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_changing_geometry_status
+
+   Description:
+   -----------
+   Gets the changing geometry status for the model
+
+   Specification:
+   -------------
+   int USERD_get_changing_geometry_status( void )
+
+   Returns:
+   -------
+   Z_STATIC        if geometry does not change
+   Z_CHANGE_COORDS if changing coordinates only
+   Z_CHANGE_CONN   if changing connectivity
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * EnSight does not support changing number of parts.  But the
+     coords and/or the connectivity of the parts can change.  Note that
+     a part is allowed to be empty (number of nodes and elements equal
+     to zero).
+
+
+--------------------------------------------------------------------
+USERD_get_constant_val
+
+   Description:
+   -----------
+   Get the value of a constant at a time step
+
+   Specification:
+   -------------
+   float USERD_get_constant_value(int which_var,
+                                  int imag_data)
+
+   Returns:
+   -------
+   Value of the requested constant variable
+
+   Arguments:
+   ---------
+   (IN)  which_var            = The variable number
+
+   (IN)  imag_data            = TRUE if want imaginary data value.
+                                FALSE if want real data value.
+
+   Notes:
+   -----
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_dataset_query_file_info
+
+   Description:
+   -----------
+   Get the information about files in the dataset.  Used for the
+   dataset query option within EnSight.
+
+   Specification:
+   -------------
+   int USERD_get_dataset_query_file_info(Z_QFILES *qfiles)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) qfiles   = Structure containing information about each file
+                    of the dataset. The Z_QFILES structure is defined
+                    in the global_extern.h file
+
+                   (The structure will have been allocated
+                    Num_dataset_files long, with 10 description
+                    lines per file).
+
+      qfiles[].name        = The name of the file
+                             (Z_MAXFILENP is the dimensioned length
+                              of the name)
+
+      qfiles[].sizeb       = The number of bytes in the file
+                             (Typically obtained with a call to the
+                              "stat" system routine) (Is a long)
+
+      qfiles[].timemod     = The time the file was last modified 
+                             (Z_MAXTIMLEN is the dimensioned length
+                              of this string)
+                             (Typically obtained with a call to the
+                              "stat" system routine)
+
+      qfiles[].num_d_lines = The number of description lines you
+                              are providing from the file. Max = 10
+
+      qfiles[].f_desc[]    = The description line(s) per file,
+                              qfiles[].num_d_lines of them
+                              (Z_MAXFILENP is the allocated length of
+                               each line)
+
+   Notes:
+   -----
+   * If Num_dataset_files is 0, this routine will not be called.
+     (See USERD_get_number_of_files_in_dataset)
+
+
+--------------------------------------------------------------------
+USERD_get_descrip_lines
+
+   Description:
+   -----------
+   Get two description lines associated with geometry per time step,
+   or one description line associated with a variable per time step.
+
+   Specification:
+   -------------
+   int USERD_get_descrip_lines(int which_type,
+                               int which_var,
+                               int imag_data,
+                               char line1[Z_BUFL],
+                               char line2[Z_BUFL])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  which_type           = Z_GEOM for geometry (2 lines)
+                              = Z_VARI for variable (1 line)
+
+   (IN)  which_var            = If it is a variable, which one.
+                                Ignored if geometry type.
+
+   (IN)  imag_data            = TRUE if want imaginary data file.
+                                FALSE if want real data file.
+
+   (OUT) line1                = The 1st geometry description line,
+                                or the variable description line.
+
+   (OUT) line2                = The 2nd geometry description line
+                                Not used if variable type.
+
+   Notes:
+   -----
+   * Will be based on Current_time_step
+
+   * These are the lines EnSight can echo to the screen in
+     annotation mode.
+
+
+
+--------------------------------------------------------------------
+USERD_get_element_label_status
+
+   Description:
+   -----------
+   Answers the question as to whether element labels will be provided.
+
+   Specification:
+   -------------
+   int USERD_get_element_label_status( void )
+
+   Returns:
+   -------
+   TRUE        if element labels will be provided
+   FALSE       if element labels will NOT be provided
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * element lables are needed in order to do any element querying, or
+     element labeling on-screen within EnSight.
+
+   * Prior to API 2.01:
+     -----------------
+       For unstructured parts, you can read them from your file if
+       available, or can assign them, etc. They need to be unique
+       per part, and are often unique per model.
+
+       API 1.0:
+         USERD_get_element_ids_for_part is used to obtain the ids,
+         on a part by part basis, if TRUE status is returned here.
+
+       API 2.0:
+         USERD_get_part_element_ids_by_type is used to obtain the ids,
+         on a per part, per type basis, if TRUE status is returned here.
+
+       For structured parts, EnSight will assign ids if you return a
+         status of TRUE here.  You cannot assign them youself!!
+
+   * Starting at API 2.01:
+     --------------------
+       For both unstructured and structured parts, you can read them
+       from your file if available, or can assign them, etc. They need
+       to be unique per part, and are often unique per model (especially
+       if you are dealing with a decomposed dataset).
+
+       USERD_get_part_element_ids_by_type is used to obtain the ids,
+       on an element type by part basis, if TRUE status is returned here.
+
+   * Will call USERD_get_part_element_ids_by_type for each type of
+     of each part if this routine returns TRUE.
+--------------------------------------------------------------------
+USERD_get_geom_timeset_number -
+
+   Description:
+   -----------
+    Gets the timeset number to be used for geometry
+
+   Specification:
+   -------------
+   int USERD_get_geom_timeset_number( void )
+
+   Returns:
+   -------
+   Geom_timeset_number = The timeset number that will be used for geometry.   
+                         For example, if USERD_get_number_of timesets
+                         returns 2, the valid timeset numbers would be
+                         1 or 2.
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   *  If your model is static, which you indicated by returning a zero
+      in USERD_get_number_of_timesets, you can return a zero here as well.
+
+
+
+--------------------------------------------------------------------
+USERD_get_gold_part_build_info
+
+   Description:
+   -----------
+   Gets the info needed for the part building process.
+
+   Specification:
+   -------------
+   int USERD_get_gold_part_build_info(int *part_id,
+                                      int *part_types,
+                                      char *part_description[Z_BUFL],
+                                      int *number_of_nodes,
+                                      int *number_of_elements[Z_MAXTYPE],
+                                      int *ijk_dimensions[9],
+                                      int *iblanking_options[6])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+    (OUT) part_id                = Array containing the external part
+                                   ids for each of the model parts.
+
+                                   IMPORTANT:
+                                    Parts numbers must be >= 1, because
+                                    of the way they are used in the GUI
+
+               *******************************************
+                The ids provided here are the numbers by
+                which the parts will be referred to in the
+                GUI (if possible). They are basically
+                labels as far as you are concerned.
+
+                Note: The part numbers you pass to routines
+                which receive a part_number or block_number
+                or which_part as an argument are the 1-based
+                table index of the parts!
+
+                example:  If Numparts_available = 3
+
+                          Table index        part_id
+                          -----------        -------
+                           1                  13
+                           2                  57
+                           3                  125
+
+                           ^                   ^
+                           |                   |
+                           |                    These are placed in:
+                           |                      part_id[0] = 13
+                           |                      part_id[1] = 57
+                           |                      part_id[2] = 125
+                           |                    for GUI labeling purposes.
+                           |
+                            These implied table indices are the part_number,
+                            block_number, or which_part numbers that you would
+                            pass to routines like:
+
+                           USERD_get_part_coords(int part_number,...
+                           USERD_get_part_node_ids(int part_number,...
+                           USERD_get_part_elements_by_type(int part_number,...
+                           USERD_get_part_element_ids_by_type(int part_number,...
+                           USERD_get_block_coords_by_component(int block_number,...
+                           USERD_get_block_iblanking(int block_number,...
+                           USERD_get_block_ghost_flags(int block_number,...
+                           USERD_get_ghosts_in_block_flag(int block_number)
+                           USERD_get_border_availability(int part_number,...
+                           USERD_get_border_elements_by_type(int part_number,...
+                           USERD_get_var_by_component(int which_variable,
+                                                      int which_part,...
+                           USERD_get_var_value_at_specific(int which_var,
+                                                           int which_node_or_elem,
+                                                           int which_part,...
+               ********************************************
+
+                                    (Array will have been allocated
+                                     Numparts_available long)
+
+   (OUT) part_types             = Array containing one of the
+                                  following for each model part:
+
+                                       Z_UNSTRUCTURED or
+                                       Z_STRUCTURED  or
+                                       Z_IBLANKED
+
+                                  (Array will have been allocated
+                                   Numparts_available long)
+
+   (OUT) part_description       = Array containing a description
+                                  for each of the model parts
+
+                                  (Array will have been allocated
+                                   Numparts_available by Z_BUFL
+                                   long)
+
+   (OUT) number_of_nodes        = Number of unstructured nodes in the part
+ 
+                                   (Array will have been allocated
+                                    Numparts_available long)
+
+   (OUT) number_of_elements     = 2D array containing number of
+                                  each type of element for each
+                                  unstructured model part.
+                                  ------------
+                                  Possible types are:
+
+                                Z_POINT   =  point
+                                Z_BAR02   =  2-noded bar
+                                Z_BAR03   =  3-noded bar
+                                Z_TRI03   =  3-noded triangle
+                                Z_TRI06   =  6-noded triangle
+                                Z_QUA04   =  4-noded quadrilateral
+                                Z_QUA08   =  8-noded quadrilateral
+                                Z_TET04   =  4-noded tetrahedron
+                                Z_TET10   = 10-noded tetrahedron
+                                Z_PYR05   =  5-noded pyramid
+                                Z_PYR13   = 13-noded pyramid
+                                Z_PEN06   =  6-noded pentahedron
+                                Z_PEN15   = 15-noded pentahedron
+                                Z_HEX08   =  8-noded hexahedron
+                                Z_HEX20   = 20-noded hexahedron
+
+                                Z_G_POINT =  ghost node point element
+                                Z_G_BAR02 =  2 node ghost bar
+                                Z_G_BAR03 =  3 node ghost bar
+                                Z_G_TRI03 =  3 node ghost triangle
+                                Z_G_TRI06 =  6 node ghost triangle
+                                Z_G_QUA04 =  4 node ghost quad
+                                Z_G_QUA08 =  8 node ghost quad
+                                Z_G_TET04 =  4 node ghost tetrahedron
+                                Z_G_TET10 = 10 node ghost tetrahedron
+                                Z_G_PYR05 =  5 node ghost pyramid
+                                Z_G_PYR13 = 13 node ghost pyramid
+                                Z_G_PEN06 =  6 node ghost pentahedron
+                                Z_G_PEN15 = 15 node ghost pentahedron
+                                Z_G_HEX08 =  8 node ghost hexahedron
+                                Z_G_HEX20 = 20 node ghost hexahedron
+
+                               (Ignored unless Z_UNSTRUCTURED type)
+
+                                  (Array will have been allocated
+                                   Numparts_available by
+                                   Z_MAXTYPE long)
+
+   (OUT) ijk_dimensions         = 2D array containing ijk dimension info
+                                  for structured blocks
+
+                                  For Z_UNSTRUCTURED - is ignored
+
+                                  For Z_STRUCTURED or Z_IBLANKED
+
+        Prior to version 2.03:
+        ----------------------
+                                   (Array will have been allocated
+                                    Numparts_available by 3 long)
+
+                              ijk_dimensions[][0] = I dimension
+                              ijk_dimensions[][1] = J dimension
+                              ijk_dimensions[][2] = K dimension
+
+
+        Starting at version 2.03:
+        ------------------------
+                                   (Array will have been allocated
+                                    Numparts_available by 9 long)
+
+                              There are two ways to do this:
+                              ------------------------------
+                              1. The simple one, without ranges.
+
+                                   This is good for all structured models
+                                   that will NOT be used in EnSight's
+                                   Server of Servers
+
+                                   Simply provide the ijk dimensions in the
+                                   first three slots and place a -1 in
+                                   the 4th slot.  (The remaining slots will
+                                   be ignored).
+
+                              Thus,
+                              ijk_dimensions[][0] = I dimension of block
+                              ijk_dimensions[][1] = J dimension of block
+                              ijk_dimensions[][2] = K dimension of block
+                              ijk_dimensions[][3] = -1
+
+                        (J planes)
+                            4 *-------*-------*
+                              |       |       |    ijk_dimension[0][0] = 3
+                              |       |       |    ijk_dimension[0][1] = 4
+                              |       |       |    ijk_dimension[0][2] = 1
+                            3 *-------*-------*
+                              |       |       |    ijk_dimension[0][4] = -1
+                              |       |       |
+                              |       |       |
+                            2 *-------*-------*
+                              |       |       |
+                              |       |       |
+                              |       |       |
+                            1 *-------*-------*
+                              1       2       3  (I planes)
+
+
+
+                              2. Using ranges.
+
+                                  This one can be used anytime, but MUST
+                                  be used if EnSight's Server of Servers
+                                  is to be used!
+
+                                  The first 3 slots contain the ijk dimension
+                                  of the complete block (of which this may be
+                                  a portion).  The last 6 slots contain the
+                                  ijk min and max ranges within the complete.
+
+                              Thus,
+                              ijk_dimensions[][0] = I dim of complete block
+                              ijk_dimensions[][1] = J dim of complete block
+                              ijk_dimensions[][2] = K dim of complete block
+
+                              ijk_dimensions[][3] = Imin of portion (1-based)
+                              ijk_dimensions[][4] = Imax of portion (1-based)
+                              ijk_dimensions[][5] = Jmin of portion (1-based)
+                              ijk_dimensions[][6] = Jmax of portion (1-based)
+                              ijk_dimensions[][7] = Kmin of portion (1-based)
+                              ijk_dimensions[][8] = Kmax of portion (1-based)
+
+
+                              example1: (Model has one part, a simple 2D block,
+                                         and want whole thing)
+
+                        (J planes)
+                            4 *-------*-------*
+                              |       |       |    ijk_dimension[0][0] = 3
+                              |       |       |    ijk_dimension[0][1] = 4
+                              |       |       |    ijk_dimension[0][2] = 1
+                            3 *-------*-------*
+                              |       |       |    ijk_dimension[0][3] = 1
+                              |       |       |    ijk_dimension[0][4] = 3
+                              |       |       |    ijk_dimension[0][5] = 1
+                            2 *-------*-------*    ijk_dimension[0][6] = 4
+                              |       |       |    ijk_dimension[0][7] = 1
+                              |       |       |    ijk_dimension[0][8] = 1
+                              |       |       |
+                            1 *-------*-------*
+                              1       2       3  (I planes)
+
+
+                              example2: (Want to have the block represented
+                                         in two portions - 2 parts)
+
+                        (J planes)                 top portion
+                            4 *-------*-------*
+                              |       |       |    ijk_dimension[0][0] = 3
+                              |       |       |    ijk_dimension[0][1] = 4
+                              |       |       |    ijk_dimension[0][2] = 1
+                            3 *-------*-------*
+                              .       .       .    ijk_dimension[0][3] = 1
+                              .       .       .    ijk_dimension[0][4] = 3
+                              .       .       .    ijk_dimension[0][5] = 3
+                            2 .................    ijk_dimension[0][6] = 4
+                              .       .       .    ijk_dimension[0][7] = 1
+                              .       .       .    ijk_dimension[0][8] = 1
+                              .       .       .
+                            1 .................
+                              1       2       3  (I planes)
+
+
+                        (J planes)                 bottom portion
+                            4 .................
+                              .       .       .    ijk_dimension[1][0] = 3
+                              .       .       .    ijk_dimension[2][1] = 4
+                              .       .       .    ijk_dimension[3][2] = 1
+                            3 *-------*-------*
+                              |       |       |    ijk_dimension[1][3] = 1
+                              |       |       |    ijk_dimension[1][4] = 3
+                              |       |       |    ijk_dimension[1][5] = 1
+                            2 *-------*-------*    ijk_dimension[1][6] = 3
+                              |       |       |    ijk_dimension[1][7] = 1
+                              |       |       |    ijk_dimension[1][8] = 1
+                              |       |       |
+                            1 *-------*-------*
+                              1       2       3  (I planes)
+
+
+        And note that if you were partioning this block for
+        EnSight's Server of Servers, you would only have one part,
+        instead of two.  Each SOS server would return its appropriate
+        ranges in the last 6 slots. The first 3 slots would remain constant.
+
+
+   (OUT) iblanking_options      = 2D array containing iblanking
+                                  options possible for each
+                                  structured model part.
+                                  ----------
+                                  (Ignored unless Z_IBLANKED type)
+
+                                  (Array will have been allocated
+                                   Numparts_available by 6 long)
+
+      iblanking_options[][Z_EXT]     = TRUE if external (outside)
+                       [][Z_INT]     = TRUE if internal (inside)
+                       [][Z_BND]     = TRUE if boundary
+                       [][Z_INTBND]  = TRUE if internal boundary
+                       [][Z_SYM]     = TRUE if symmetry surface
+
+
+   Notes:
+   -----
+   * If you haven't built a table of pointers to the different parts,
+     you might want to do so here as you gather the needed info.
+
+   * Will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_gold_variable_info
+
+   Description:
+   -----------
+   Get the variable descriptions, types and filenames
+
+   Specification:
+   -------------
+   int USERD_get_gold_variable_info(char **var_description,
+                                    char **var_filename,
+                                    int *var_type,
+                                    int *var_classify,
+                                    int *var_complex,
+                                    char **var_ifilename,
+                                    float *var_freq,
+                                    int *var_contran,
+                                    int *var_timeset)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) var_description      = Variable descriptions
+
+                                (Array will have been allocated
+                                 Num_variables by Z_BUFL long)
+
+           variable description restrictions:
+           ----------------------------------
+           1. Only first 19 characters used in EnSight.
+           2. Leading and trailing whitespace will be removed by EnSight.
+           3. Illegal characters will be replaced by underscores.
+           4. Thay may not start with a numeric digit.
+           4. No two variables may have the same description.
+
+
+   (OUT) var_filename         = Variable real filenames
+
+                                (Array will have been allocated
+                                 Num_variables by Z_BUFL long)
+
+   (OUT) var_type             = Variable type
+
+                                (Array will have been allocated
+                                 Num_variables long)
+
+                                types are:  Z_CONSTANT
+                                            Z_SCALAR
+                                            Z_VECTOR
+                                            Z_TENSOR
+                                            Z_TENSOR9
+
+   (OUT) var_classify         = Variable classification
+
+                                (Array will have been allocated
+                                 Num_variables long)
+
+                                types are:  Z_PER_NODE
+                                            Z_PER_ELEM
+
+   (OUT) var_complex          = TRUE if complex, FALSE otherwise
+ 
+                                (Array will have been allocated
+                                 Num_variables long)
+ 
+   (OUT) var_ifilename        = Variable imaginary filenames (if complex)
+ 
+                                (Array will have been allocated
+                                 Num_variables by Z_BUFL long)
+
+   (OUT) var_freq             = complex frequency  (if complex)
+ 
+                                (Array will have been allocated
+                                 Num_variables long)
+ 
+   (OUT) var_contran          = TRUE if constant changes per time step
+                                FALSE if constant truly same at all time steps
+ 
+                                (Array will have been allocated
+                                 Num_variables long)
+
+   (OUT) var_timeset          = Timeset the variable will use (1 based).
+                                (For static models, set it to 1)
+
+                                (Array will have been allocated
+                                 Num_variables long)
+
+                                 For example:  If USERD_get_number_of_timesets
+                                               returns 2, the valid
+                                               timeset_number's would be 1 or 2
+
+
+   Notes:
+   -----
+   * The implied variable numbers apply, but be aware that the
+     arrays are zero based.
+     So for variable 1, will need to provide   var_description[0]
+                                               var_filename[0]
+                                               var_type[0]
+                                               var_classify[0]
+                                               var_complex[0]
+                                               var_ifilename[0]
+                                               var_freq[0]
+                                               var_contran[0]
+                                               var_timeset[0]
+
+
+        for variable 2, will need to provide   var_description[1]
+                                               var_filename[1]
+                                               var_type[1]
+                                               var_classify[1]
+                                               var_complex[1]
+                                               var_ifilename[1]
+                                               var_freq[1]
+                                               var_contran[1]
+                                               var_timeset[1]
+              etc.
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_ghosts_in_block_flag
+
+   Description:
+   -----------
+   Gets whether ghost cells present in block or not
+
+   Specification:
+   -------------
+  int USERD_get_ghosts_in_block_flag(int block_number)
+
+   Returns:
+   -------
+   TRUE  if any ghost cells in this structured part
+   FALSE if no ghost cells in this structured part
+
+   Arguments:
+   ---------
+   (IN) block_number      = The block part number
+                              (1-based index of part table, namely:
+
+                                1 ... Numparts_available.
+
+                              It is NOT the part_id that
+                              is loaded in USERD_get_gold_part_build_info)
+
+   Notes:
+   -----
+    * This routine is new in the 2.01 API
+    * This will be based on Current_time_step
+  
+    * Intended for structured parts only, value will be ignored for
+      unstructured parts
+
+
+
+--------------------------------------------------------------------
+USERD_get_ghosts_in_model_flag
+
+   Description:
+   -----------
+   Answers the question as to whether any ghost cells in the model.
+
+   Specification:
+   -------------
+  int USERD_get_ghosts_in_model_flag( void )
+
+   Returns:
+   -------
+   TRUE  if any ghost cells in the model
+   FALSE if no ghost cells in the model
+
+   Arguments:
+   ---------
+  
+   Notes:
+   -----
+    * This routine is new in the 2.01 API
+
+-------------------------------------------------------------------------
+USERD_get_matf_set_info
+
+   Description:
+   -----------
+   Get the material set ids and names
+
+   Specification:
+   -------------
+   int USERD_get_matf_set_info(int *mat_set_ids,
+                               char **mat_set_name)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) mat_set_ids  = 1D material set ids array
+
+                               (Array will have been allocated
+                                Num_material_sets long)
+
+   (OUT) mat_set_name = 2D material set name array
+
+                               (Array will have been allocated
+                                Num_material_sets by Z_BUFL long)
+
+   Notes:
+   -----
+   * Will not be called if Num_material_sets is zero
+   * See USERD_get_number_of_material_sets header for explanatory example
+
+
+--------------------------------------------------------------------
+USERD_get_matf_var_info
+
+   Description:
+   -----------
+   Gets the material ids and descriptions for the material set
+
+   Specification:
+   -------------
+   int USERD_get_matf_var_info(int set_index,
+                               int *mat_ids,
+                               char **mat_desc)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  set_index               = the material set index (zero based)
+
+   (OUT) mat_ids[set_index]      = 1D integer array containing the material
+                                   ids to associated with each material
+
+                                    (Array will have been allocated
+                                     Num_materials[set_index] long)
+
+   (OUT) mat_desc[set_index]     = 2D char array containing the material
+                                   descriptions to associated with each material
+
+                                    (Array will have been allocated
+                                     Num_materials[set_index] by Z_BUFL long)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero, or
+     Num_materials[set_index] is zero
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_maxsize_info
+
+   Description:
+   -----------
+   Gets maximum part sizes for efficient memory allocation.
+
+   Transient models (especially those that increase in size) can cause
+   reallocations, at time step changes, to keep chewing up more and
+   more memory.   The way to avoid this is to know what the maximum
+   size of such memory will be, and allocate for this maximum initially.
+
+   Accordingly, if you choose to provide this information (it is optional),
+   EnSight will take advantage of it.
+
+
+   Specification:
+   -------------
+   int USERD_get_maxsize_info(int *max_number_of_nodes,
+                              int *max_number_of_elements[Z_MAXTYPE],
+                              int *max_ijk_dimensions[3])
+
+   Returns:
+   -------
+   Z_OK  if supplying maximum data
+   Z_ERR if not supplying maximum data, or some error occurred
+           while trying to obtain it.
+
+   Arguments:
+   ---------
+   (OUT) max_number_of_nodes    = Maximum number of unstructured nodes
+                                  in the part (over all time).
+ 
+                                   (Array will have been allocated
+                                    Numparts_available long)
+
+   (OUT) max_number_of_elements = 2D array containing maximum number of
+                                  each type of element for each
+                                  unstructured model part (over all time).
+                                  ------------
+                                  Possible types are:
+
+                                Z_POINT   =  point
+                                Z_BAR02   =  2-noded bar
+                                Z_BAR03   =  3-noded bar
+                                Z_TRI03   =  3-noded triangle
+                                Z_TRI06   =  6-noded triangle
+                                Z_QUA04   =  4-noded quadrilateral
+                                Z_QUA08   =  8-noded quadrilateral
+                                Z_TET04   =  4-noded tetrahedron
+                                Z_TET10   = 10-noded tetrahedron
+                                Z_PYR05   =  5-noded pyramid
+                                Z_PYR13   = 13-noded pyramid
+                                Z_PEN06   =  6-noded pentahedron
+                                Z_PEN15   = 15-noded pentahedron
+                                Z_HEX08   =  8-noded hexahedron
+                                Z_HEX20   = 20-noded hexahedron
+
+                                Z_G_POINT =  ghost node point element
+                                Z_G_BAR02 =  2 node ghost bar
+                                Z_G_BAR03 =  3 node ghost bar
+                                Z_G_TRI03 =  3 node ghost triangle
+                                Z_G_TRI06 =  6 node ghost triangle
+                                Z_G_QUA04 =  4 node ghost quad
+                                Z_G_QUA08 =  8 node ghost quad
+                                Z_G_TET04 =  4 node ghost tetrahedron
+                                Z_G_TET10 = 10 node ghost tetrahedron
+                                Z_G_PYR05 =  5 node ghost pyramid
+                                Z_G_PYR13 = 13 node ghost pyramid
+                                Z_G_PEN06 =  6 node ghost pentahedron
+                                Z_G_PEN15 = 15 node ghost pentahedron
+                                Z_G_HEX08 =  8 node ghost hexahedron
+                                Z_G_HEX20 = 20 node ghost hexahedron
+
+                               (Ignored unless Z_UNSTRUCTURED type)
+
+                                  (Array will have been allocated
+                                   Numparts_available by
+                                   Z_MAXTYPE long)
+
+   (OUT) max_ijk_dimensions  = 2D array containing maximum ijk dimensions
+                               for each structured model part (over all time).
+                                           ----------
+                                (Ignored if Z_UNSTRUCTURED type)
+
+                                (Array will have been allocated
+                                 Numparts_available by 3 long)
+
+                             max_ijk_dimensions[][0] = maximum I dimension
+                             max_ijk_dimensions[][1] = maximum J dimension
+                             max_ijk_dimensions[][2] = maximum K dimension
+
+   Notes:
+   -----
+   * You need to have first called USERD_get_number_of_model_parts and
+     USERD_get_gold_part_build_info, so Numparts_available is known and
+     so EnSight will know what the type is (Z_UNSTRUCTURED, Z_STRUCTURED,
+     or Z_IBLANKED) of each part.
+
+   * This will NOT be based on Current_time_step - it is to be the maximum
+     values over all time!!
+
+   * This information is optional.  If you return Z_ERR, Ensight will still
+     process things fine, reallocating as needed, etc.  However, for
+     large transient models you will likely use considerably more memory
+     and take more processing time for the memory reallocations. So, if it
+     is possible to provide this information "up front", it is recommended
+     to do so.
+
+
+--------------------------------------------------------------------
+USERD_get_model_extents
+
+   Description:
+   -----------
+   Gets the model bounding box extents.  If this routine supplys them
+   EnSight will not have to spend time doing so.  If this routine
+   returns Z_ERR, EnSight will have to take the time to touch all the
+   nodes and gather the extent info.
+
+   Specification:
+   -------------
+   int USERD_get_model_extents(float extents[6])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful  (whereupon EnSight will determine by reading
+                             all coords of all parts)
+
+   Arguments:
+   ---------
+   (OUT) extents[0]   = min x
+                [1]   = max x
+                [2]   = min y
+                [3]   = max y
+                [4]   = min z
+                [5]   = max z
+
+   Notes:
+   -----
+   * This will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_name_of_reader
+
+   Description:
+   -----------
+   Gets the name of your user defined reader.  The user interface will
+   ask for this and include it in the available reader list.
+
+   Specification:
+   -------------
+   int USERD_get_name_of_reader(char reader_name[Z_MAX_USERD_NAME],
+				int *two_fields)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) reader_name          = the name of the your reader or data format.
+                              (max length is Z_MAX_USERD_NAME, which is 20)
+
+   (OUT) two_fields          = FALSE if only one data field is      
+                                      required.                      
+                                TRUE if two data fields required     
+ 
+                                -1   if one field (Geom) required 
+                                     and one field (Param) is optional
+                                     Param field can contain any text
+                                     for example a file name, modifiers,
+                                     etc. that can be used to modify the
+                                     reader's behavior.
+ 
+
+   Notes:
+   -----
+   * Always called.  Please be sure to provide a name for your custom
+     reader format.
+
+--------------------------------------------------------------------
+USERD_get_nfaced_conn
+
+   Description:
+   -----------
+   Gets the array containing the connectivity of nsided faces of nfaced elements
+
+   Specification:
+   -------------int
+   int USERD_get_nfaced_conn(int part_number,
+                             int *nfaced_conn_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number        = the part number
+
+   (OUT) nfaced_conn_array  = 1D array of nsided face connectivies of nfaced
+                              elements
+
+                              (int array will have been allocated long enough to
+                               hold all the nsided face connectivities. Which is
+                               the sum of all the nodes per face values in the
+                               nfaced_npf_array of USERD_get_nfaced_nodes_per_face)
+
+   Notes:
+   -----
+ * Will not be called unless there are some nfaced elements in the part
+
+ * Providing nfaced information to Ensight:
+
+     1. In USERD_get_gold_part_build_info, provide the number of nfaced
+        polyhedral elements in the part.
+
+     2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+        the number of faces per nfaced element. (as if connectivity
+        length of an nfaced element is one)
+
+     3. In this routine, provide the streamed number of nodes per face
+        for each of the faces of the nfaced elements.
+
+
+     Simple example:         11        10   12
+                            +--------+-----+
+     2 nfaced elements:    /|        |\   /|
+     (1 7-faced           / |        | \ / |
+      1 5-sided)         /  |        |  +9 |
+                        /   |        | /|  |
+                       /7   |      8 /  |  |
+                      +-----------+/ |  |  |
+                      |     |5    |  |4 |  |6
+                      |     +-----|--+--|--+
+                      |    /      |   \ | /
+                      |   /       |    \|/3
+                      |  /        |     +
+                      | /         |    /
+                      |/1         |2 /
+                      +-----------+/
+
+      1. In USERD_get_gold_part_build_info:
+              number_of_elements[Z_NFACED] = 2
+                                             .
+                                            /|\
+                                             |
+      2. In USERD_get_part_elements_by_type:
+          length of conn_array will be:      2 x 1
+          for element_type of Z_NFACED:
+              conn_array[0][0] = 7           (for the 7-faced element)
+              conn_array[1][0] = 5           (for the 5-faced element)
+
+                                ==
+                           Sum  12    <---------+
+                                                |
+      3. In USERD_get_faced_nodes_per_face:     |
+           length of nfaced_npf_array will be:  12
+
+            nfaced_npf_array[0]  = 5  (5-noded top face of 7-faced element)
+            nfaced_npf_array[1]  = 5  (5-noded bot face of 7-faced element)
+            nfaced_npf_array[2]  = 4  (4-noded front face of 7-faced element)
+            nfaced_npf_array[3]  = 4  (4-noded left face of 7-faced element)
+            nfaced_npf_array[4]  = 4  (4-noded back face of 7-faced element)
+            nfaced_npf_array[5]  = 4  (4-noded right front face of 7-faced element)
+            nfaced_npf_array[6]  = 4  (4-noded right back face of 7-faced element)
+
+            nfaced_npf_array[7]  = 3  (3-noded top face of 5-faced element)
+            nfaced_npf_array[8]  = 3  (3-noded bot face of 5-faced element)
+            nfaced_npf_array[9]  = 4  (4-noded back face of 5-faced element)
+            nfaced_npf_array[10] = 4  (4-noded right face of 5-faced element)
+            nfaced_npf_array[11] = 4  (4-noded left front face of 5-faced element)
+
+                                   ==
+                             Sum   48   <-------------+
+                                                      |
+      4. In this function:                            |
+            length of the nfaced_conn_array will be:  48
+
+            nsided_conn_array[0] = 7   (conn of 5-noded top face of 7-faced elem)
+            nsided_conn_array[1] = 8
+            nsided_conn_array[2] = 9
+            nsided_conn_array[3] = 10
+            nsided_conn_array[4] = 11
+
+            nsided_conn_array[5] = 1   (conn of 5-noded bot face of 7-faced elem)
+            nsided_conn_array[6] = 5
+            nsided_conn_array[7] = 4
+            nsided_conn_array[8] = 3
+            nsided_conn_array[9] = 2
+
+            nsided_conn_array[10] = 1  (conn of 4-noded front face of 7-faced elem)
+            nsided_conn_array[11] = 2
+            nsided_conn_array[12] = 8
+            nsided_conn_array[13] = 7
+
+            nsided_conn_array[14] = 5  (conn of 4-noded left face of 7-faced elem)
+            nsided_conn_array[15] = 1
+            nsided_conn_array[16] = 7
+            nsided_conn_array[17] = 11
+
+            nsided_conn_array[18] = 4  (conn of 4-noded back face of 7-faced elem)
+            nsided_conn_array[19] = 5
+            nsided_conn_array[20] = 11
+            nsided_conn_array[21] = 10
+
+            nsided_conn_array[22] = 2  (conn of 4-noded right front face of 7-faced)
+            nsided_conn_array[23] = 3
+            nsided_conn_array[24] = 9
+            nsided_conn_array[25] = 8
+
+            nsided_conn_array[26] = 3  (conn of 4-noded right back face of 7-faced)
+            nsided_conn_array[27] = 4
+            nsided_conn_array[28] = 10
+            nsided_conn_array[29] = 9
+
+            nsided_conn_array[30] = 9  (conn of 3-noded top face of 5-faced elem)
+            nsided_conn_array[32] = 12
+            nsided_conn_array[32] = 10
+
+            nsided_conn_array[33] = 3  (conn of 3-noded bot face of 5-faced elem)
+            nsided_conn_array[34] = 4
+            nsided_conn_array[35] = 6
+
+            nsided_conn_array[36] = 6  (conn of 4-noded back face of 5-faced elem)
+            nsided_conn_array[37] = 4
+            nsided_conn_array[38] = 10
+            nsided_conn_array[39] = 12
+
+            nsided_conn_array[40] = 3  (conn of 4-noded right face of 5-faced elem)
+            nsided_conn_array[41] = 6
+            nsided_conn_array[42] = 12
+            nsided_conn_array[43] = 9
+
+            nsided_conn_array[44] = 4  (conn of 4-noded left front face of 5-faced)
+            nsided_conn_array[45] = 3
+            nsided_conn_array[46] = 9
+            nsided_conn_array[47] = 10
+
+
+
+--------------------------------------------------------------------
+USERD_get_nfaced_nodes_per_face -
+
+   Description:
+   -----------
+   Gets the array containing the number of nodes per face for each face
+   of the nfaced elements.
+
+   Specification:
+   -------------
+   int USERD_get_nfaced_nodes_per_face(int part_number,
+                                       int *nfaced_npf_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number       = the part number
+
+   (OUT) nfaced_npf_array  = 1D array of nodes per face for all faces of
+                             nfaced elements
+
+                             (int array will have been allocated long enough
+                              to hold all the nodes_per_face values. Which is
+                              the sum of all the number of faces per element
+                              values in the conn_array of
+                              USERD_get_part_elements_by_type)
+
+   Notes:
+   -----
+   * Will not be called unless there are some nfaced elements in the
+     the part
+
+   * Providing nfaced information to Ensight:
+
+     1. In USERD_get_gold_part_build_info, provide the number of nfaced
+        polyhedral elements in the part.
+
+     2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+        the number of faces per nfaced element. (as if connectivity
+        length of an nfaced element is one)
+
+     3. In this routine, provide the streamed number of nodes per face
+        for each of the faces of the nfaced elements.
+
+
+     Simple example:         11        10   12
+                            +--------+-----+
+     2 nfaced elements:    /|        |\   /|
+     (1 7-faced           / |        | \ / |
+      1 5-sided)         /  |        |  +9 |
+                        /   |        | /|  |
+                       /7   |      8 /  |  |
+                      +-----------+/ |  |  |
+                      |     |5    |  |4 |  |6
+                      |     +-----|--+--|--+
+                      |    /      |   \ | /
+                      |   /       |    \|/3
+                      |  /        |     +
+                      | /         |    /
+                      |/1         |2 /
+                      +-----------+/
+
+      1. In USERD_get_gold_part_build_info:
+              number_of_elements[Z_NFACED] = 2
+                                             .
+                                            /|\
+                                             |
+      2. In USERD_get_part_elements_by_type:
+          length of conn_array will be:      2 x 1
+          for element_type of Z_NFACED:
+              conn_array[0][0] = 7           (for the 7-faced element)
+              conn_array[1][0] = 5           (for the 5-faced element)
+
+                                ==
+                           Sum  12    <---------+
+                                                |
+      3. In this routine:                       |
+           length of nfaced_npf_array will be:  12
+
+            nfaced_npf_array[0]  = 5  (5-noded top face of 7-faced element)
+            nfaced_npf_array[1]  = 5  (5-noded bot face of 7-faced element)
+            nfaced_npf_array[2]  = 4  (4-noded front face of 7-faced element)
+            nfaced_npf_array[3]  = 4  (4-noded left face of 7-faced element)
+            nfaced_npf_array[4]  = 4  (4-noded back face of 7-faced element)
+            nfaced_npf_array[5]  = 4  (4-noded right front face of 7-faced element)
+            nfaced_npf_array[6]  = 4  (4-noded right back face of 7-faced element)
+
+            nfaced_npf_array[7]  = 3  (3-noded top face of 5-faced element)
+            nfaced_npf_array[8]  = 3  (3-noded bot face of 5-faced element)
+            nfaced_npf_array[9]  = 4  (4-noded back face of 5-faced element)
+            nfaced_npf_array[10] = 4  (4-noded right face of 5-faced element)
+            nfaced_npf_array[11] = 4  (4-noded left front face of 5-faced element)
+
+                                   ==
+                             Sum   48   <-------------+
+                                                      |
+      4. In USERD_get_nfaced_conn:                    |
+            length of the nfaced_conn_array will be:  48
+
+            nsided_conn_array[0] = 7   (conn of 5-noded top face of 7-faced elem)
+            nsided_conn_array[1] = 8
+            nsided_conn_array[2] = 9
+            nsided_conn_array[3] = 10
+            nsided_conn_array[4] = 11
+
+            nsided_conn_array[5] = 1   (conn of 5-noded bot face of 7-faced elem)
+            nsided_conn_array[6] = 5
+            nsided_conn_array[7] = 4
+            nsided_conn_array[8] = 3
+            nsided_conn_array[9] = 2
+
+            nsided_conn_array[10] = 1  (conn of 4-noded front face of 7-faced elem)
+            nsided_conn_array[11] = 2
+            nsided_conn_array[12] = 8
+            nsided_conn_array[13] = 7
+
+            nsided_conn_array[14] = 5  (conn of 4-noded left face of 7-faced elem)
+            nsided_conn_array[15] = 1
+            nsided_conn_array[16] = 7
+            nsided_conn_array[17] = 11
+
+            nsided_conn_array[18] = 4  (conn of 4-noded back face of 7-faced elem)
+            nsided_conn_array[19] = 5
+            nsided_conn_array[20] = 11
+            nsided_conn_array[21] = 10
+
+            nsided_conn_array[22] = 2  (conn of 4-noded right front face of 7-faced)
+            nsided_conn_array[23] = 3
+            nsided_conn_array[24] = 9
+            nsided_conn_array[25] = 8
+
+            nsided_conn_array[26] = 3  (conn of 4-noded right back face of 7-faced)
+            nsided_conn_array[27] = 4
+            nsided_conn_array[28] = 10
+            nsided_conn_array[29] = 9
+
+            nsided_conn_array[30] = 9  (conn of 3-noded top face of 5-faced elem)
+            nsided_conn_array[32] = 12
+            nsided_conn_array[32] = 10
+
+            nsided_conn_array[33] = 3  (conn of 3-noded bot face of 5-faced elem)
+            nsided_conn_array[34] = 4
+            nsided_conn_array[35] = 6
+
+            nsided_conn_array[36] = 6  (conn of 4-noded back face of 5-faced elem)
+            nsided_conn_array[37] = 4
+            nsided_conn_array[38] = 10
+            nsided_conn_array[39] = 12
+
+            nsided_conn_array[40] = 3  (conn of 4-noded right face of 5-faced elem)
+            nsided_conn_array[41] = 6
+            nsided_conn_array[42] = 12
+            nsided_conn_array[43] = 9
+
+            nsided_conn_array[44] = 4  (conn of 4-noded left front face of 5-faced)
+            nsided_conn_array[45] = 3
+            nsided_conn_array[46] = 9
+            nsided_conn_array[47] = 10
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_node_label_status
+
+   Description:
+   -----------
+   Answers the question as to whether node labels will be provided.
+
+   Specification:
+   -------------
+   int USERD_get_node_label_status( void )
+
+   Returns:
+   -------
+   TRUE        if node labels will be provided
+   FALSE       if node labels will NOT be provided
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * Node ids are needed in order to do any node querying, or node
+     labeling on-screen within EnSight.
+
+   * Prior to API 2.01:
+     -----------------
+       For unstructured parts, you can read them from your file if
+       available, or can assign them, etc. They need to be unique
+       per part, and are often unique per model.  They must also be
+       positive numbers greater than zero.
+
+         USERD_get_part_node_ids is used to obtain the ids, if the
+         status returned here is TRUE.
+
+         (Unlike API 1.0, where the connectivity of elements had to be
+          according to the node ids - API 2.0's element connectivities
+          are not affected either way by the status here.)
+
+       For structured parts, EnSight will assign ids if you return a
+         status of TRUE here.  You cannot assign them yourself!!
+
+   * Starting at API 2.01:
+     --------------------
+       For both unstructured and structured parts, you can read them
+       from your file if available, or can assign them, etc. They need
+       to be unique per part, and are often unique per model. They must
+       also be positive numbers greater than zero.
+
+       USERD_get_part_node_ids is used to obtain the ids, if the
+       status returned here is TRUE.
+
+   * Will call USERD_get_part_node_ids for each part if this routine
+     returns TRUE.
+
+--------------------------------------------------------------------
+USERD_get_nsided_conn -
+
+   Description:
+   -----------
+   Gets the array containing the connectivity of nsided elements
+
+   Specification:
+   -------------
+   int USERD_get_nsided_conn(int part_number,
+                             int *nsided_conn_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number         = the part number
+
+   (OUT) nsided_conn_array   = 1D array of nsided connectivies
+
+                               (int array will have been allocated long enough
+                                to hold all the nsided connectivities. Which is
+                                the sum of all the nodes_per_element values in
+                                the conn_array of USERD_get_part_elements_by_type)
+
+
+   Notes:
+   -----
+   * Will not be called unless there are some nsided elements in the the part.
+
+   * Providing nsided information to Ensight:
+
+     1. In USERD_get_gold_part_build_info, provide the number of nsided
+        elements in the part.
+
+     2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+        the number of nodes per nsided element. (as if connectivity
+        length of an nsided element is one)
+
+     3. In this routine, provide the streamed connectivities for each of the
+        nsided elements.
+
+
+     Simple example:         5        6
+                            +--------+
+     3 nsided elements:    /|         \
+     (1 4-sided           / |          \
+      1 3-sided          /  |           \
+      1 7-sided)        /   |            \ 7
+                       /3   |4            +
+                      +-----+             |
+                      |     |             |
+                      |     |             |8
+                      |     |             +
+                      |     |            /
+                      |     |           /
+                      |     |          /
+                      |1    |2        /9
+                      +-----+--------+
+
+      1. In USERD_get_gold_part_build_info:
+              number_of_elements[Z_NSIDED] = 3
+                                             .
+                                            /|\
+                                             |
+      2. In USERD_get_part_elements_by_type:
+          length of conn_array will be:      3 x 1
+
+          for element_type of Z_NSIDED:
+              conn_array[0][0] = 4           (for the 4-sided element)
+              conn_array[1][0] = 3           (for the 3-sided element)
+              conn_array[2][0] = 7           (for the 7-sided element)
+
+                           Sum  ===
+                                 14    <---------+
+                                                 |
+      3. In this routine:                        |
+           length of nsided_conn_array will be:  14
+
+              nsided_conn_array[0]  = 1      (connectivity of 4-sided element)
+              nsided_conn_array[1]  = 2
+              nsided_conn_array[2]  = 4
+              nsided_conn_array[3]  = 3
+
+              nsided_conn_array[4]  = 3      (connectivity of 3-sided element)
+              nsided_conn_array[5]  = 4
+              nsided_conn_array[6]  = 5
+
+              nsided_conn_array[7]  = 2      (connectivity of 7-sided element)
+              nsided_conn_array[8]  = 9
+              nsided_conn_array[9]  = 8
+              nsided_conn_array[10] = 7
+              nsided_conn_array[11] = 6
+              nsided_conn_array[12] = 5
+              nsided_conn_array[13] = 4
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_num_of_time_steps
+
+   Description:
+   -----------
+   Gets the number of time steps of data available for desired timeset.
+
+   Specification:
+   -------------
+   int USERD_get_num_of_time_steps( int timeset_number )
+
+   Returns:
+   -------
+   Number of time steps in timeset  (>0 if okay, <=0 if problems).
+
+   Arguments:
+   ---------
+   (IN) timeset number = the timeset number
+
+                         For example: If USERD_get_number_of_timesets
+                                      returns 2, the valid
+                                      timeset_number's would be 1 and 2
+
+   Notes:
+   -----
+   * This should be >= 1       1 indicates a static model
+                              >1 indicates a transient model
+
+   * Num_time_steps[timeset_number] would be set here
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_files_in_dataset
+
+   Description:
+   -----------
+   Get the total number of files in the dataset.  Used for the
+   dataset query option within EnSight.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_files_in_dataset( void )
+
+   Returns:
+   -------
+   The total number of files in the dataset.
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * You can be as complete as you want about this.  If you don't
+     care about the dataset query option, return a value of 0
+     If you only want certain files, you can just include them. But,
+     you will need to supply the info in USERD_get_dataset_query_file_info
+     for each file you include here.
+
+   * Num_dataset_files would be set here
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_material_sets -
+
+   Description:
+   -----------
+   Get the number of material sets in the model
+
+   Specification:
+   -------------
+   int USERD_get_number_of_material_sets( void )
+
+
+   Returns:
+   -------
+   Num_material_sets = number of material sets
+                       (Zero would indicate that you have no materials
+                        to deal with in the model)
+
+                       or
+
+                       -1 if an error condition
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+  * You may want to keep this as a global for use in other routines.
+
+   ###############################################################
+   NOTE:  For EnSight 7.6, only one material set is supported
+          within EnSight.
+          Thus the only valid returns here are:
+               0 (no materials)
+               1 (for the one material set allowed)
+          or  -1 (if an error)
+
+          If the casefile has more than this, this reader will
+          read them, but EnSight will issue an error message and
+          choke on them!
+   ###############################################################
+
+  ================================================================
+  A very simple explanatory example, to use as a reference for the
+  materials routines:
+
+  Given a 2D mesh composed of 9 quad (Z_QUA04) elements, with two materials.
+  Most of the model is material 1, but the top left corner is material 9 -
+  basically as shown:
+
+
+        *--------*--------*--------*
+        |        |   /    |        |
+        |     Mat 9 /     |        |
+        |        | /      |        |
+        |        |/       |        |
+        |  e7    /   e8   |   e9   |
+        |       /|        |        |
+        |      / |        |        |
+        |     /  |        |        |
+        *----/---*--------*--------*
+        |   /    |        |        |
+        |  /     |        |        |
+        | /      |      Mat 1      |
+        |/       |        |        |
+        |   e4   |   e5   |   e6   |
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        *--------*--------*--------*
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        |   e1   |   e2   |   e3   |
+        |        |        |        |
+        |        |        |        |
+        |        |        |        |
+        *--------*--------*--------*
+
+
+  Thus, in this routine, set:
+    Num_material_sets = 1
+
+  In USERD_get_matf_set_info, set:
+    mat_set_ids[0]    = 1
+    mat_set_name[0]   = "Material Set 1"  (or whatever name desired)
+
+  In USERD_get_number_of_materials, input would be set_index = 0, and
+  would need to set:
+    Num_materials[0] = 2
+
+  For simplicity, the ids and descriptions that would be returned in
+  USERD_get_matf_var_info could be:
+    mat_ids[0] = 1
+    mat_ids[1] = 9
+    mat_desc[0] = "mat 1"   (or whatever desired)
+    mat_desc[2] = "mat 9"
+
+  The per element material ids list would need to be:
+
+     material ids:
+     -------------
+     ids_list[0] = 1  (material id 1, for elem e1)
+     ids_list[1] = 1  (     "                  e2)
+     ids_list[2] = 1  (     "                  e3)
+     ids_list[3] = -1 (negative of index into mixed-material id list, for elem e4)
+     ids_list[5] = 1  (material id 1, for elem e5)
+     ids_list[5] = 1  (     "                  e6)
+     ids_list[5] = -5 (negative of index into mixed-material id list, for elem e7)
+     ids_list[5] = -9 (     "                  e8)
+     ids_list[5] = 1  (material id 1, for elem e9)
+
+  Finally we need the mixed material ids list and the mixed materials values list,
+  which would need to be:
+
+       mixed-material ids:
+       -------------------
+   ==> 1  ids_list[0]  =  2  (the -1 in the material variable points here,
+                                      2 indicates that two materials are present)
+       2  ids_list[1]  =  1  (1st material is 1)
+       3  ids_list[2]  =  9  (2nd material is 9)
+       4  ids_list[3]  = -1  (negative of index into mixed-material val_list)
+   ==> 5  ids_list[4]  =  2  (the -5 in the material variable points here,
+                                      2 indicates that two materials are present)
+       6  ids_list[5]  =  1  (1st material is 1)
+       7  ids_list[6]  =  9  (2nd material is 9)
+       8  ids_list[7]  = -3  (negative of index into mixed-material val_list)
+   ==> 9  ids_list[8]  =  2     etc.
+       10 ids_list[9]  =  1
+       11 ids_list[10] =  9
+       12 ids_list[11] = -5
+
+       mixed-material values:
+       ----------------------
+   ==> 1 val_list[0] = 0.875 (the -1 in the  mixed-material ids_list points here,
+                                       and this is the value for material 1)
+       2 val_list[1] = 0.125 (the value for material 9)
+   ==> 3 val_list[2] = 0.125 (the -3 in the mixed-materials ids_list points here)
+       4 val_list[3] = 0.875
+   ==> 5 val_list[4] = 0.875 (the -5 in the mixed-materials ids_list points here)
+       6 val_list[5] = 0.125
+
+  So, USERD_size_matf_data would need to return
+       matf_size = 8, when called with set_id    = 1
+                                       part_id   = 1
+                                       wtyp      = Z_QUA04
+                                       mat_type  = Z_MAT_INDEX
+
+       matf_size = 12, when called with set_id   = 1
+                                        part_id  = 1
+                                        mat_type = Z_MIX_INDEX
+
+                 = 6, when called with set_id   = 1
+                                       part_id  = 1
+                                       mat_type = Z_MIX_VALUE
+
+  And, USERD_load_matf_data would need to return:
+    the int array ids_list as shown above when called with:
+       set_id   = 1
+       part_id  = 1
+       wtyp     = Z_QUA04
+       mat_type = Z_MAT_INDEX (indicating id list).
+
+    the int array ids_list as shown above when called with:
+       set_id   = 1
+       part_id  = 1
+       mat_type = Z_MIX_INDEX (indicating id list).
+
+    the float array val_list as shown above when called with:
+       set_id   = 1
+       part_id  = 1
+       mat_type = Z_MIX_VALUE (indicating val list).
+
+
+-------------------------------------------------------------------------
+USERD_get_number_of_materials
+
+   Description:
+   -----------
+   Gets the number of materials in the material set
+
+   Specification:
+   -------------
+   int USERD_get_number_of_materials( int set_index )
+
+   Returns:
+   -------
+   Num_materials[set_index]   = Number of materials in the set
+                                 0 indicates no materials information present
+                                -1 indicates an error
+   Arguments:
+   ---------
+   (IN) set_index             = the material set index (zero based)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero
+  * You may want to keep this as a global for use in other routines.
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_model_parts
+
+   Description:
+   -----------
+   Gets the total number of unstructured and structured parts
+   in the model, for which you can supply information.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_model_parts( void )
+
+   Returns:
+   -------
+   Number of parts  (>0 if okay, <=0 if problems).
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * If going to have to read down through the parts in order to
+     know how many, you may want to build a table of pointers to
+     the various parts, so you can easily get to particular parts in
+     later processes.  If you can simply read the number of parts
+     at the head of the file, then you would probably not build the
+     table at this time.
+
+   * This routine would set Numparts_available, which is equal to
+     Num_unstructured_parts + Num_structured_blocks.
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_timesets
+
+   Description:
+   -----------
+    Gets the number of timesets used in the model.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_timesets( void )
+
+   Returns:
+   -------
+   Number of timesets in the model
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * Num_timesets would be set here
+
+   * If you have a static model, both geometry and variables, you should
+     return a value of zero.
+ 
+   * If you have a transient model, then you should return one or more.
+ 
+   For example:
+ 
+      Geometry    Variables                                 No. of timesets
+      ---------   ------------------------------            ---------------
+      static      static                                      0
+      static      transient, all using same timeset           1
+ 
+      transient   transient, all using same timeset as geom   1
+ 
+      static      transient, using 3 different timesets       3
+ 
+      transient   transient, using 3 different timesets and
+                             none of them the same as the
+                             geometry timeset                 4
+          etc.
+ 
+   NOTE: ALL GEOMETRY MUST USE THE SAME TIMESET!!! You will have to provide
+                                                   the timeset number to use
+                                                   for geometry in:
+                                               USERD_get_geom_timeset_number
+ 
+         Variables can use the same timeset as the geometry, or can use
+         other timesets. More than one variable can use the same timeset.
+ 
+   example:  changing geometry at 5 steps, 0.0, 1.0, 2.0, 3.0, 4.0
+             variable 1 provided at these same five steps
+             variable 2 provided at 3 steps, 0.5, 1.25, 3.33
+ 
+        This routine should return a value of 2, because only
+        two different timesets are needed. Timeset 1 would be for the
+        geometry and variable 1 (they both use it). Timeset 2 would
+        be for variable 2, which needs its own in this case.
+
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_number_of_variables
+
+   Description:
+   -----------
+   Get the number of variables for which you will be providing info.
+
+   Specification:
+   -------------
+   int USERD_get_number_of_variables( void )
+
+   Returns:
+   -------
+   Number of variables (includes constant, scalar, vector and tensor types)
+                       (>=0 if okay, <0 if problem)
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+    *****************************************************************
+   * Variable numbers, by which references will be made, are implied
+     here. If you say there are 3 variables, the variable numbers
+     will be 1, 2, and 3.
+    *****************************************************************
+
+   * Num_variables would be set here
+
+
+
+--------------------------------------------------------------------
+USERD_get_part_coords
+
+   Description:
+   -----------
+   Gets the coordinates for an unstructured part.
+
+   Specification:
+   -------------
+   int USERD_get_part_coords(int part_number, float **coord_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) coord_array             = 2D float array which contains,
+                                   x,y,z coordinates of each node
+                                   in the part.
+
+       (IMPORTANT: The second dimension of this aray is 1-based!!!)
+
+                                (Array will have been allocated
+                                 3 by (number_of_nodes + 1) for the part
+                                 long - see USERD_get_gold_part_build_info)
+
+
+                       ex) If number_of_nodes = 100
+                           as obtained in:
+                             USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions of the
+                           pointer sent to this routine will be:
+                             coord_array[3][101]
+
+                           Ignore the coord_array[0][0]
+                                      coord_array[1][0]
+                                      coord_array[2][0] locations and start
+                           the node coordinates at:
+                             coord_array[0][1]
+                             coord_array[1][1]
+                             coord_array[2][1]
+
+                             coord_array[0][2]
+                             coord_array[1][2]
+                             coord_array[2][2]
+
+                                   etc.
+
+   Notes:
+   -----
+   * Not called unless Num_unstructured_parts is > 0
+
+   * Will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_part_element_ids_by_type
+
+   Description:
+   -----------
+   Gets the ids for the elements of a particular type for an unstructured
+   or structured part.
+
+   Specification:
+   -------------
+   int USERD_get_part_element_ids_by_type(int part_number,
+                                          int element_type,
+                                          int *elemid_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  element_type            = One of the following (See global_extern.h)
+                                   Z_POINT      node point element
+                                   Z_BAR02      2 node bar
+                                   Z_BAR03      3 node bar
+                                   Z_TRI03      3 node triangle
+                                   Z_TRI06      6 node triangle
+                                   Z_QUA04      4 node quad
+                                   Z_QUA08      8 node quad
+                                   Z_TET04      4 node tetrahedron
+                                   Z_TET10     10 node tetrahedron
+                                   Z_PYR05      5 node pyramid
+                                   Z_PYR13     13 node pyramid
+                                   Z_PEN06      6 node pentahedron
+                                   Z_PEN15     15 node pentahedron
+                                   Z_HEX08      8 node hexahedron
+                                   Z_HEX20     20 node hexahedron
+
+                                   Z_G_POINT    ghost node point element
+                                   Z_G_BAR02    2 node ghost bar
+                                   Z_G_BAR03    3 node ghost bar
+                                   Z_G_TRI03    3 node ghost triangle
+                                   Z_G_TRI06    6 node ghost triangle
+                                   Z_G_QUA04    4 node ghost quad
+                                   Z_G_QUA08    8 node ghost quad
+                                   Z_G_TET04    4 node ghost tetrahedron
+                                   Z_G_TET10   10 node ghost tetrahedron
+                                   Z_G_PYR05    5 node ghost pyramid
+                                   Z_G_PYR13   13 node ghost pyramid
+                                   Z_G_PEN06    6 node ghost pentahedron
+                                   Z_G_PEN15   15 node ghost pentahedron
+                                   Z_G_HEX08    8 node ghost hexahedron
+                                   Z_G_HEX20   20 node ghost hexahedron
+
+   (OUT) elemid_array            = 1D array containing id of each
+                                   element of the type.
+
+                                  (Array will have been allocated
+                                   number_of_elements of the type long)
+
+                       ex) If number_of_elements[Z_TRI03] = 25
+                              number_of_elements[Z_QUA04] = 100
+                              number_of_elements[Z_HEX08] = 30
+                           as obtained in:
+                            USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions available
+                           for this routine will be:
+                              conn_array[25]   when called with Z_TRI03
+
+                              conn_array[100]  when called with Z_QUA04
+
+                              conn_array[30]  when called with Z_HEX08
+
+   Notes:
+   -----
+   * Not called unless element label status is set to TRUE in
+     USERD_get_element_label_status
+
+   * Will be based on Current_time_step
+
+
+
+--------------------------------------------------------------------
+USERD_get_part_elements_by_type
+
+   Description:
+   -----------
+   Gets the connectivities for the elements of a particular type in an
+   unstructured part
+
+   Specification:
+   -------------
+   int USERD_get_part_elements_by_type(int part_number,
+                                       int element_type,
+                                       int **conn_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number           = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (IN)  element_type          = One of the following (See global_extern.h)
+                                 Z_POINT      node point element
+                                 Z_BAR02      2 node bar
+                                 Z_BAR03      3 node bar
+                                 Z_TRI03      3 node triangle
+                                 Z_TRI06      6 node triangle
+                                 Z_QUA04      4 node quad
+                                 Z_QUA08      8 node quad
+                                 Z_TET04      4 node tetrahedron
+                                 Z_TET10     10 node tetrahedron
+                                 Z_PYR05      5 node pyramid
+                                 Z_PYR13     13 node pyramid
+                                 Z_PEN06      6 node pentahedron
+                                 Z_PEN15     15 node pentahedron
+                                 Z_HEX08      8 node hexahedron
+                                 Z_HEX20     20 node hexahedron
+
+                                 Z_G_POINT    ghost node point element
+                                 Z_G_BAR02    2 node ghost bar
+                                 Z_G_BAR03    3 node ghost bar
+                                 Z_G_TRI03    3 node ghost triangle
+                                 Z_G_TRI06    6 node ghost triangle
+                                 Z_G_QUA04    4 node ghost quad
+                                 Z_G_QUA08    8 node ghost quad
+                                 Z_G_TET04    4 node ghost tetrahedron
+                                 Z_G_TET10   10 node ghost tetrahedron
+                                 Z_G_PYR05    5 node ghost pyramid
+                                 Z_G_PYR13   13 node ghost pyramid
+                                 Z_G_PEN06    6 node ghost pentahedron
+                                 Z_G_PEN15   15 node ghost pentahedron
+                                 Z_G_HEX08    8 node ghost hexahedron
+                                 Z_G_HEX20   20 node ghost hexahedron
+
+
+   (OUT) conn_array            = 2D array containing connectivity
+                                 of each element of the type.
+
+                                (Array will have been allocated
+                                 num_of_elements of the type by
+                                 connectivity length of the type)
+
+                       ex) If number_of_elements[Z_TRI03] = 25
+                              number_of_elements[Z_QUA04] = 100
+                              number_of_elements[Z_HEX08] = 30
+                           as obtained in:
+                            USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions available
+                           for this routine will be:
+                              conn_array[25][3]   when called with Z_TRI03
+
+                              conn_array[100][4]  when called with Z_QUA04
+
+                              conn_array[30][8]   when called with Z_HEX08
+   
+   Notes:
+   -----
+   * Not called unless Num_unstructured_parts is > 0
+
+   * Will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_get_part_node_ids
+
+   Description:
+   -----------
+   Gets the node ids of an unstructured or structured part.
+
+   Specification:
+   -------------
+   int USERD_get_part_node_ids(int part_number, int *nodeid_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  part_number             = The part number
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+   (OUT) nodeid_array            = 1D array containing node ids of
+                                    each node in the part.
+
+           (IMPORTANT: This array is 1-based!!!)
+
+                                   (Array will have been allocated
+                                    (number_of_nodes + 1) for the part long
+                                    see USERD_get_gold_part_build_info)
+
+                       ex) If number_of_nodes = 100
+                           as obtained in:
+                             USERD_get_gold_part_build_info
+
+                           Then the allocated dimensions of the
+                           pointer sent to this routine will be:
+                             nodeid_array[101]
+
+                           Ignore the nodeid_array[0] location and start
+                           the node ids at:
+                             nodeid_array[1]
+
+                             nodeid_array[2]
+
+                                   etc.
+
+   Notes:
+   -----
+   * Not called unless node label status is TRUE, as returned from
+     USERD_get_node_label_status
+
+   * Will be based on Current_time_step
+
+   * The ids are purely labels, used when displaying or querying node ids.
+     However, any node id < 0 will never be displayed
+
+
+--------------------------------------------------------------------
+USERD_get_reader_descrip
+
+   Description:
+   -----------
+   Gets the description of the reader, so gui can give more info
+
+   Specification:
+   -------------
+   int USERD_get_reader_descrip(char descrip[Z_MAXFILENP])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) descrip  = the description of the reader (max length is MAXFILENP,
+                                                   which is 255)
+
+   Notes:
+   -----
+   * OPTIONAL ROUTINE!   You can have it or not.
+
+
+
+--------------------------------------------------------------------
+USERD_get_reader_version
+
+   Description:
+   -----------
+   Gets the version number of the user defined reader
+
+   Specification:
+   -------------
+   int USERD_get_reader_version(char version_number[Z_MAX_USERD_NAME])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful (and will assume is version 1.0)
+
+   Arguments:
+   ---------
+   (OUT) version_number       = the version number of the reader
+                                (max length is Z_MAX_USERD_NAME, which
+                                 is 20)
+
+   Notes:
+   -----
+   * This needs to be "2.000" or greater. Otherwise EnSight will assume
+     this reader is API 1.0
+
+   * should set it to "2.010" for this version of the API
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_sol_times
+
+   Description:
+   -----------
+   Get the solution times associated with each time step for 
+   desired timeset.
+
+   Specification:
+   -------------
+   int USERD_get_sol_times(int timeset_number,
+                           float *solution_times)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  timeset_number     = the timeset number
+ 
+                              For example: If USERD_get_number_of_timesets
+                                           returns 2, the valid
+                                           timeset_number's would be 1 and 2
+
+   (OUT) solution_times       = 1D array of solution times per time step
+
+                                  (Array will have been allocated
+                                   Num_time_steps[timeset_number] long)
+
+   Notes:
+   -----
+   * The solution times must be non-negative and increasing.
+
+
+
+--------------------------------------------------------------------
+USERD_get_timeset_description -
+
+   Description:
+   -----------
+   Get the description to associate with the desired timeset.
+
+   Specification:
+   -------------
+   int USERD_get_timeset_description(int timeset_number,
+                                     char timeset_description[Z_BUFL])
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  timeset_number     = the timeset number
+ 
+                              For example: If USERD_get_number_of_timesets
+                                           returns 2, the valid
+                                           timeset_number's would be 1 and 2
+
+   (OUT) timeset_description  = timeset description string
+
+
+   Notes:
+   -----
+   * A string of NULLs is valid for timeset_description
+
+
+
+
+--------------------------------------------------------------------
+USERD_get_var_by_component
+
+   Description:
+   -----------
+   Gets the values of a variable component.  Both unstructured and structured
+   parts use this routine.
+
+   if Z_PER_NODE:
+     Get the component value at each node for a given variable in the part.
+
+   or if Z_PER_ELEM:
+     Get the component value at each element of a specific part and type
+     for a given variable.
+
+   Specification:
+   -------------
+   int USERD_get_var_by_component(int which_variable,
+                                  int which_part,
+                                  int var_type,
+                                  int which_type,
+                                  int imag_data,
+                                  int component,
+                                  float *var_array)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   or:  Z_UNDEF, in which case you need not load any values into var_array
+
+
+   Arguments:
+   ---------
+   (IN)  which_variable          = The variable number
+
+   (IN)  which_part                 Since EnSight Version 7.4
+                                    -------------------------
+                                  = The part number
+
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+                                    Prior to EnSight Version 7.4
+                                    ----------------------------
+                                  = The part id   This is the part_id label loaded
+                                                  in USERD_get_gold_part_build_info.
+                                                  It is NOT the part table index.
+
+   (IN)  var_type                = Z_SCALAR
+                                   Z_VECTOR
+                                   Z_TENSOR   (symmetric tensor)
+                                   Z_TENSOR9  (asymmetric tensor)
+
+   (IN)  which_type
+
+            if Z_PER_NODE:         Not used
+
+            if Z_PER_ELEM:       = The element type
+                                   Z_POINT      node point element
+                                   Z_BAR02      2 node bar
+                                   Z_BAR03      3 node bar
+                                   Z_TRI03      3 node triangle
+                                   Z_TRI06      6 node triangle
+                                   Z_QUA04      4 node quad
+                                   Z_QUA08      8 node quad
+                                   Z_TET04      4 node tetrahedron
+                                   Z_TET10     10 node tetrahedron
+                                   Z_PYR05      5 node pyramid
+                                   Z_PYR13     13 node pyramid
+                                   Z_PEN06      6 node pentahedron
+                                   Z_PEN15     15 node pentahedron
+                                   Z_HEX08      8 node hexahedron
+                                   Z_HEX20     20 node hexahedron
+
+                                   Z_G_POINT    ghost node point element
+                                   Z_G_BAR02    2 node ghost bar
+                                   Z_G_BAR03    3 node ghost bar
+                                   Z_G_TRI03    3 node ghost triangle
+                                   Z_G_TRI06    6 node ghost triangle
+                                   Z_G_QUA04    4 node ghost quad
+                                   Z_G_QUA08    8 node ghost quad
+                                   Z_G_TET04    4 node ghost tetrahedron
+                                   Z_G_TET10   10 node ghost tetrahedron
+                                   Z_G_PYR05    5 node ghost pyramid
+                                   Z_G_PYR13   13 node ghost pyramid
+                                   Z_G_PEN06    6 node ghost pentahedron
+                                   Z_G_PEN15   15 node ghost pentahedron
+                                   Z_G_HEX08    8 node ghost hexahedron
+                                   Z_G_HEX20   20 node ghost hexahedron
+
+   (IN)  imag_data               = TRUE if imag component
+                                   FALSE if real component
+ 
+   (IN)  component               = The component: (0       if Z_SCALAR)
+                                                  (0 - 2   if Z_VECTOR)
+                                                  (0 - 5   if Z_TENSOR)
+                                                  (0 - 8   if Z_TENSOR9)
+ 
+                                 * 6 Symmetric Indicies, 0:5    *
+                                 * ---------------------------- *
+                                 *     | 11 12 13 |   | 0 3 4 | *
+                                 *     |          |   |       | *
+                                 * T = |    22 23 | = |   1 5 | *
+                                 *     |          |   |       | *
+                                 *     |       33 |   |     2 | *
+ 
+
+                                 * 9 General   Indicies, 0:8    *
+                                 * ---------------------------- *
+                                 *     | 11 12 13 |   | 0 3 4 | *
+                                 *     |          |   |       | *
+                                 * T = | 21 22 23 | = | 6 1 5 | *
+                                 *     |          |   |       | *
+                                 *     | 31 32 33 |   | 7 8 2 | *
+
+   (OUT) var_array 
+
+      -----------------------------------------------------------------------
+      (IMPORTANT: this array is 1-based for both Z_PER_NODE and Z_PER_ELEM!!!)
+      -----------------------------------------------------------------------
+
+            if Z_PER_NODE:    = 1D array containing variable component value
+                                for each node.
+
+                                (Array will have been allocated
+                                 (number_of_nodes + 1) long)
+
+                      Info stored in this fashion:
+                            var_array[0] = not used
+                            var_array[1] = var component for node 1 of part
+                            var_array[2] = var_component for node 2 of part
+                            var_array[3] = var_component for node 3 of part
+                            etc.
+
+            if Z_PER_ELEM:    = 1D array containing variable component
+                                value for each element of a particular
+                                part and type.
+                                    
+                              (Array will have been allocated
+                               (number_of_elements[which_part][which_type] + 1)
+                                long.  See USERD_get_gold_part_build_info)
+
+                  Info stored in this fashion:
+                    var_array[1] = var component for elem 1 (of part and type)
+                    var_array[2] = var component for elem 2 (of part and type)
+                    var_array[3] = var component for elem 3 (of part and type)
+                    etc.
+
+   Notes:
+   -----
+   * Not called unless Num_variables is > 0
+
+   * The per_node or per_elem classification must be obtainable from the
+     variable number (a var_classify array needs to be retained)
+
+   * Will be based on Current_time_step
+
+   * If the variable is not defined for this part, simply return with a
+     value of Z_UNDEF.  EnSight will treat the variable as undefined for
+     this part.
+
+
+--------------------------------------------------------------------
+USERD_get_var_value_at_specific
+
+   Description:
+   -----------
+   if Z_PER_NODE:
+     Get the value of a particular variable at a particular node in a
+     particular part at a particular time.
+
+   or if Z_PER_ELEM:
+     Get the value of a particular variable at a particular element of
+     a particular type in a particular part at a particular time.
+
+
+   Specification:
+   -------------
+   int USERD_get_var_value_at_specific(int which_var,
+                                       int which_node_or_elem,
+                                       int which_part,
+                                       int which_elem_type,
+                                       int time_step,
+                                       float values[3],
+                                       int imag_data)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN)  which_var   = The variable number
+
+   (IN)  which_node_or_elem
+
+              If Z_PER_NODE:
+                = The node number.  This is not the id, but is
+                                    the index of the global node 
+                                    list (1 based), or the block's
+                                    node list (1 based).
+
+                  Thus,  coord_array[1]
+                         coord_array[2]
+                         coord_array[3]
+                              .      |
+                              .      |which_node_or_elem index
+                              .             ----
+
+
+              If Z_PER_ELEM:
+                = The element number.  This is not the id, but is
+                                       the element number index
+                                       of the number_of_element array
+                                       (see USERD_get_gold_part_build_info),
+                                        or the block's element list (1 based).
+
+                  Thus,  for which_part:
+                         conn_array[which_elem_type][0]
+                         conn_array[which_elem_type][1]
+                         conn_array[which_elem_type][2]
+                              .                      |
+                              .          which_node_or_elem index
+                              .                        ----
+
+
+   (IN)  which_part                 Since EnSight Version 7.4
+                                    -------------------------
+                                  = The part number
+
+                                    (1-based index of part table, namely:
+
+                                       1 ... Numparts_available.
+
+                                     It is NOT the part_id that
+                                     is loaded in USERD_get_gold_part_build_info)
+
+                                    Prior to EnSight Version 7.4
+                                    ----------------------------
+                                  = The part id   This is the part_id label loaded
+                                                  in USERD_get_gold_part_build_info.
+                                                  It is NOT the part table index.
+
+
+   (IN)  which_elem_type
+
+              If Z_PER_NODE, or block part:
+                = Not used
+
+              If Z_PER_ELEM:
+                = The element type.    This is the element type index
+                                       of the number_of_element array
+                                       (see USERD_get_gold_part_build_info)
+
+   (IN)  time_step   = The time step
+
+   (IN)  imag_data   = TRUE if want imaginary value.
+                       FALSE if want real value.
+
+   (OUT) values      = scalar or vector component value(s)
+                        values[0] = scalar or vector[0]
+                        values[1] = vector[1]
+                        values[2] = vector[2]
+
+
+   Notes:
+   -----
+   * This routine is used in node querys over time (or element querys over
+     time for Z_PER_ELEM variables).  If these operations are not critical
+     to you, this can be a dummy routine.
+
+   * The per_node or per_elem classification must be obtainable from the
+     variable number (a var_classify array needs to be retained)
+
+   * The time step given is for the proper variable timeset.
+
+
+----------------------------------------------------------------------
+USERD_load_matf_data
+
+   Description:
+   -----------
+   Get the material id list, mixed-material id list, or
+   mixed-material values list for the given material set and part (and
+   element type if material id list)
+
+   Specification:
+   -------------
+   int USERD_load_matf_data( int set_index,
+                             int part_id,
+                             int wtyp,
+                             int mat_type,
+                             int *ids_list,
+                             float *val_list)
+
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+  (IN)  set_index         = the material set index (zero based)
+
+  (IN)  part_id           = the part number desired
+
+  (IN)  wtyp              = the element type        (used for Z_MAT_INDEX only)
+
+                                  Z_POINT    node point element
+                                  Z_BAR02    2 node bar
+                                  Z_BAR03    3 node bar
+                                  Z_TRI03    3 node triangle
+                                  Z_TRI06    6 node triangle
+                                  Z_QUA04    4 node quad
+                                  Z_QUA08    8 node quad
+                                  Z_TET04    4 node tetrahedron
+                                  Z_TET10   10 node tetrahedron
+                                  Z_PYR05    5 node pyramid
+                                  Z_PYR13   13 node pyramid
+                                  Z_PEN06    6 node pentahedron
+                                  Z_PEN15   15 node pentahedron
+                                  Z_HEX08    8 node hexahedron
+                                  Z_HEX20   20 node hexahedron
+                                  Z_NSIDED  nsided polygon
+                                  Z_NFACED  nfaced polyhedron
+
+                                  Z_G_POINT    ghost node point element
+                                  Z_G_BAR02    2 node ghost bar
+                                  Z_G_BAR03    3 node ghost bar
+                                  Z_G_TRI03    3 node ghost triangle
+                                  Z_G_TRI06    6 node ghost triangle
+                                  Z_G_QUA04    4 node ghost quad
+                                  Z_G_QUA08    8 node ghost quad
+                                  Z_G_TET04    4 node ghost tetrahedron
+                                  Z_G_TET10   10 node ghost tetrahedron
+                                  Z_G_PYR05    5 node ghost pyramid
+                                  Z_G_PYR13   13 node ghost pyramid
+                                  Z_G_PEN06    6 node ghost pentahedron
+                                  Z_G_PEN15   15 node ghost pentahedron
+                                  Z_G_HEX08    8 node ghost hexahedron
+                                  Z_G_HEX20   20 node ghost hexahedron
+                                  Z_G_NSIDED  ghost nsided polygon
+                                  Z_G_NFACED  ghost nfaced polyhedron
+
+  (IN)  mat_type          = Z_MAT_INDEX for material ids list
+                            Z_MIX_INDEX for mixed-material ids list
+                            Z_MIX_VALUE for mixed-material values list
+
+  (OUT) ids_list          = If mat_type is Z_MAT_INDEX:
+                            ---------------------------
+                             1D material id list
+                               (Int array will have been allocated
+                                the appropriate size, as returned in
+                                 USERD_size_matf_data for mat_type Z_MAT_INDEX)
+
+                            If mat_type is Z_MIX_INDEX:
+                            ---------------------------
+                             1D mixed-material id list
+                               (Int array will have been allocated
+                                the appropriate size, as returned in
+                                 USERD_size_matf_data for mat_type Z_MIX_INDEX)
+
+  (OUT) val_list          = 1D mixed-materials values list
+                            (only used if mat_type is Z_MIX_VALUE)
+
+                               (Float array will have been allocated
+                                the appropriate size, as returned in
+                                USERD_size_matf_data for mat_type Z_MIX_VALUE)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero,
+     or Num_materials[set_index] is zero,
+     or the appropriate size from USERD_size_matf_data is zero
+
+
+
+--------------------------------------------------------------------
+USERD_set_filenames
+
+   Description:
+   -----------
+   Receives the geometry and result filenames entered in the data
+   dialog.  The user written code will have to store and use these
+   as needed. The user written code must manage its own files!!
+
+   Specification:
+   -------------
+   int USERD_set_filenames(char filename_1[],
+                           char filename_2[],
+                           char the_path[],
+                           int swapbytes)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (IN) filename_1   = the filename entered into the geometry
+                         field of the data dialog.
+
+   (IN) param_2      = The usage of this string depends on
+                       'two_fields' in USERD_get_name_of_reader.
+ 
+                       If two_fields is FALSE then it's empty.
+ 
+                       If two_fields is TRUE, this is the 
+                       manditory results file entered 
+                       into the result field of the data dialog.
+ 
+                       If two_fields is -1, then this contains
+                       optional text (filenames, modifiers, etc.)
+                       that can be parsed and used to modify 
+                       reader 
+
+   (IN) the_path     = the path info from the data dialog.
+                       Note: filename_1 and filename_2 have already
+                            had the path prepended to them.  This
+                            is provided in case it is needed for
+                            filenames contained in one of the files
+
+   (IN) swapbytes    = TRUE if should swap bytes when reading data.
+                     = FALSE normally.
+
+   Notes:
+   -----
+   * Since you must manage everything from the input that is entered in
+     these data dialog fields, this is an important routine!
+
+   * It may be that you will need to have an executive type file that contains
+     info and other filenames within it, like EnSight6's case file.
+
+
+--------------------------------------------------------------------
+USERD_set_server_number
+
+   Description:
+   -----------
+   Receives the server number of how many total servers.
+
+   Specification:
+   -------------
+   int USERD_set_server_number(int cur_serv,
+                               int tot_servs)
+
+   Returns:
+   -------
+   nothing
+
+   Arguments:
+   ---------
+   (IN) cur_serv    = the current server.
+
+   (IN) tot_servs   = the total number of servers.
+
+   Notes:
+   -----
+   * Only useful if your user defined reader is being used with EnSight's
+     Server-of-Server capability.  And even then, it may or may not be
+     something that you can take advantage of.  If your data is already
+     partitioned in some manner, such that you can access the proper
+     portions using this information.
+ 
+     For all non-SOS uses, this will simply be 1 of 1
+
+
+
+--------------------------------------------------------------------
+USERD_set_time_set_and_step
+
+   Description:
+   -----------
+   Set the current time step in the desired timeset.  All functions that
+   need time, and that do not explicitly pass it in, will use the timeset
+   and step set by this routine, if needed.
+
+   Specification:
+   -------------
+   void USERD_set_time_set_and_step(int timeset_number,
+                                    int time_step)
+
+   Returns:
+   -------
+   nothing
+
+   Arguments:
+   ---------
+   (IN) timeset_number  = the timeset number (1 based).
+ 
+                          For example:  If USERD_get_number_of_timesets
+                                        returns 2, the valid timeset_number's
+                                        would be 1 and 2.
+
+   (IN) time_step       = The current time step to set
+
+   Notes:
+   -----
+   * Current_time_step and Current_timeset would be set here
+
+
+--------------------------------------------------------------------
+USERD_size_matf_data
+
+   Description:
+   -----------
+   Get the length of the material id list, mixed-material id list, or
+   mixed-material values list for the given material set and part (and
+   element type if material id list)
+
+   Specification:
+   -------------
+   int USERD_size_matf_data( int set_index,
+                             int part_id,
+                             int wtyp,
+                             int mat_type,
+                             int *matf_size)
+
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+  (IN)  set_index         = the material set index (zero based)
+
+  (IN)  part_id           = the part number desired
+
+  (IN)  wtyp              = the element type        (used for Z_MAT_INDEX only)
+
+                                  Z_POINT    node point element
+                                  Z_BAR02    2 node bar
+                                  Z_BAR03    3 node bar
+                                  Z_TRI03    3 node triangle
+                                  Z_TRI06    6 node triangle
+                                  Z_QUA04    4 node quad
+                                  Z_QUA08    8 node quad
+                                  Z_TET04    4 node tetrahedron
+                                  Z_TET10   10 node tetrahedron
+                                  Z_PYR05    5 node pyramid
+                                  Z_PYR13   13 node pyramid
+                                  Z_PEN06    6 node pentahedron
+                                  Z_PEN15   15 node pentahedron
+                                  Z_HEX08    8 node hexahedron
+                                  Z_HEX20   20 node hexahedron
+                                  Z_NSIDED  nsided polygon
+                                  Z_NFACED  nfaced polyhedron
+
+                                  Z_G_POINT    ghost node point element
+                                  Z_G_BAR02    2 node ghost bar
+                                  Z_G_BAR03    3 node ghost bar
+                                  Z_G_TRI03    3 node ghost triangle
+                                  Z_G_TRI06    6 node ghost triangle
+                                  Z_G_QUA04    4 node ghost quad
+                                  Z_G_QUA08    8 node ghost quad
+                                  Z_G_TET04    4 node ghost tetrahedron
+                                  Z_G_TET10   10 node ghost tetrahedron
+                                  Z_G_PYR05    5 node ghost pyramid
+                                  Z_G_PYR13   13 node ghost pyramid
+                                  Z_G_PEN06    6 node ghost pentahedron
+                                  Z_G_PEN15   15 node ghost pentahedron
+                                  Z_G_HEX08    8 node ghost hexahedron
+                                  Z_G_HEX20   20 node ghost hexahedron
+                                  Z_G_NSIDED  ghost nsided polygon
+                                  Z_G_NFACED  ghost nfaced polyhedron
+
+  (IN)  mat_type          = Z_MAT_INDEX for material ids list
+                            Z_MIX_INDEX for mixed-material ids list
+                            Z_MIX_VALUE for mixed-material values list
+
+  (OUT) matf_size         = the length of the material id list, or
+                            mixed-material id list, or
+                            mixed-material values list
+                            for the given material set and part number
+                            (and element type if Z_MAT_INDEX)
+
+   Notes:
+   -----
+  * See USERD_get_number_of_material_sets header for explanatory example
+  * Will not be called if Num_material_sets is zero, or
+     Num_materials[set_index] is zero
+
+
+
+
+--------------------------------------------------------------------
+USERD_stop_part_building
+
+   Description:
+   -----------
+   This routine called when the part building dialog is closed.  It is
+   provided in case you desire to release memory, etc. that was only needed
+   during the part building process.
+
+   Specification:
+   -------------
+   void USERD_stop_part_building( void )
+
+   Returns:
+   -------
+   nothing
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+
+--------------------------------------------------------------------
+USERD_rigidbody_existence
+
+   Description:
+   -----------
+   Gets the existence of rigid body values or not in the model
+
+   Specification:
+   -------------
+   int USERD_rigidbody_existence( void )
+
+   Returns:
+   -------
+   Z_OK    if rigid body values exist for the model
+   Z_UNDEF if no rigid body values exist
+   Z_ERR   if an error
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * This will be based on Current_time_step
+
+
+--------------------------------------------------------------------
+USERD_rigidbody_values
+
+   Description:
+   -----------
+   Gets the rigid body values for each part
+
+   Specification:
+   -------------
+   int USERD_rigidbody_values(int part_number,
+                              float values[14])
+
+   Returns:
+   -------
+   Z_OK    if rigid body values exist for the model
+   Z_UNDEF if no rigid body values exist
+   Z_ERR   if an error
+
+   Arguments:
+   ---------
+   (IN)  part_number        = The part number
+ 
+                              (1-based index of part table, namely:
+ 
+                                 1 ... Numparts_available.
+ 
+                               It is NOT the part_id that
+                               is loaded in USERD_get_gold_part_build_info)
+ 
+   (OUT) values             values[0]  = IX   (x location)
+                            values[1]  = IY   (y location)
+                            values[2]  = IZ   (z location)
+                            values[3]  = E0   (e0 euler value)
+                            values[4]  = E1   (e1 euler value)
+                            values[5]  = E2   (e2 euler value)
+                            values[6]  = E3   (e3 euler value)
+
+                            The next 3 are for an optional cg offset. If none is
+                            needed or desired (namely the first 7 values above
+                            contain all that is needed), then these should be
+                            set to 0.0
+
+                            values[7]  = xoff   (initial cg x offset)
+                            values[8]  = yoff   (initial cg y offset)
+                            values[9]  = z0ff   (initial cg z offset)
+
+                            The next 4 values are for and optional initial yaw, pitch, roll
+                            operation.  This is useful to get parts from one
+                            standard layout to a different standard layout.
+                            (example, flex body parts computed in an axis system
+                            different than that of rigid body parts manipulation) 
+                            If not needed or desired, set these to 0.0
+
+                            values[10] = rot_order  (order the roations are applied
+                                                     0.0  = no rotations
+                                                     1.0  = xyz order
+                                                     2.0  = xzy order
+                                                     3.0  = yxz order
+                                                     4.0  = yzx order
+                                                     5.0  = zxy order
+                                                     6.0  = zyx order)
+                            values[11] = xrot   (initial x rotation - degrees)
+                            values[12] = yrot   (initial y rotation - degrees)
+                            values[13] = zrot   (initial z rotation - degrees)
+
+   Notes:
+   -----
+   * This will be based on Current_time_step
+   * It will not be called unless USERD_rigidbody_existence indicates
+       that there are some values in the model by returning Z_OK.
+   * Order that transformations will be applied is:
+           1. The yaw,pitch,roll rotations, if present  (values[11] through values[13]
+                                              in the order specified in rot_order, values[10])
+           2. The cg offsets, if present     (values[7] through values[9])
+           3. The euler parameter rotations  (values[3] through values[6])
+           4. The translations               (values[0] through values[2])
+
+--------------------------------------------------------------------
+USERD_set_right_side
+
+   Description:
+   -----------
+   Informs the reader that the time currently set is the right side of a time
+   span used for variable interpolation between time steps
+
+   Specification:
+   -------------
+   void USERD_set_right_side( void )
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   none
+
+   Notes:
+   -----
+   * Applies to Current_time_step
+
+
+
+
+
+------------------------------------------------------------------
+	ENHANCED GUI ROUTINES
+
+--------------------------------------------------------------------
+USERD_get_extra_gui_numbers
+
+   Description:
+   -----------
+   The Enhanced GUI routines are added to allow
+   the user to customize a portion of the Data
+   Reader dialog to pass in options to their
+   user defined reader.
+
+   Specification:
+   -------------
+   void USERD__get_extra_gui_numbers(int *num_Toggles,
+                                     int *num_pulldowns,
+                                     int *num_fields)
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (OUT) num_Toggles    = number of toggles that will be provided
+   
+         num_pulldowns  = number of pulldowns that will be provided
+
+         num_fields     = number of fields that will be provided
+
+   Notes:
+   -----
+     There are three routines that work together:
+     USERD_get_extra_gui_numbers
+     USERD_get_extra_gui_defaults
+     USERD_set_extra_gui_data
+
+     The existence of these routine indicates that
+     you wish to add customize entries to the
+     Data Reader dialog.
+
+     If you don't want the extra GUI features,
+     simply delete these routines, or change their
+     names to something such as
+     USERD_DISABLED_get_extra_gui_defaults
+ 
+     The presence of these routines
+     will ensure that EnSight will call them and
+     use their data to modify the extraction parameters set
+     with some or all of the following:
+     toggles, pulldown menu and fields.
+ 
+     The user can then interact with the enhanced
+     GUI and then send their choices to
+     USERD_set_extra_gui_data
+  
+     Therefore if USERD_get_extra_gui_numbers
+     exists then the other two must exist.
+ 
+     If none exist, then the GUI will be unchanged.
+ 
+     Toggle data will return an integer
+                               TRUE if checked
+                               FALSE if unchecked
+ 
+     Pulldown menu will return an integer representing
+                               the menu item selected
+ 
+     Field will return a string Z_LEN_GUI_FIELD_STR long.
+ 
+     If all the enhanced GUI features are enabled it
+     might look something like this
+
+    ===================================================
+    [] Title 1  [X] Title 3
+    [X]Title 2  [X] Title 4
+ 
+    Pulldown Menu ->
+        Menu Choice 1
+        Menu Choice 2
+        Menu Choice 3
+ 
+    Data Field Title 1 ____________________________
+ 
+    Data Field Title 2 ____________________________
+    =====================================================
+
+    This routine defines the numbers of toggles, pulldowns & fields
+ 
+    The following are defined in the global_extern.h
+           Z_MAX_NUM_GUI_PULL_ITEMS max num GUI pulldowns
+           Z_LEN_GUI_PULL_STR  max length of GUI pulldown string
+           Z_LEN_GUI_FIELD_STR  max length of field string
+           Z_LEN_GUI_TITLE_STR   max length of title string
+ 
+    The library is loaded, this routine is
+     called, then the library is unloaded.
+ 
+    Do not define globals in this routine
+     as when the library is unloaded, you'll
+     lose them.
+ 
+
+--------------------------------------------------------------------
+USERD_get_extra_gui_defaults
+
+   Description:
+   -----------
+   This routine defines the Titles, status,
+   List choices, strings, etc that are fed
+   up to the GUI.
+
+   Specification:
+   -------------
+   int USERD_get_extra_gui_defaults(char **toggle_Title,
+                                    int *toggle_default_status,
+                                    char **pulldown_Title,
+                                    int *pulldown_number_in_list,
+                                    int *pulldown_default_selection,
+                                    char ***pulldown_item_strings,
+                                    char **field_Title,
+                                    char **field_user_string)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) toggle_Title               = title for each toggle
+                                      array dimension is [num_toggles] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         toggle_default_status      = Setting for each toggle (TRUE or FALSE)
+                                      array dimension is [num_toggles] long 
+
+         pulldown_Title             = title for each pulldown
+                                      array dimension is [num_pulldowns] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         pulldown_number_in_list    = number of items in each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_default_selection = pulldown item selection for each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_item_strings      = pulldown item strings
+                                      array is [num_pulldowns] by
+                                               [Z_MAX_NUM_GUI_PULL_ITEMS] by
+                                               [Z_LEN_GUI_PULL_STR] long
+
+         field_Title                = title for each field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         field_user_string          = content of the field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+
+
+   Notes:
+   -----
+   * The library is loaded, this routine is called, then the library is unloaded.
+ 
+   * Do not define globals in this routine as when the library is unloaded, you'll
+     lose them.
+
+
+
+--------------------------------------------------------------------
+USERD_set_extra_gui_data
+
+   Description:
+   -----------
+   This routine sets the new values for the toggles, pulldowns, and fields.
+
+   Specification:
+   -------------
+   void USERD_set_extra_gui_data(
+               int *toggle,       /* [num_toggle] */
+               int *pulldown,     /* [num_pulldown] */
+               char **field_text  /* [num_fields][Z_LEN_GUI_FIELD_STR]*/)
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (IN) toggle               = setting for each toggle.  TRUE or FALSE
+                               array dimension is [num_toggles] long
+
+        pulldown             = item chosen in each pulldown. (0 based)
+                               array dimension is [num_pulldowns] long
+
+        field_text           = content of the field
+                               array dimension is [num_fields] by
+                                                  [Z_LEN_GUI_TITLE_STR] long
+
+
+   Notes:
+   -----
+   * This routine is called when the library is permanently
+     loaded to the EnSight session, so define your globals
+     in this and later routines.
+ 
+   * It's up to you to change your reader behavior according to
+     user entries!
+
+
+
+--------------------------------------------------------------------
+USERD_get_var_extract_gui_numbers
+
+   Description:
+   -----------
+   The Var_Extract_GUI routines are added to allow
+   the user to customize a extraction parameters
+   for variables "after" the file has been read.
+   These things can be modified and the variables will
+   be update/refreshed according to the new parameters set
+
+   Specification:
+   -------------
+   void USERD_get_var_extract_gui_numbers(int *num_Toggles,
+                                          int *num_pulldowns,
+                                          int *num_fields)
+
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (OUT) num_Toggles    = number of toggles that will be provided
+   
+         num_pulldowns  = number of pulldowns that will be provided
+
+         num_fields     = number of fields that will be provided
+
+   Notes:
+   -----
+     There are three routines that work together:
+     USERD_get_var_extract_gui_numbers
+     USERD_get_var_extract_gui_defaults (this one)
+     USERD_set_var_extract_gui_data
+
+     The existence of these routine indicates that
+     you wish to have the Var Extract Parameters dialog.
+
+     If you don't want the extra GUI features,
+     simply delete these routines, or change their
+     names to something such as
+     USERD_DISABLED_get_var_extract_gui_defaults
+ 
+     The presence of these routines
+     will ensure that EnSight will call them and
+     use their data to modify the extraction parameters set
+     with some or all of the following:
+     toggles, pulldown menu and fields.
+ 
+     The user can then interact with the enhanced
+     GUI and then send their choices to
+     USERD_set_extra_gui_data
+  
+     Therefore if USERD_get_var_extract_gui_numbers
+     exists then the other two must exist.
+ 
+     If none exist, then the GUI will be unchanged.
+ 
+     Toggle data will return an integer
+                               TRUE if checked
+                               FALSE if unchecked
+ 
+     Pulldown menu will return an integer representing
+                               the menu item selected
+ 
+     Field will return a string Z_LEN_GUI_FIELD_STR long.
+ 
+     If all the enhanced GUI features are enabled it
+     might look something like this
+
+    ===================================================
+    [] Title 1  [X] Title 3
+    [X]Title 2  [X] Title 4
+ 
+    Pulldown Menu ->
+        Menu Choice 1
+        Menu Choice 2
+        Menu Choice 3
+ 
+    Data Field Title 1 ____________________________
+ 
+    Data Field Title 2 ____________________________
+    =====================================================
+
+    This routine defines the numbers of toggles, pulldowns & fields
+ 
+    The following are defined in the global_extern.h
+           Z_MAX_NUM_GUI_PULL_ITEMS max num GUI pulldowns
+           Z_LEN_GUI_PULL_STR  max length of GUI pulldown string
+           Z_LEN_GUI_FIELD_STR  max length of field string
+           Z_LEN_GUI_TITLE_STR   max length of title string
+ 
+    The library is loaded, this routine is
+     called, then the library is unloaded.
+ 
+    Do not define globals in this routine
+     as when the library is unloaded, you'll
+     lose them.
+ 
+
+--------------------------------------------------------------------
+USERD_get_var_extract_gui_defaults
+
+   Description:
+   -----------
+   This routine defines the Titles, status,
+   List choices, strings, etc that are fed
+   up to the GUI.
+
+   Specification:
+   -------------
+   int USERD_get_var_extract_gui_defaults(char **toggle_Title,
+                                          int *toggle_default_status,
+                                          char **pulldown_Title,
+                                          int *pulldown_number_in_list,
+                                          int *pulldown_default_selection,
+                                          char ***pulldown_item_strings,
+                                          char **field_Title,
+                                          char **field_user_string)
+
+   Returns:
+   -------
+   Z_OK  if successful
+   Z_ERR if not successful
+
+   Arguments:
+   ---------
+   (OUT) toggle_Title               = title for each toggle
+                                      array dimension is [num_toggles] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         toggle_default_status      = Setting for each toggle (TRUE or FALSE)
+                                      array dimension is [num_toggles] long 
+
+         pulldown_Title             = title for each pulldown
+                                      array dimension is [num_pulldowns] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         pulldown_number_in_list    = number of items in each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_default_selection = pulldown item selection for each pulldown
+                                      array dimension is [num_pulldowns] long 
+
+         pulldown_item_strings      = pulldown item strings
+                                      array is [num_pulldowns] by
+                                               [Z_MAX_NUM_GUI_PULL_ITEMS] by
+                                               [Z_LEN_GUI_PULL_STR] long
+
+         field_Title                = title for each field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+         field_user_string          = content of the field
+                                      array dimension is [num_fields] by
+                                                         [Z_LEN_GUI_TITLE_STR] long
+
+
+
+   Notes:
+   -----
+   * The library is loaded, this routine is called, then the library is unloaded.
+ 
+   * Do not define globals in this routine as when the library is unloaded, you'll
+     lose them.
+
+
+
+--------------------------------------------------------------------
+USERD_set_var_extract_gui_data
+
+   Description:
+   -----------
+   This routine sets the new values for the toggles, pulldowns, and fields.
+
+   Specification:
+   -------------
+   void USERD_set_var_extract_gui_data(
+               int *toggle,       /* [num_toggle] */
+               int *pulldown,     /* [num_pulldown] */
+               char **field_text  /* [num_fields][Z_LEN_GUI_FIELD_STR]*/)
+
+   Returns:
+   -------
+
+   Arguments:
+   ---------
+   (IN) toggle               = setting for each toggle.  TRUE or FALSE
+                               array dimension is [num_toggles] long
+
+        pulldown             = item chosen in each pulldown. (0 based)
+                               array dimension is [num_pulldowns] long
+
+        field_text           = content of the field
+                               array dimension is [num_fields] by
+                                                  [Z_LEN_GUI_TITLE_STR] long
+
+
+   Notes:
+   -----
+   * This routine is called when the library is permanently
+     loaded to the EnSight session, so define your globals
+     in this and later routines.
+ 
+   * It's up to you to change your reader behavior according to
+     user entries!
+
+
+
+
+
+-----------------------------------------------------------------------------------
+/* ----------------------------------------------------------
+ *  New in EnSight 8 is the capability to remove (fail) elements
+ *   based on variable threshold values.  Basically the variable
+ *   name, a couple of thresholds, a couple of values and a logic 
+ *   criteria are read in from this routine.  Every element that
+ *   satisfies the failure criteria is removed and not used in
+ *   EnSight calculations.
+ *   
+ *  Example Failure criteria 
+ *     Let fail_var_name = "fail_flag"
+ *         threshold_val1 = 0
+ *         threshold_operator1 = Z_EQUAL_TO  
+ *         logic_criteria2 not used
+ *         threshold_val2 not used
+ *         threshold_operator2 not used
+ *     For each value of "fail_flag" at each element, 
+ *         if fail flag == threshold_val1 (0.0) then element fails
+ *   Return (Z_ERR) if this is not used.
+ *   Return (Z_OK) if failed element feature should be used
+ *
+ *  threshold_operator1 & 2 can be one of the following
+ *    Z_ELE_FAILED_NONE,           - disables checking
+ *     Z_ELE_FAILED_GREATER,        - greater than
+ *     Z_ELE_FAILED_LESS,           - less than
+ *     Z_ELE_FAILED_EQUAL,          - equal
+ *     Z_ELE_FAILED_NOT_EQUAL,      - not equal
+ *     Z_ELE_FAILED_MANY            - not used
+ *
+ * logic_criteria2
+ *      Z_ELE_FAILED_LOGIC_NONE,
+ *      Z_ELE_FAILED_LOGIC_AND,
+ *      Z_ELE_FAILED_LOGIC_OR,
+ *      Z_ELE_FAILED_LOGIC_MANY
+ *
+ * ---------------------------------------------------------- */
+int USERD_get_uns_failed_params(
+                char *fail_var_name,           /* variable name to be used in failure
+                                             must be scalar, per elem      */
+                float *threshold_val1,     /* number to compare for failure */
+                float *threshold_val2,     /* number to compare for failure */
+                int *threshold_operator1,   /* Z_GREATER_THAN, Z_LESS_THAN,
+                                            Z_EQUAL_TO */
+                int *threshold_operator2,   /* Z_GREATER_THAN, Z_LESS_THAN,
+                                            Z_EQUAL_TO */
+		int *logic_criteria2
+
+
+/*--------------------------------------------------------------------
+ * USERD_get_structured_reader_cinching -
+ *--------------------------------------------------------------------
+ *
+ *  Gets whether this reader will do structured cinching for block data
+ *  This means that it will handle the min, max, and step values for a
+ *  given block and return the coordinate components or variable components
+ *  in their "cinched" state when partial extraction or striding is used.
+ *  This is as opposed to returning the entire component (ignoring min, max
+ *  and stride) and letting Ensight pick out the values actually used.
+ *
+ *  returns: Z_OK    if the reader will handle the
+ *                   min, max, and stride and return
+ *                   the cinched values only.
+ *
+ *           Z_UNDEF or Z_ERR if will return entire component
+ *                            and rely on EnSight to cinch.
+ *
+ * Notes:
+ *  Unless you can actually pull out the desired min, max, and stride
+ *  without using a full component of memory, don't enable this feature.
+ *--------------------------------------------------------------------*/
+int
+USERD_get_structured_reader_cinching( void )
+
+
+
+/*--------------------------------------------------------------------
+ * USERD_set_block_range_and_stride -
+ *--------------------------------------------------------------------
+ *
+ *  Sets the min, max, and step values in each of the i, j, and k, directions
+ *  for the given part.
+ *
+ *  (IN)  part_number             = The part number
+ *
+ *                                  (1-based index of part table, namely:
+ *
+ *                                     1 ... Numparts_available.
+ *
+ *                                   It is NOT the part_id that
+ *                                   is loaded in
+ *                                               USERD_get_gold_part_build_info)
+ *
+ *  (IN) mini        = min i plane desired  (zero based)
+ *       maxi        = max i plane desired  (zero based)
+ *       stepi       = i stride
+ *       minj        = min j plane desired  (zero based)
+ *       maxj        = max j plane desired  (zero based)
+ *       stepj       = j stride
+ *       mink        = min k plane desired  (zero based)
+ *       maxk        = max k plane desired  (zero based)
+ *       stepk       = k stride
+ *
+ *
+ *  returns: Z_OK    if no problems
+ *           Z_ERR   if an error
+ *
+ *  Notes:
+ *  * It will not be called unless USERD_get_structured_reader_cinching
+ *    indicates that this reader does structured cinching by returning
+ *    a Z_OK.
+ *
+ *  * It will actually be called before each geom component and before
+ *    each part variable - so if you are storing things locally, you should
+ *    make this routine be able to quickly check whether anything needs
+ *    updated or not.
+ *
+ *  * If the stride (step) does not hit right on the max, the last element
+ *    in each direction will be shortened appropriately.
+ *    For example, if a block had 0 to 12 in the i direction,
+ *                 and the user specified min = 1
+ *                                        max = 8
+ *                                        step = 3
+ *
+ *             0   1   2   3   4   5   6   7   8   9   10  11  12
+ *             |   |   |   |   |   |   |   |   |   |   |   |   |
+ *
+ *                 |           |           |   |
+ *
+ *      Namely, the coarser cell boundaries in this direction would be at 1, 4,
+7, and 8
+ *
+ *--------------------------------------------------------------------*/
+int
+USERD_set_block_range_and_stride(int part_number,
+                                 int mini, int maxi, int stepi,
+                                 int minj, int maxj, int stepj,
+                                 int mink, int maxk, int stepk)
+
+
+
+---- end of document ----
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_IN_BUFFERS b/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_IN_BUFFERS
new file mode 100644
index 0000000000..8b80e6a645
--- /dev/null
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/README_USERD_IN_BUFFERS
@@ -0,0 +1,1447 @@
+README_USERD_IN_BUFFERS
+========================
+Five optional routines for normal elements,
+
+  USERD_get_part_coords_in_buffers               |
+  USERD_get_part_node_ids_in_buffers             |
+  USERD_get_part_elements_by_type_in_buffers     |If any of these are implemented,
+  USERD_get_part_element_ids_by_type_in_buffers  |all 5 of them must be implemented
+  USERD_get_var_by_component_in_buffers          |
+
+
+
+one optional routine for nsided elements,
+
+  USERD_get_nsided_conn_in_buffers
+
+
+
+and one optional routine for nfaced elements,
+
+  USERD_get_nfaced_conn_in_buffers
+
+
+can be added into any API 2.* reader to be used by the 
+Unstructured Auto Distribute capability in EnSight 8.2 and later.
+
+Unstructured Auto Distribute is a capability requiring Server of Servers (SOS)
+that will partition an unstructured model for you automatically across a set of
+servers.
+
+If you do not implement the routines listed above (and described below) in your
+reader, EnSight can still perform this operation but will require much more memory on
+each server to read in the data (somewhat like each server having to read the
+whole model). You will however, get the execution advantage of having your model
+partitioned across multiple servers.
+
+If you do implement these routines in your reader (in a proper manner), you
+should be able to not only get the execution advantages, but also memory usage
+on each server which is proportional to the subset that it is assigned to deal with. 
+
+
+Note that the optional routines are functionally quite similar
+to the following functions. And thus their implementation should
+not be too difficult to add to any existing reader that has already
+implemented these:
+------------------------------------------
+USERD_get_part_coords
+USERD_get_part_node_ids
+USERD_get_part_elements_by_type
+USERD_get_part_element_ids_by_type
+USERD_get_var_by_component
+
+USERD_get_nsided_conn
+
+USERD_get_nfaced_conn
+
+
+
+Routine Details:
+================
+
+/*--------------------------------------------------------------------
+ * USERD_get_part_coords_in_buffers -
+ *--------------------------------------------------------------------
+ *
+ *   Get the coordinates for an unstructured part in buffers.
+ *
+ *  (IN)  part_number             = The part number
+ *
+ *                                  (1-based index of part table, namely:
+ *
+ *                                     1 ... Numparts_available.
+ *
+ *                                   It is NOT the part_id that
+ *                                   is loaded in USERD_get_gold_part_build_info)
+ *
+ *  (IN)  first                   = TRUE if first invocation of a buffered set.
+ *                                  Will be FALSE for all subsequent invocations
+ *                                  of the set.  This is so you can open files, get to
+ *                                  the correct starting spot, initialize, etc.
+ *
+ *  (IN) n_beg                    = Zero based, first node index
+ *                                  of the buffered set
+ *
+ *  (IN) n_end                    = Zero based, last node index
+ *                                  of the buffered set
+ *                                      
+ *                     Thus, for first five nodes:
+ *                       n_beg = 0
+ *                       n_end = 4
+ *                       total_number = (n_end - n_beg) + 1 = (4 - 0) + 1 = 5
+ *
+ *                     for second five nodes, would be:      
+ *                       n_beg = 5
+ *                       n_end = 9
+ *                       total_number = (n_end - n_beg) + 1 = (9 - 5) + 1 = 5
+ *
+ *                     for all nodes of a part, would be:
+ *                       n_beg = 0
+ *                       n_end = num_nodes - 1
+ *
+ *  (IN)  buffer_size             = The size of the buffer.
+ *                                  Namely:   coord_array[3][buffer_size]
+ *
+ *  (OUT) coord_array             = 2D float buffer array which is set up to hold
+ *                                  x,y,z coordinates of nodes.
+ *
+ *       (IMPORTANT: the second dimension of of this array is 0-based!!!)
+ *
+ *       (IMPORTANT: in the sister routine (USERD_get_part_coords) - which
+ *                   does not use buffers. This array is 1-based.  So pay attention.)
+ *
+ *                                  (Array will have been allocated
+ *                                   3 by buffer_size long
+ *
+ * Example, if we had a part with 645 nodes and the buffer size was set to 200
+ *
+ *          first invocation:
+ *            first = TRUE            Will be TRUE the first time! 
+ *            n_beg = 0
+ *            n_end = 644
+ *            buffer_size = 200
+ *            coord_array[3][200]     fill with values for nodes 1 - 200   (zero-based)
+ *            *num_returned = 200     set this
+ *            return(0)               return this (indicates more to do)
+ *
+ *          second invocation:        which occurs because we returned a 0 last time
+ *            first = FALSE           will now be FALSE
+ *            n_beg = 0
+ *            n_end = 644
+ *            buffer_size = 200
+ *            coord_array[3][200]     fill with values for nodes 201 - 400 (zero-based)
+ *            *num_returned = 200     set this
+ *            return(0)               return this (indicates more to do)
+ *
+ *          third invocation:         which occurs because we returned a 0 last time
+ *            first = FALSE           will still be FALSE
+ *            n_beg = 0
+ *            n_end = 644
+ *            buffer_size = 200
+ *            coord_array[3][200]     fill with values for nodes 401 - 600 (zero-based)
+ *            *num_returned = 200     set this
+ *            return(0)               return this (indicates more to do)
+ *
+ *          fourth invocation:        which occurs because we returned a 0 last time
+ *            first = FALSE           will still be FALSE
+ *            n_beg = 0
+ *            n_end = 644
+ *            buffer_size = 200
+ *            coord_array[3][200]     fill with values for nodes 601 - 645 (zero-based)
+ *            *num_returned = 45      set this
+ *            return(1)               return this (indicates done!)
+ *
+ *  (OUT)  *num_returned          = The number of nodes whose coordinates are returned
+ *                                  in the buffer. This will normally be equal to
+ *                                  buffer_size except for that last buffer -
+ *                                  which could be less than a full buffer. 
+ *
+ * returns  0  if got some, more to do
+ *          1  if got some, done
+ *         -1  if an error
+ *
+ *  Notes:
+ *  * This will be based on Current_time_step
+ *
+ *  * Not called unless number_of_nodes for the part > 0
+ *
+ *  * Again, make sure each buffer is zero based. For our example above:
+ *
+ *                                                 Invocation:
+ *                                     1          2          3           4
+ *                                  -------    -------    --------    -------
+ *      coord_array[0][0]    x  for node 1     node 201   node 401    node 601   
+ *      coord_array[1][0]    y  for    "          "          "           " 
+ *      coord_array[2][0]    z  for    "          "          "           " 
+ *
+ *      coord_array[0][1]    x  for node 2     node 202   node 402    node 602
+ *      coord_array[1][1]    y  for    "          "          "           "
+ *      coord_array[2][1]    z  for    "          "          "           "
+ * 
+ *      ...
+ *
+ *      coord_array[0][199]  x  for node 200   node 400   node 600    node 645
+ *      coord_array[1][199]  y  for    "          "          "           "
+ *      coord_array[2][199]  z  for    "          "          "           "
+ *--------------------------------------------------------------------*/
+int
+USERD_get_part_coords_in_buffers(int part_number,
+                                 float **coord_array,
+                                 int first,
+                                 int n_beg,
+                                 int n_end,
+                                 int buffer_size,
+                                 int *num_returned)
+
+
+
+
+
+/*--------------------------------------------------------------------
+ * USERD_get_part_node_ids_in_buffers -
+ *--------------------------------------------------------------------
+ *
+ *   Get the node ids for an unstructured part in buffers.
+ *
+ *  (IN)  part_number             = The part number
+ *
+ *                                  (1-based index of part table, namely:
+ *
+ *                                     1 ... Numparts_available.
+ *
+ *                                   It is NOT the part_id that
+ *                                   is loaded in USERD_get_gold_part_build_info)
+ *
+ *  (IN)  first                   = TRUE if first invocation of a buffered set.
+ *                                  Will be FALSE for all subsequent invocations
+ *                                  of the set.  This is so you can open files, get to
+ *                                  the correct starting spot, initialize, etc.
+ *
+ *  (IN) n_beg                    = Zero based, first node index
+ *                                  of the buffered set
+ *
+ *  (IN) n_end                    = Zero based, last node index
+ *                                  of the buffered set
+ *                                      
+ *                     Thus, for first five nodes:
+ *                       n_beg = 0
+ *                       n_end = 4
+ *                       total_number = (n_end - n_beg) + 1 = (4 - 0) + 1 = 5
+ *
+ *                     for second five nodes, would be:      
+ *                       n_beg = 5
+ *                       n_end = 9
+ *                       total_number = (n_end - n_beg) + 1 = (9 - 5) + 1 = 5
+ *
+ *                     for all nodes of a part, would be:
+ *                       n_beg = 0
+ *                       n_end = num_nodes - 1
+ *
+ *  (IN)  buffer_size             = The size of the buffer.
+ *                                  Namely:   nodeid_array[buffer_size]
+ *
+ *  (OUT) nodeid_array            = 1D buffer array which is set up to hold
+ *                                  node ids of nodes
+ *
+ *       (IMPORTANT: this array is 0-based!!!)
+ *
+ *       (IMPORTANT: in the sister routine (USERD_get_part_node_ids) - which
+ *                   does not use buffers. This array is 1-based.  So pay attention.)
+ *
+ *                                  (Array will have been allocated
+ *                                   buffer_size long)
+ *
+ * Example, if we had a part with 645 nodes and the buffer size was set to 200
+ *
+ *          first invocation:
+ *            first = TRUE            Will be TRUE the first time! 
+ *            n_beg = 0
+ *            n_end = 644
+ *            buffer_size = 200
+ *            nodeid_array[200]       fill with values for nodes 1 - 200   (zero-based)
+ *            *num_returned = 200     set this
+ *            return(0)               return this (indicates more to do)
+ *
+ *          second invocation:        which occurs because we returned a 0 last time
+ *            first = FALSE           will now be FALSE
+ *            n_beg = 0
+ *            n_end = 644
+ *            buffer_size = 200
+ *            nodeid_array[200]       fill with values for nodes 201 - 400 (zero-based)
+ *            *num_returned = 200     set this
+ *            return(0)               return this (indicates more to do)
+ *
+ *          third invocation:         which occurs because we returned a 0 last time
+ *            first = FALSE           will still be FALSE
+ *            n_beg = 0
+ *            n_end = 644
+ *            buffer_size = 200
+ *            nodeid_array[200]       fill with values for nodes 401 - 600 (zero-based)
+ *            *num_returned = 200     set this
+ *            return(0)               return this (indicates more to do)
+ *
+ *          fourth invocation:        which occurs because we returned a 0 last time
+ *            first = FALSE           will still be FALSE
+ *            n_beg = 0
+ *            n_end = 644
+ *            buffer_size = 200
+ *            nodeid_array[200]       fill with values for nodes 601 - 645 (zero-based)
+ *            *num_returned = 45      set this
+ *            return(1)               return this (indicates done!)
+ *
+ *
+ *  (OUT)  *num_returned          = The number of nodes whose ids are returned
+ *                                  in the buffer. This will normally be equal
+ *                                  to buffer_size except for that last buffer
+ *                                  - which could be less than a full buffer. 
+ *
+ * returns  0  if got some, more to do
+ *          1  if got some, done
+ *         -1  if an error
+ *
+ *  Notes:
+ *  * This will be based on Current_time_step
+ *
+ *  * Not called unless number_of_nodes for the part > 0
+ *
+ *  * Again, make sure each buffer is zero based. For our example above:
+ *
+ *                                                 Invocation:
+ *                                     1          2          3           4
+ *                                  -------    -------    --------    -------
+ *      nodeid_array[0]    id   for node 1     node 201   node 401    node 601   
+ *
+ *      nodeid_array[1]    id   for node 2     node 202   node 402    node 602
+ *
+ *      ...
+ *
+ *      nodeid_array[199]  id   for node 200   node 400   node 600    node 645
+ *--------------------------------------------------------------------*/
+int
+USERD_get_part_node_ids_in_buffers(int part_number,
+                                   int *nodeid_array,
+                                   int first,
+                                   int n_beg,
+                                   int n_end,
+                                   int buffer_size,
+                                   int *num_returned)
+
+
+
+
+/*--------------------------------------------------------------------
+ * USERD_get_part_elements_by_type_in_buffers -
+ *--------------------------------------------------------------------
+ *
+ *   Gets the connectivities for the elements of a particular type
+ *   in an unstructured part in buffers
+ *
+ *  (IN)  part_number             = The part number
+ *
+ *                                  (1-based index of part table, namely:
+ *
+ *                                     1 ... Numparts_available.
+ *
+ *                                   It is NOT the part_id that
+ *                                   is loaded in USERD_get_gold_part_build_info)
+ *
+ *  (IN)  element_type            = One of the following (See global_extern.h)
+ *                                  Z_POINT    node point element
+ *                                  Z_BAR02    2 node bar
+ *                                  Z_BAR03    3 node bar
+ *                                  Z_TRI03    3 node triangle
+ *                                  Z_TRI06    6 node triangle
+ *                                  Z_QUA04    4 node quad
+ *                                  Z_QUA08    8 node quad
+ *                                  Z_TET04    4 node tetrahedron
+ *                                  Z_TET10   10 node tetrahedron
+ *                                  Z_PYR05    5 node pyramid
+ *                                  Z_PYR13   13 node pyramid
+ *                                  Z_PEN06    6 node pentahedron
+ *                                  Z_PEN15   15 node pentahedron
+ *                                  Z_HEX08    8 node hexahedron
+ *                                  Z_HEX20   20 node hexahedron
+ *
+ *   Starting at API 2.01:
+ *   ====================
+ *                                  Z_G_POINT    ghost node point element
+ *                                  Z_G_BAR02    2 node ghost bar
+ *                                  Z_G_BAR03    3 node ghost bar
+ *                                  Z_G_TRI03    3 node ghost triangle
+ *                                  Z_G_TRI06    6 node ghost triangle
+ *                                  Z_G_QUA04    4 node ghost quad
+ *                                  Z_G_QUA08    8 node ghost quad
+ *                                  Z_G_TET04    4 node ghost tetrahedron
+ *                                  Z_G_TET10   10 node ghost tetrahedron
+ *                                  Z_G_PYR05    5 node ghost pyramid
+ *                                  Z_G_PYR13   13 node ghost pyramid
+ *                                  Z_G_PEN06    6 node ghost pentahedron
+ *                                  Z_G_PEN15   15 node ghost pentahedron
+ *                                  Z_G_HEX08    8 node ghost hexahedron
+ *                                  Z_G_HEX20   20 node ghost hexahedron
+ *                                  Z_NSIDED     n node ghost nsided polygon
+ *                                  Z_NFACED     n face ghost nfaced polyhedron
+ *
+ *   Starting at API 2.02:
+ *   ====================
+ *                                  Z_NSIDED     n node nsided polygon
+ *                                  Z_NFACED     n face nfaced polyhedron
+ *                                  Z_G_NSIDED   n node ghost nsided polygon
+ *                                  Z_G_NFACED   n face ghost nfaced polyhedron
+ *
+ *  (IN)  first                   = TRUE if first invocation of a buffered set.
+ *                                  Will be FALSE for all subsequent invocations
+ *                                  of the set.  This is so you can open files, get to
+ *                                  the correct starting spot, initialize, etc.
+ *
+ *  (IN) e_beg                    = Zero based, first element number
+ *                                  of the buffered set
+ *
+ *  (IN) e_end                    = Zero based, last element number
+ *                                  of the buffered set
+ *
+ *                     Thus, for first five elements of a type:
+ *                       e_beg = 0
+ *                       e_end = 4
+ *                       total_number = (e_end - e_beg) + 1 = (4 - 0) + 1 = 5
+ *
+ *                     for second five elements of a type, would be:
+ *                       e_beg = 5
+ *                       e_end = 9
+ *                       total_number = (e_end - e_beg) + 1 = (9 - 5) + 1 = 5
+ *
+ *                     for all elements of the type of a part, would be:
+ *                       n_beg = 0
+ *                       n_end = num_elements_of_type - 1
+ *
+ *  (IN) buffer_size              = The size of the buffer.
+ *                                  Namely:  conn_array[buffer_size][element_size]
+ *
+ *  (OUT) conn_array              = 2D buffer array which is set up to hold
+ *                                  connectivity of elements of the type.
+ *
+ *                                  (Array will have been allocated
+ *                                   buffer_size of
+ *                                   the type by connectivity length
+ *                                   of the type)
+ *
+ *                       ex) The allocated dimensions available
+ *                           for this routine will be:
+ *                              conn_array[buffer_size][3]   when called with Z_TRI03
+ *
+ *                              conn_array[buffer_size][4]   when called with Z_QUA04
+ *
+ *                              conn_array[buffer_size][8]   when called with Z_HEX08
+ *
+ *                              etc.
+ *
+ *   * Example, (if 158 quad elements, and buffer size is 200)
+ *
+ *       (get all 158 quad4s in one invocation)
+ *          element_type = Z_QUA04
+ *          first = TRUE               Will be TRUE the first time!
+ *          e_beg  = 0                 (zero based, first element index)
+ *          e_end  = 157               (zero based, last element index)
+ *          buffer_size = 200
+ *          conn_array[200][4]         Use first 158 locations of the array
+ *          *num_returned = 158        set this
+ *          return(1)                  return this (indicates no more to do)
+ *
+ *   * Example, (if 158 quad elements, and buffer size is 75)
+ *
+ *        first invocation:
+ *          element_type = Z_QUA04
+ *          first = TRUE               Will be TRUE the first time!
+ *          e_beg  = 0
+ *          e_end  = 157
+ *          buffer_size = 75
+ *          conn_array[75][4]          load in conn for elements 1 - 75
+ *          *num_returned = 75         set this
+ *          return(0)                  return this (indicates more to do)
+ *
+ *        second invocation:
+ *          element_type = Z_QUA04
+ *          first = TRUE               Will be TRUE the first time!
+ *          e_beg  = 0
+ *          e_end  = 157
+ *          buffer_size = 75
+ *          conn_array[75][4]          load in conn for elements 76 - 150
+ *          *num_returned = 75         set this
+ *          return(0)                  return this (indicates more to do)
+ *
+ *        third invocation:
+ *          element_type = Z_QUA04
+ *          first = TRUE               Will be TRUE the first time!
+ *          e_beg  = 0
+ *          e_end  = 157
+ *          buffer_size = 75
+ *          conn_array[75][4]          load in conn for elements 151 - 158
+ *          *num_returned = 8          set this
+ *          return(1)                  return this (indicates no more to do)
+ *
+ *
+ *  (OUT)  *num_returned          = The number of elements whose connectivities
+ *                                  are returned in the buffer. This will
+ *                                  normally be equal to buffer_size except for
+ *                                  that last buffer - which could be less than
+ *                                  a full buffer.
+ *
+ * returns  0  if got some, more to do
+ *          1  if got some, done
+ *         -1  if an error
+ *
+ *  Notes:
+ *  * This will be based on Current_time_step
+ *
+ *  * Again, make sure each buffer is zero based. For our example using buffers above:
+ *
+ *                                                        Invocation:
+ *                                                  1          2          3    
+ *                                               -------    -------    --------
+ *      conn_array[0][0]       node 1 in conn for quad 1    quad 76     quad 151
+ *      conn_array[0][1]       node 2 in conn for quad 1    quad 76     quad 151
+ *      conn_array[0][2]       node 3 in conn for quad 1    quad 76     quad 151
+ *      conn_array[0][3]       node 4 in conn for quad 1    quad 76     quad 151
+ *
+ *      conn_array[1][0]       node 1 in conn for quad 2    quad 77     quad 152
+ *      conn_array[1][1]       node 2 in conn for quad 2    quad 77     quad 152
+ *      conn_array[1][2]       node 3 in conn for quad 2    quad 77     quad 152
+ *      conn_array[1][3]       node 4 in conn for quad 2    quad 77     quad 152
+ *
+ *      ...
+ *
+ *      conn_array[74][0]      node 1 in conn for quad 75    quad 150   quad 158
+ *      conn_array[74][1]      node 2 in conn for quad 75    quad 150   quad 158
+ *      conn_array[74][2]      node 3 in conn for quad 75    quad 150   quad 158
+ *      conn_array[74][3]      node 4 in conn for quad 75    quad 150   quad 158
+ *--------------------------------------------------------------------*/
+int
+USERD_get_part_elements_by_type_in_buffers(int part_number,
+                                           int element_type,
+                                           int **conn_array,
+                                           int first,
+                                           int e_beg,
+                                           int e_end,
+                                           int buffer_size,
+                                           int *num_returned)
+
+
+
+
+
+/*--------------------------------------------------------------------
+ * USERD_get_part_element_ids_by_type_in_buffers -
+ *--------------------------------------------------------------------
+ *
+ *   Gets the ids for the elements of a particular type
+ *   in an unstructured part in buffers
+ *
+ *  (IN)  part_number             = The part number
+ *
+ *                                  (1-based index of part table, namely:
+ *
+ *                                     1 ... Numparts_available.
+ *
+ *                                   It is NOT the part_id that
+ *                                   is loaded in USERD_get_gold_part_build_info)
+ *
+ *  (IN)  element_type            = One of the following (See global_extern.h)
+ *                                  Z_POINT    node point element
+ *                                  Z_BAR02    2 node bar
+ *                                  Z_BAR03    3 node bar
+ *                                  Z_TRI03    3 node triangle
+ *                                  Z_TRI06    6 node triangle
+ *                                  Z_QUA04    4 node quad
+ *                                  Z_QUA08    8 node quad
+ *                                  Z_TET04    4 node tetrahedron
+ *                                  Z_TET10   10 node tetrahedron
+ *                                  Z_PYR05    5 node pyramid
+ *                                  Z_PYR13   13 node pyramid
+ *                                  Z_PEN06    6 node pentahedron
+ *                                  Z_PEN15   15 node pentahedron
+ *                                  Z_HEX08    8 node hexahedron
+ *                                  Z_HEX20   20 node hexahedron
+ *
+ *   Starting at API 2.01:
+ *   ====================
+ *                                  Z_G_POINT    ghost node point element
+ *                                  Z_G_BAR02    2 node ghost bar
+ *                                  Z_G_BAR03    3 node ghost bar
+ *                                  Z_G_TRI03    3 node ghost triangle
+ *                                  Z_G_TRI06    6 node ghost triangle
+ *                                  Z_G_QUA04    4 node ghost quad
+ *                                  Z_G_QUA08    8 node ghost quad
+ *                                  Z_G_TET04    4 node ghost tetrahedron
+ *                                  Z_G_TET10   10 node ghost tetrahedron
+ *                                  Z_G_PYR05    5 node ghost pyramid
+ *                                  Z_G_PYR13   13 node ghost pyramid
+ *                                  Z_G_PEN06    6 node ghost pentahedron
+ *                                  Z_G_PEN15   15 node ghost pentahedron
+ *                                  Z_G_HEX08    8 node ghost hexahedron
+ *                                  Z_G_HEX20   20 node ghost hexahedron
+ *                                  Z_NSIDED     n node ghost nsided polygon
+ *                                  Z_NFACED     n face ghost nfaced polyhedron
+ *
+ *   Starting at API 2.02:
+ *   ====================
+ *                                  Z_NSIDED     n node nsided polygon
+ *                                  Z_NFACED     n face nfaced polyhedron
+ *                                  Z_G_NSIDED   n node ghost nsided polygon
+ *                                  Z_G_NFACED   n face ghost nfaced polyhedron
+ *
+ *  (IN)  first                   = TRUE if first invocation of a buffered set.
+ *                                  Will be FALSE for all subsequent invocations
+ *                                  of the set.  This is so you can open files, get to
+ *                                  the correct starting spot, initialize, etc.
+ *
+ *  (IN) e_beg                    = Zero based, first element number
+ *                                  of the buffered set
+ *
+ *  (IN) e_end                    = Zero based, last element number
+ *                                  of the buffered set
+ *
+ *                     Thus, for first five elements of a type:
+ *                       e_beg = 0
+ *                       e_end = 4
+ *                       total_number = (e_end - e_beg) + 1 = (4 - 0) + 1 = 5
+ *
+ *                     for second five elements of a type, would be:
+ *                       e_beg = 5
+ *                       e_end = 9
+ *                       total_number = (e_end - e_beg) + 1 = (9 - 5) + 1 = 5
+ *
+ *                     for all elements of the type of a part, would be:
+ *                       n_beg = 0
+ *                       n_end = num_elements_of_type - 1
+ *
+ *  (IN) buffer_size              = The size of the buffer.
+ *                                  Namely:  elemid_array[buffer_size]
+ *
+ *  (OUT) elemid_array            = 1D buffer array which is set up to hold ids
+ *                                  of elements of the type.
+ *
+ *                                  (Array will have been allocated
+ *                                   buffer_size long)
+ *
+ *   * Example, (if 158 quad elements, and buffer size is 200)
+ *
+ *       (get all 158 quad4 ids in one invocation)
+ *          element_type = Z_QUA04
+ *          first = TRUE               Will be TRUE the first time!
+ *          e_beg  = 0                 (zero based, first element index)
+ *          e_end  = 157               (zero based, last element index)
+ *          buffer_size = 200
+ *          elemeid_array[200]         Use first 158 locations of the array
+ *          *num_returned = 158        set this
+ *          return(1)                  return this (indicates no more to do)
+ *
+ *   * Example, (if 158 quad elements, and buffer size is 75)
+ *
+ *        first invocation:
+ *          element_type = Z_QUA04
+ *          first = TRUE               Will be TRUE the first time!
+ *          e_beg  = 0
+ *          e_end  = 157
+ *          buffer_size = 75
+ *          elemid_array[75]           load in ids for elements 1 - 75
+ *          *num_returned = 75         set this
+ *          return(0)                  return this (indicates more to do)
+ *
+ *        second invocation:
+ *          element_type = Z_QUA04
+ *          first = TRUE               Will be TRUE the first time!
+ *          e_beg  = 0
+ *          e_end  = 157
+ *          buffer_size = 75
+ *          elemid_array[75]           load in ids for elements 76 - 150
+ *          *num_returned = 75         set this
+ *          return(0)                  return this (indicates more to do)
+ *
+ *        third invocation:
+ *          element_type = Z_QUA04
+ *          first = TRUE               Will be TRUE the first time!
+ *          e_beg  = 0
+ *          e_end  = 157
+ *          buffer_size = 75
+ *          elemid_array[75]           load in ids for elements 151 - 158
+ *          *num_returned = 8          set this
+ *          return(1)                  return this (indicates no more to do)
+ *
+ *
+ *  (OUT)  *num_returned          = The number of elements whose ids are returned
+ *                                  in the buffer. This will normally be equal
+ *                                  to buffer_size except for that last buffer
+ *                                  - which could be less than a full buffer.
+ *
+ * returns  0  if got some, more to do
+ *          1  if got some, done
+ *         -1  if an error
+ *
+ *  Notes:
+ *  * This will be based on Current_time_step
+ *
+ *  * Again, make sure each buffer is zero based. For our example using buffers above:
+ *
+ *                                                  Invocation:
+ *                                           1          2          3    
+ *                                        -------    -------    --------
+ *      elemid_array[0]       elem id  for quad 1    quad 76     quad 151
+ *
+ *      elemid_array[1]       elem id  for quad 2    quad 77     quad 152
+ *
+ *      ...
+ *
+ *      elemid_array[74]      elem id  for quad 75   quad 150    quad 158
+ *--------------------------------------------------------------------*/
+int
+USERD_get_part_element_ids_by_type_in_buffers(int part_number,
+                                              int element_type,
+                                              int *elemid_array,
+                                              int first,
+                                              int e_beg,
+                                              int e_end,
+                                              int buffer_size,
+                                              int *num_returned)
+
+
+
+
+
+
+/*--------------------------------------------------------------------
+ * USERD_get_var_by_component_in_buffers -  used by unstructured parts
+ *--------------------------------------------------------------------
+ *
+ *  if Z_PER_NODE:
+ *    Get the component value at each node for a given variable in the part
+ *    in buffers.
+ *
+ *  or if Z_PER_ELEM:
+ *    Get the component value at each element of a specific part and type for
+ *    a given variable in buffers.
+ *
+ *  (IN)  which_variable          = The variable number
+ *
+ *  (IN)  which_part                Since EnSight Version 7.4
+ *                                  -------------------------
+ *                                = The part number
+ *
+ *                                  (1-based index of part table, namely:
+ *
+ *                                     1 ... Numparts_available.
+ *
+ *                                   It is NOT the part_id that
+ *                                   is loaded in USERD_get_gold_part_build_info)
+ *
+ *                                  Prior to EnSight Version 7.4
+ *                                  ----------------------------
+ *                                = The part id   This is the part_id label loaded
+ *                                                in USERD_get_gold_part_build_inf\o.
+ *                                                It is NOT the part table index.
+ *
+ *  (IN)  var_type                = Z_SCALAR
+ *                                  Z_VECTOR
+ *                                  Z_TENSOR     ( symmetric tensor)
+ *                                  Z_TENSOR9    (asymmetric tensor)
+ *
+ *  (IN)  which_type
+ *
+ *           if Z_PER_NODE:         Not used
+ *
+ *           if Z_PER_ELEM:       = The element type
+ *                                  Z_POINT    node point element
+ *                                  Z_BAR02    2 node bar
+ *                                  Z_BAR03    3 node bar
+ *                                  Z_TRI03    3 node triangle
+ *                                  Z_TRI06    6 node triangle
+ *                                  Z_QUA04    4 node quad
+ *                                  Z_QUA08    8 node quad
+ *                                  Z_TET04    4 node tetrahedron
+ *                                  Z_TET10   10 node tetrahedron
+ *                                  Z_PYR05    5 node pyramid
+ *                                  Z_PYR13   13 node pyramid
+ *                                  Z_PEN06    6 node pentahedron
+ *                                  Z_PEN15   15 node pentahedron
+ *                                  Z_HEX08    8 node hexahedron
+ *                                  Z_HEX20   20 node hexahedron
+ *
+ *   Starting at API 2.01:
+ *   ====================
+ *                                  Z_G_POINT    ghost node point element
+ *                                  Z_G_BAR02    2 node ghost bar
+ *                                  Z_G_BAR03    3 node ghost bar
+ *                                  Z_G_TRI03    3 node ghost triangle
+ *                                  Z_G_TRI06    6 node ghost triangle
+ *                                  Z_G_QUA04    4 node ghost quad
+ *                                  Z_G_QUA08    8 node ghost quad
+ *                                  Z_G_TET04    4 node ghost tetrahedron
+ *                                  Z_G_TET10   10 node ghost tetrahedron
+ *                                  Z_G_PYR05    5 node ghost pyramid
+ *                                  Z_G_PYR13   13 node ghost pyramid
+ *                                  Z_G_PEN06    6 node ghost pentahedron
+ *                                  Z_G_PEN15   15 node ghost pentahedron
+ *                                  Z_G_HEX08    8 node ghost hexahedron
+ *                                  Z_G_HEX20   20 node ghost hexahedron
+ *   Starting at API 2.02:
+ *   ====================
+ *                                  Z_NSIDED     n node nsided polygon
+ *                                  Z_NFACED     n face nfaced polyhedron
+ *                                  Z_G_NSIDED   n node ghost nsided polygon
+ *                                  Z_G_NFACED   n face ghost nfaced polyhedron
+ *
+ *
+ *
+ *  (IN)  imag_data               = TRUE if imag component
+ *                                  FALSE if real component
+ *
+ *  (IN)  component               = The component: (0       if Z_SCALAR)
+ *                                                 (0 - 2   if Z_VECTOR)
+ *                                                 (0 - 5   if Z_TENSOR)
+ *                                                 (0 - 8   if Z_TENSOR9)
+ *
+ *                                * 6 Symmetric Indicies, 0:5    *
+ *                                * ---------------------------- *
+ *                                *     | 11 12 13 |   | 0 3 4 | *
+ *                                *     |          |   |       | *
+ *                                * T = |    22 23 | = |   1 5 | *
+ *                                *     |          |   |       | *
+ *                                *     |       33 |   |     2 | *
+ *
+ *                                * 9 General   Indicies, 0:8    *
+ *                                * ---------------------------- *
+ *                                *     | 11 12 13 |   | 0 1 2 | *
+ *                                *     |          |   |       | *
+ *                                * T = | 21 22 23 | = | 3 4 5 | *
+ *                                *     |          |   |       | *
+ *                                *     | 31 32 33 |   | 6 7 8 | *
+ *
+ *  (IN) ne_beg
+ *          if Z_PER_NODE:   = Zero based, first node index of the buffered set
+ *          if Z_PER_ELEM:   = Zero based, first element index of the buffered set
+ *
+ *  (IN) ne_end
+ *          if Z_PER_NODE:   = Zero based, last node index of the buffered set
+ *          if Z_PER_ELEM:   = Zero based, last element index of the buffered set
+ *
+ *                     Thus, for first five elements or nodes:
+ *                       e_beg = 0
+ *                       e_end = 4
+ *                       total_number = (e_end - e_beg) + 1 = (4 - 0) + 1 = 5
+ *
+ *                     for second five elements or nodes, would be:
+ *                       e_beg = 5
+ *                       e_end = 9
+ *                       total_number = (e_end - e_beg) + 1 = (9 - 5) + 1 = 5
+ *
+ *                     for all elements or nodes of a part, would be:
+ *                       n_beg = 0
+ *                       n_end = num_elements_or_nodes - 1
+ *
+ * (IN) first                    = TRUE if first invocation of a buffered set.
+ *                                  Will be FALSE for all subsequent invocations
+ *                                  of the set.  This is so you can open files, get to
+ *                                  the correct starting spot, initialize, etc.
+ *
+ * (IN) buffer_size              = The size of the buffer.
+ *                                  Namely:  var_array[buffer_size]
+ *
+ * (IN) leftside                 = TRUE if current time is at a timestep or
+ *                                      when getting the left side of a time
+ *                                      span that encloses the current time.
+ *                               = FALSE when getting the right side of a time
+ *                                       span that encloses the current time.
+ *
+ *  Timeline:
+ *   step1         step2          step3
+ *     |-------------|--------------|-------...  requires no interpolation
+ *                   ^                           get values at step2 (leftside = TRUE)
+ *                   current time                   (leftside = TRUE)
+ *
+ *
+ *  Timeline:
+ *   step1         step2          step3
+ *     |-------------|--------------|-------...  requires interpolation
+ *              ^                                get values at step2 (leftside = TRUE)
+ *              current time                 and get values at step3 (leftside = FALSE)
+ *
+ *    Note that it would generally be easier for this routine if EnSight got all
+ *         of the left side, then all of the right side, and then did its
+ *         interpolation. But, in the spirit of doing things in buffers (to save
+ *         memory) it gets a left side buffer (and the corresponding right side
+ *         buffer and interpolates these), if needed, before going to the next
+ *         buffer of the set.  Thus, you need to be able to handle that situation.
+ *
+ *    Note also that EnSight will have called the routine to change the current
+ *         time step between the two invocations when interpolation is required.
+ *         And Ensight does the interpolating.  This variable is provided so
+ *         that you can deal with two different files or pointers between the
+ *         corresponding invocations for the two times
+ *
+ * (OUT) var_array
+ *
+ *     -----------------------------------------------------------------------
+ *     (IMPORTANT: this array is 0-based for both Z_PER_NODE and Z_PER_ELEM!!!
+ *     -----------------------------------------------------------------------
+ *
+ *          if Z_PER_NODE:       = 1D buffer array set up to hold a variable
+ *                                 component value for nodes.
+ *
+ *          if Z_PER_ELEM:       = 1D buffer array set up to hold a variable
+ *                                 component value for elements.
+ *
+ *                                 (Array will have been allocated
+ *                                  buffer_size long)
+ *
+ *              Info stored in this fashion:
+ *                   var_array[0] = var component for node or element 1 of part
+ *                   var_array[1] = var component for node or element 2 of part
+ *                   var_array[2] = var component for node or element 3 of part
+ *                   etc.
+ *
+ *   * Example, (if 158 quad elements with a real Z_PER_ELEM scalar,
+ *               current time is between steps, and buffer size is 75)
+ *
+ *        first invocation:            (for left side of time span)
+ *          var_type = Z_SCALAR
+ *          which_type = Z_PER_ELEM
+ *          imag_data = FALSE
+ *          component = 0
+ *          ne_beg = 0
+ *          ne_end = 157
+ *          first = TRUE               Will be TRUE the first time!
+ *          buffer_size = 75
+ *          leftside = TRUE            <==
+ *          var_array[75]              load in scalar value for elements 1 - 75
+ *          *num_returned = 75         set this
+ *          return(0)                  return this (indicates more to do)
+ *
+ *        second invocation:           (for right side of time span)
+ *          var_type = Z_SCALAR
+ *          which_type = Z_PER_ELEM
+ *          imag_data = FALSE
+ *          component = 0
+ *          ne_beg = 0
+ *          ne_end = 157
+ *          first = TRUE               Note: Will still be TRUE (because is right side)
+ *          buffer_size = 75
+ *          leftside = FALSE           <==
+ *          var_array[75]              load in scalar value for elements 1 - 75
+ *          *num_returned = 75         set this
+ *          return(0)                  return this (indicates more to do)
+ *
+ * -------------------------------
+ *        third invocation:            (for left side of time span)
+ *          var_type = Z_SCALAR
+ *          which_type = Z_PER_ELEM
+ *          imag_data = FALSE
+ *          component = 0
+ *          ne_beg = 0
+ *          ne_end = 157
+ *          first = FALSE              Will be FALSE now
+ *          buffer_size = 75
+ *          leftside = TRUE            <==
+ *          var_array[75]              load in scalar value for elements 76 - 150
+ *          *num_returned = 75         set this
+ *          return(0)                  return this (indicates more to do)
+ *
+ *        fourth invocation:           (for right side of time span)
+ *          var_type = Z_SCALAR
+ *          which_type = Z_PER_ELEM
+ *          imag_data = FALSE
+ *          component = 0
+ *          ne_beg = 0
+ *          ne_end = 157
+ *          first = FALSE             
+ *          buffer_size = 75
+ *          leftside = FALSE           <==
+ *          var_array[75]              load in scalar value for elements 76 - 150
+ *          *num_returned = 75         set this
+ *          return(0)                  return this (indicates more to do)
+ *
+ *------------------------------------
+ *        fifth invocation:            (for left side of time span)
+ *          var_type = Z_SCALAR
+ *          which_type = Z_PER_ELEM
+ *          imag_data = FALSE
+ *          component = 0
+ *          ne_beg = 0
+ *          ne_end = 157
+ *          first = FALSE              Will still be FALSE
+ *          buffer_size = 75
+ *          leftside = TRUE            <==
+ *          var_array[75]              load in scalar value for elements 151 - 158
+ *          *num_returned = 8          set this
+ *          return(1)                  return this (indicates no more to do)
+ *
+ *        sixth invocation:           (for right side of time span)
+ *          var_type = Z_SCALAR
+ *          which_type = Z_PER_ELEM
+ *          imag_data = FALSE
+ *          component = 0
+ *          ne_beg = 0
+ *          ne_end = 157
+ *          first = FALSE            
+ *          buffer_size = 75
+ *          leftside = FALSE           <==
+ *          var_array[75]              load in scalar value for elements 151 - 158
+ *          *num_returned = 8          set this
+ *          return(1)                  return this (indicates no more to do)
+ *
+ *
+ *  (OUT)  *num_returned          = The number of nodes or elements whose variable
+ *                                  values are returned in the buffer. This will
+ *                                  normally be equal to buffer_size except for
+ *                                  that last buffer - which could be less than
+ *                                  a full buffer.
+ *
+ * returns  0  if got some, more to do
+ *          1  if got some, done
+ *         -1  if an error
+ *
+ *  Notes:
+ *  * This will be based on Current_time_step
+ *
+ *  * Again, make sure each buffer is zero based. For our example using buffers above:
+ *
+ *                                                  Invocation:
+ *                         ----------------   ------------------   ------------------- 
+ *                            1        2         3          4          5          6
+ *                         -------  -------   --------  --------   ---------  ---------
+ * var_array[0]  scalar of quad 1L  quad 1R   quad 76L  quad 76R   quad 151L  quad 151R
+ *
+ * var_array[1]  scalar of quad 2L  quad 2R   quad 77L  quad 77R   quad 152L  quad 152R
+ *
+ * ...
+ *
+ * var_array[74] scalar of quad 75L quad 75R  quad 150L quad 150R  quad 158L  quad 158R
+ *
+ *   Where:   L indicates left time step
+ *            R indicates right time step
+ *--------------------------------------------------------------------*/
+int
+USERD_get_var_by_component_in_buffers(int which_variable,
+                                      int which_part,
+                                      int var_type,
+                                      int which_type,
+                                      int imag_data,
+                                      int component,
+                                      float *var_array,
+                                      int first,
+                                      int ne_beg,
+                                      int ne_end,
+                                      int buffer_size,
+                                      int leftside,
+                                      int *num_returned)
+
+
+
+
+/*--------------------------------------------------------------------
+ * USERD_get_nsided_conn_in_buffers -
+ *--------------------------------------------------------------------
+ *
+ *   Gets the two arrays containing the connectivity information
+ *   of nsided elements in buffers
+ *
+ *  (IN)  part_number      = The part number
+ *
+ *                           (1-based index of part table, namely:
+ *
+ *                              1 ... Numparts_available.
+ *
+ *                            It is NOT the part_id that
+ *                            is loaded in USERD_get_gold_part_build_info)
+ *
+ *  (IN)  first            = TRUE if first invocation of a buffered set.
+ *                           Will be FALSE for all subsequent invocations
+ *                           of the set.  This is so you can open files,
+ *                           get to the correct starting spot,
+ *                           initialize, etc.
+ *
+ *  (IN) e_beg             = Zero based, first element number
+ *                           of the buffered set
+ *
+ *  (IN) e_end             = Zero based, last element number
+ *                           of the buffered set
+ *
+ *                     Thus, for first five elements of a type:
+ *                       e_beg = 0
+ *                       e_end = 4
+ *                       total_number = (e_end - e_beg) + 1 = (4 - 0) + 1 = 5
+ *
+ *                     for second five elements of a type, would be:
+ *                       e_beg = 5
+ *                       e_end = 9
+ *                       total_number = (e_end - e_beg) + 1 = (9 - 5) + 1 = 5
+ *
+ *                     for all elements of the type of a part, would be:
+ *                       n_beg = 0
+ *                       n_end = num_elements_of_type - 1
+ *
+ *  (IN) buffer_size         = The size of the num_nodes_per_elem_array buffer.
+ *                             Namely: num_nodes_per_elem_array[buffer_size]
+ *
+ *  (OUT) num_nodes_per_elem_array = 1D buffer array of the number of nodes
+ *                                   per nsided element.
+ *
+ *  (OUT) nsided_conn_array  = 1D buffer array of nsided connectivies
+ *
+ *                             (int array will have been allocated
+ *                              long enough to hold all the nsided
+ *                              connectivities in the buffered chunk)
+ *
+ *  (OUT) *num_returned      = The number of elements whose connectivities
+ *                             are returned in the buffer. This will
+ *                             normally be equal to buffer_size except for
+ *                             that last buffer - which could be less than
+ *                             a full buffer.
+ *
+ *   Providing nsided information to Ensight:
+ *
+ *   NOTE: for other nsided operations you need these first two, but we
+ *         don't actually use them in this routine.
+ *
+ *   1. In USERD_get_gold_part_build_info, provide the number of nsided
+ *      elements in the part.
+ *
+ *   2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+ *      the number of nodes per nsided element. (as if connectivity
+ *      length of an nsided element is one)
+ *
+ *   We do use the following:
+ *   3. In this routine, provide the corresponding num_nodes_per_element and
+ *      streamed connectivities for each of the nsided elements in this
+ *      buffered portion.
+ *
+ *
+ *   Simple example:         5        6
+ *                          +--------+
+ *   3 nsided elements:    /|         \
+ *   (1 4-sided           / |          \
+ *    1 3-sided          /  |           \
+ *    1 7-sided)        /   |            \ 7
+ *                     /3   |4            +
+ *                    +-----+             |
+ *                    |     |             |
+ *                    |     |             |8
+ *                    |     |             +
+ *                    |     |            /
+ *                    |     |           /
+ *                    |     |          /
+ *                    |1    |2        /9
+ *                    +-----+--------+
+ *
+ *    NOTE, don't really use these first two here  (See USERD_get_nsided_conn)
+ *
+ *    1. In USERD_get_gold_part_build_info:
+ *            number_of_elements[Z_NSIDED] = 3
+ *                                           .
+ *                                          /|\
+ *                                           |
+ *    2. In USERD_get_part_elements_by_type:
+ *        length of conn_array will be:      3 x 1
+ *
+ *        for element_type of Z_NSIDED:
+ *            conn_array[0][0] = 4           (for the 4-sided element)
+ *            conn_array[1][0] = 3           (for the 3-sided element)
+ *            conn_array[2][0] = 7           (for the 7-sided element)
+ *
+ *                         Sum  ===
+ *                               14
+ *
+ *    But for our example, lets assume that that our buffer is just 2
+ *                                                   ================
+ *    3. In this routine:
+ *
+ *       first invocation:
+ *         first = TRUE
+ *         e_beg = 0
+ *         e_end = 2
+ *         buffer_size = 2
+ *         num_nodes_per_elem_array[2]    load it: num_nodes_per_elem_array[0] = 4
+ *                                                 num_nodes_per_elem_array[1] = 3
+ *
+ *         nsided_conn_array[at least 7]  load it:   nsided_conn_array[0] = 1
+ *                                                   nsided_conn_array[1] = 2
+ *                                                   nsided_conn_array[2] = 4
+ *                                                   nsided_conn_array[3] = 3
+ *
+ *                                                   nsided_conn_array[4] = 3
+ *                                                   nsided_conn_array[5] = 4
+ *                                                   nsided_conn_array[6] = 5
+ *         *num_returned = 2
+ *         return(0)                       return this (indicates more to do)
+ *
+ *       second invocation:
+ *         first = FALSE
+ *         e_beg = 0
+ *         e_end = 2
+ *         buffer_size = 2
+ *         num_nodes_per_elem_array[2]    load it: num_nodes_per_elem_array[0] = 7
+ *
+ *         nsided_conn_array[at least 7]  load it:   nsided_conn_array[0] = 2
+ *                                                   nsided_conn_array[1] = 9
+ *                                                   nsided_conn_array[2] = 8
+ *                                                   nsided_conn_array[3] = 7
+ *                                                   nsided_conn_array[4] = 6
+ *                                                   nsided_conn_array[5] = 5
+ *                                                   nsided_conn_array[6] = 4
+ *         *num_returned = 1
+ *         return(1)                       return this (indicates no more to do)
+ *
+ * returns  0  if got some, more to do
+ *          1  if got some, done
+ *         -1  if an error
+ *
+ *  Notes:
+ *  * This will be based on Current_time_step
+ *
+ *  * Will not be called unless there are some nsided elements in the
+ *    the part
+ *--------------------------------------------------------------------*/
+int
+USERD_get_nsided_conn_in_buffers(int part_number,
+                                 int *num_nodes_per_elem_array,
+                                 int *nsided_conn_array,
+                                 int first,
+                                 int e_beg,
+                                 int e_end,
+                                 int buffer_size,
+                                 int *num_returned)
+
+
+
+
+/*--------------------------------------------------------------------
+ * USERD_get_nfaced_conn_in_buffers -
+ *--------------------------------------------------------------------
+ *
+ *   Gets three arrays containing the number of faces per element,
+ *   number of nodes per face, and connectivity per face of nfaced
+ *   elements in buffers
+ *
+ *  (IN)  part_number      = The part number
+ *
+ *                           (1-based index of part table, namely:
+ *
+ *                              1 ... Numparts_available.
+ *
+ *                            It is NOT the part_id that
+ *                            is loaded in USERD_get_gold_part_build_info)
+ *
+ *  (IN)  first            = TRUE if first invocation of a buffered set.
+ *                           Will be FALSE for all subsequent invocations
+ *                           of the set.  This is so you can open files,
+ *                           get to the correct starting spot,
+ *                           initialize, etc.
+ *
+ *  (IN) e_beg             = Zero based, first element number
+ *                           of the buffered set
+ *
+ *  (IN) e_end             = Zero based, last element number
+ *                           of the buffered set
+ *
+ *                     Thus, for first five elements of a type:
+ *                       e_beg = 0
+ *                       e_end = 4
+ *                       total_number = (e_end - e_beg) + 1 = (4 - 0) + 1 = 5
+ *
+ *                     for second five elements of a type, would be:
+ *                       e_beg = 5
+ *                       e_end = 9
+ *                       total_number = (e_end - e_beg) + 1 = (9 - 5) + 1 = 5
+ *
+ *                     for all elements of the type of a part, would be:
+ *                       n_beg = 0
+ *                       n_end = num_elements_of_type - 1
+ *
+ *  (IN) buffer_size         = The size of the num_nodes_per_elem_array buffer.
+ *                             Namely: num_nodes_per_elem_array[buffer_size]
+ *
+ *  (OUT) nfaced_fpe_array   = 1D buffer array of the number of faces per nfaced
+ *                             element.
+ *
+ *                                (int array will have been allocated
+ *                                 buffer_size long)
+ *
+ *  (OUT) nfaced_npf_array   = 1D buffer array of the number of nodes per face
+ *                             for nfaced elements.
+ *
+ *                                (int array will have been allocated long
+ *                                 enough to hold a buffer's size of values)
+ *
+ *  (OUT) nfaced_conn_array  = 1D array of nsided face connectivies of
+ *                             nfaced elements
+ *
+ *                             (int array will have been allocated
+ *                              long enough to hold a buffer's worth of values)
+ *
+ *   Providing nfaced information to Ensight:
+ *
+ *   NOTE: for other nfaced operations you need these first two, but we
+ *         don't actually use them in this routine.
+ *
+ *   1. In USERD_get_gold_part_build_info, provide the number of nfaced
+ *      polyhedral elements in the part.
+ *
+ *   2. In USERD_get_part_elements_by_type, provide (in the conn_array),
+ *      the number of faces per nfaced element. (as if connectivity
+ *      length of an nfaced element is one)
+ *
+ *   We do use the following:
+ *   3. In this routine, provide the corresponding number of faces per nfaced
+ *      element, streamed number of nodes per face, and streamed face
+ *      connectivities for each of the faces of the nfaced elements in the
+ *      bufferred portion.
+ *
+ *
+ *   Simple example:         11        10   12
+ *                          +--------+-----+
+ *   2 nfaced elements:    /|        |\   /|
+ *   (1 7-faced           / |        | \ / |
+ *    1 5-sided)         /  |        |  +9 |
+ *                      /   |        | /|  |
+ *                     /7   |      8 /  |  |
+ *                    +-----------+/ |  |  |
+ *                    |     |5    |  |4 |  |6
+ *                    |     +-----|--+--|--+
+ *                    |    /      |   \ | /
+ *                    |   /       |    \|/3
+ *                    |  /        |     +
+ *                    | /         |    /
+ *                    |/1         |2 /
+ *                    +-----------+/
+ *
+ *    Note, don't really use these first two here (See USERD_get_nfaced_conn)
+ *
+ *    1. In USERD_get_gold_part_build_info:
+ *            number_of_elements[Z_NFACED] = 2
+ *                                           .
+ *                                          /|\
+ *                                           |
+ *    2. In USERD_get_part_elements_by_type:
+ *        length of conn_array will be:      2 x 1
+ *        for element_type of Z_NFACED:
+ *            conn_array[0][0] = 7           (for the 7-faced element)
+ *            conn_array[1][0] = 5           (for the 5-faced element)
+ *                              ==
+ *                         Sum  12
+ *
+ *
+ *    But for our simple example, lets assume that that our buffer is just 1
+ *      so that we have multiple invocations.               ================
+ *
+ *    3. In this routine:
+ *
+ *       first invocation:
+ *         first = TRUE
+ *         e_beg = 0
+ *         e_end = 1
+ *         buffer_size = 1
+ *         nfaced_fpe_array[1]            load it: nfaced_fpe_array[0] = 7
+ *
+ *         nfaced_npf_array[at least 7]   load it: nfaced_npf_array[0] = 5
+ *                                                 nfaced_npf_array[1] = 5
+ *                                                 nfaced_npf_array[2] = 4
+ *                                                 nfaced_npf_array[3] = 4
+ *                                                 nfaced_npf_array[4] = 4
+ *                                                 nfaced_npf_array[5] = 4
+ *                                                 nfaced_npf_array[6] = 4
+ *
+ *         nsided_conn_array[at least 30] load it: nsided_conn_array[0] = 7
+ *                                                 nsided_conn_array[1] = 8
+ *                                                 nsided_conn_array[2] = 9
+ *                                                 nsided_conn_array[3] = 10
+ *                                                 nsided_conn_array[4] = 11
+ *
+ *                                                 nsided_conn_array[5] = 1
+ *                                                 nsided_conn_array[6] = 5
+ *                                                 nsided_conn_array[7] = 4
+ *                                                 nsided_conn_array[8] = 3
+ *                                                 nsided_conn_array[9] = 2
+ *
+ *                                                 nsided_conn_array[10] = 1
+ *                                                 nsided_conn_array[11] = 2
+ *                                                 nsided_conn_array[12] = 8
+ *                                                 nsided_conn_array[13] = 7
+ *
+ *                                                 nsided_conn_array[14] = 5
+ *                                                 nsided_conn_array[15] = 1
+ *                                                 nsided_conn_array[16] = 7
+ *                                                 nsided_conn_array[17] = 11
+ *
+ *                                                 nsided_conn_array[18] = 4
+ *                                                 nsided_conn_array[19] = 5
+ *                                                 nsided_conn_array[20] = 11
+ *                                                 nsided_conn_array[21] = 10
+ *
+ *                                                 nsided_conn_array[22] = 2
+ *                                                 nsided_conn_array[23] = 3
+ *                                                 nsided_conn_array[24] = 9
+ *                                                 nsided_conn_array[25] = 8
+ *
+ *                                                 nsided_conn_array[26] = 3
+ *                                                 nsided_conn_array[27] = 4
+ *                                                 nsided_conn_array[28] = 10
+ *                                                 nsided_conn_array[29] = 9
+ *         *num_returned = 1;
+ *         return(0)
+ *
+ *       second invocation:
+ *         first = FALSE
+ *         e_beg = 0
+ *         e_end = 1
+ *         buffer_size = 1
+ *         nfaced_fpe_array[1]            load it: nfaced_fpe_array[0] = 5
+ *
+ *         nfaced_npf_array[at least 7]   load it: nfaced_npf_array[0] = 3
+ *                                                 nfaced_npf_array[1] = 3
+ *                                                 nfaced_npf_array[2] = 4
+ *                                                 nfaced_npf_array[3] = 4
+ *                                                 nfaced_npf_array[4] = 4
+ *
+ *         nsided_conn_array[at least 18] load it: nsided_conn_array[0] = 9
+ *                                                 nsided_conn_array[1] = 12
+ *                                                 nsided_conn_array[2] = 10
+ *
+ *                                                 nsided_conn_array[3] = 3
+ *                                                 nsided_conn_array[4] = 4
+ *                                                 nsided_conn_array[5] = 6
+ *
+ *                                                 nsided_conn_array[6] = 6
+ *                                                 nsided_conn_array[7] = 4
+ *                                                 nsided_conn_array[8] = 10
+ *                                                 nsided_conn_array[9] = 12
+ *
+ *                                                 nsided_conn_array[10] = 3
+ *                                                 nsided_conn_array[11] = 6
+ *                                                 nsided_conn_array[12] = 12
+ *                                                 nsided_conn_array[13] = 9
+ *
+ *                                                 nsided_conn_array[14] = 4
+ *                                                 nsided_conn_array[15] = 3
+ *                                                 nsided_conn_array[16] = 9
+ *                                                 nsided_conn_array[17] = 10
+ *         *num_returned = 1;
+ *         return(1)
+ *
+ * returns  0  if got some, more to do
+ *          1  if got some, done
+ *         -1  if an error
+ *
+ *  Notes:
+ *  * This will be based on Current_time_step
+ *
+ *  * Will not be called unless there are some nfaced elements in the
+ *    the part
+ *--------------------------------------------------------------------*/
+int
+USERD_get_nfaced_conn_in_buffers(int part_number,
+                                 int *nfaced_fpe_array,
+                                 int *nfaced_npf_array,
+                                 int *nfaced_conn_array,
+                                 int first,
+                                 int e_beg,
+                                 int e_end,
+                                 int buffer_size,
+                                 int *num_returned)
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_API.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_API.H
new file mode 100644
index 0000000000..0a76de2333
--- /dev/null
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_API.H
@@ -0,0 +1,2 @@
+#define DO_READER
+#define USERD_API_203
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_release.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_release.H
new file mode 100644
index 0000000000..3a75b16675
--- /dev/null
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_release.H
@@ -0,0 +1,18 @@
+int USERD_get_reader_release
+(
+    char release_number[Z_MAX_USERD_NAME]
+)
+{
+
+#ifdef ENSIGHTDEBUG
+    Info << "Entering: USERD_get_reader_release" << endl;
+#endif
+
+    strncpy(release_number, Foam::FOAMbuild, Z_MAX_USERD_NAME);
+
+#ifdef ENSIGHTDEBUG
+    Info << "Leaving: USERD_get_reader_release" << endl;
+#endif
+
+    return Z_OK;
+}
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_version.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_version.H
index 9debdb474e..7c8206664b 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_version.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_version.H
@@ -2,7 +2,7 @@ int USERD_get_reader_version
 (
     char version_number[Z_MAX_USERD_NAME]
 )
-{    
+{
 
 #ifdef ENSIGHTDEBUG
     Info << "Entering: USERD_get_reader_version" << endl;
@@ -13,6 +13,6 @@ int USERD_get_reader_version
 #ifdef ENSIGHTDEBUG
     Info << "Leaving: USERD_get_reader_version" << endl;
 #endif
-    
+
     return Z_OK;
 }
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H
index 7c7f2b16d8..40fb28d949 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H
@@ -7,7 +7,7 @@ static char readerName[]           = "OpenFOAM";
 static char meshName[]             = "cells";
 static char readerVersion[]        = "2.03";
 
-// everything is one part in foam, except the spray
+// everything is one part in OpenFOAM, except the spray
 static int Num_unstructured_parts  = 1;
 static int Num_structured_parts    = 0;
 static int Numparts_available      = 1;
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/global_extern.h b/applications/utilities/postProcessing/graphics/ensightFoamReader/global_extern.h
index 4e33501129..07514c06aa 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/global_extern.h
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/global_extern.h
@@ -18,21 +18,27 @@
 #ifndef GLOBAL_EXTERN_H
 #define GLOBAL_EXTERN_H
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 /*--------------------------------
  * Set the reader version define
  * (only one can be set at a time)
  *--------------------------------*/
+#if 0
+#define USERD_API_100
+#define USERD_API_200
+#define USERD_API_201
+#define USERD_API_202
 #define USERD_API_203
-
-/*----------------------------------------
- * Set this appropriately:
- *  DO_ENSIGHT  if using for EnSight itself
- *  DO_READER   if using in a reader
- *----------------------------------------*/
-#if 1
-#define DO_READER
-#else
-#define DO_ENSIGHT
+#define USERD_API_204
+#define USERD_API_205
+#define USERD_API_206
+#define USERD_API_207
+#define USERD_API_208
+#define USERD_API_209
+#define USERD_API_210
 #endif
 
 /*---------------------------------------*/
@@ -73,6 +79,28 @@
 
 #define Z_MAX_SETS              (300)
 
+#define Z_MX_MATERIALS          (60)
+
+#define Z_MXVARIABLEDESC  20 /*Interface Variables Max Name.*/
+
+/* Useful macros for handling IEEE floats */
+#define FLT_SGN_MASK 0x80000000U
+#define FLT_EXP_MASK 0x7F800000U
+#define FLT_MAN_MASK 0x007FFFFFU
+#define FLT_EXP_BIAS 127
+#define FLT_EXP_SHIFT 23
+
+#define FLT_IS_FINITE(v) \
+    (((*((unsigned int*)&(v))) & FLT_EXP_MASK) != FLT_EXP_MASK)
+
+#define FLT_IS_NAN(v) \
+    ((((*((unsigned int*)&(v))) & FLT_EXP_MASK) == FLT_EXP_MASK) && \
+    ((((*((unsigned int*)&(v))) & FLT_MAN_MASK) != 0U)
+
+#define FLT_IS_INF(v) \
+    ((((*((unsigned int*)&(v))) & FLT_EXP_MASK) == FLT_EXP_MASK) && \
+    ((((*((unsigned int*)&(v))) & FLT_MAN_MASK) == 0U)
+
 #ifndef GLOBALDEFS_H
 /*-----------------------------------*/
 /* Unstructured coordinate structure */
@@ -80,6 +108,12 @@
 typedef struct {
   float xyz[3];
 }CRD;
+/*-----------------------------------*/
+/* Unstructured double coordinate structure */
+/*-----------------------------------*/
+typedef struct {
+  double xyz[3];
+}DBLCRD;
 #endif
 
 /*----------------*/ 
@@ -95,6 +129,23 @@ enum z_var_type
   MAX_Z_VAR_TYPES
 };
 
+/*-------------------
+ * Vector Glyph enums
+ *-------------------*/
+enum vg_time {
+  VG_STATIC,
+  VG_TRANSIENT,
+  VG_UNDEF,
+  VG_NEAREST,
+  VG_INTERPOLATE
+};
+
+enum vg_type {
+  VG_FORCE,
+  VG_MOMENT
+};
+
+
 /*---------------
  * Element Types
  *---------------
@@ -104,7 +155,7 @@ enum z_var_type
  *            to_int_elem_type routines
  * in userd_read.c
  *----------------------------------------*/
-#if (defined USERD_API_100 || defined USERD_API_200) && defined DO_READER
+#if (defined USERD_API_100 || defined USERD_API_200)
 enum z_elem_types {
   Z_POINT,         /* 00:  1 node point element */
   Z_BAR02,         /* 01:  2 node bar           */
@@ -124,7 +175,7 @@ enum z_elem_types {
   Z_MAXTYPE
 };
 
-#elif defined USERD_API_201 && defined DO_READER
+#elif defined USERD_API_201
 enum z_elem_types {
   Z_POINT,         /* 00:  1 node point element              */
   Z_G_POINT,       /* 01:  1 node point element (ghost call) */
@@ -265,17 +316,97 @@ enum  z_material_file_index
   Z_MAT_INDEX,
   Z_MIX_INDEX,
   Z_MIX_VALUE,
+  Z_SPE_VALUE,
   Z_NUM_MAT_FILES
 };
 
+/*-------------------------------------------
+ *  Material type enum
+ *
+ * (Must be comparable to matset_via_file_type
+ *  in mat_defs.h of EnSight server)
+ *--------------------------------------------*/
+enum  z_matset_via_file_type
+{
+  Z_MISET_VIA_SPARSE_MIX,  /* Original method prior to 07Feb07:mel*/
+  Z_MISET_VIA_ESCAL_VARS,  /* Materials via element scalar variables*/
+  Z_MISET_VIA_MAX_FTYPES
+};
+
+
+/* ---------------------------------------
+ *  Extra GUI size stuff
+ *  _EGS
+ *  This is the maximum number of
+ *  Extra GUI items that you are
+ *  allowed of each type.
+ *
+ *  Don't change these values!
+ * ------------------------------------- */
+#define Z_MAX_NUM_GUI_PULL_ITEMS 20 /* max num GUI pulldowns */
+#define Z_LEN_GUI_PULL_STR    80    /* max length of GUI pulldown string */
+#define Z_LEN_GUI_FIELD_STR  256    /* max length of field string */
+#define Z_LEN_GUI_TITLE_STR   40    /* max length of title string */
+
+/* ---------------------------------------
+ *  Extra data function defines (for "target")
+ *
+ *  Don't change these values!
+ * ------------------------------------- */
+#define DATA_TARGET_NONE               0
+#define DATA_TARGET_SERVER             1
+#define DATA_TARGET_SOS                2
+#define DATA_TARGET_CLIENT             3
+#define DATA_TARGET_PYTHON    0x10000000
+#define DATA_TARGET_CMDLANG   0x20000000
+#define DATA_TARGET_UNDEF_VAL 0x40000000
+#define DATA_TARGET_OTHER     0x00000000
+#define DATA_TARGET_MASK      0x0000000f
+
+/* ---------------------------------------
+ *  Failed elemenet enums
+ * --------------------------------------- */
+
+enum z_element_failure_criteria
+{
+  Z_ELE_FAILED_NONE,
+  Z_ELE_FAILED_GREATER,
+  Z_ELE_FAILED_LESS,
+  Z_ELE_FAILED_EQUAL,
+  Z_ELE_FAILED_NOT_EQUAL,
+  Z_ELE_FAILED_MANY
+};
+
+
+enum z_element_failure_logic
+{
+  Z_ELE_FAILED_LOGIC_NONE,
+  Z_ELE_FAILED_LOGIC_AND,
+  Z_ELE_FAILED_LOGIC_OR,
+  Z_ELE_FAILED_LOGIC_MANY
+};
 
 /*----------------------------------------------------------
- * For readers, we need to include the prototype header file
+ * We include the prototype header file
  *----------------------------------------------------------*/
-#if defined DO_READER
 #include "global_extern_proto.h"
-#endif
      
+/* ---------------------
+ * export the file pointer  if windows
+ *   because windows can't open a file in the
+ *   server and pass the FILE * pointer properly.
+ * --------------------- */
+#ifdef WIN32
+typedef struct _USERD_globals_struct {
+   char arch_filename[256];
+   unsigned long arch_fileptr;
+} _USERD_globals;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
 /*--------------------------------------------------------------------*/
 #endif /*GLOBAL_EXTERN_H*/
 
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/global_extern_proto.h b/applications/utilities/postProcessing/graphics/ensightFoamReader/global_extern_proto.h
index 6a08f5a67f..e64a466230 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/global_extern_proto.h
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/global_extern_proto.h
@@ -21,6 +21,8 @@
 #ifndef GLOBAL_EXTERN_PROTO_H
 #define GLOBAL_EXTERN_PROTO_H
 
+#include <stdio.h>
+
 #ifdef WIN32
 #define W32IMPORT __declspec( dllimport )
 #define W32EXPORT __declspec( dllexport )
@@ -32,67 +34,260 @@
 /*----------------------
  * Same in All Versions
  *----------------------*/
-W32IMPORT int
+W32EXPORT int
 USERD_get_number_of_model_parts( void );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_block_coords_by_component(int block_number,
                                     int which_component,
                                     float *coord_array);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_block_iblanking(int block_number,
                           int *iblank_array);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_block_scalar_values(int block_number,
                               int which_scalar,
                               float *scalar_array);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_block_vector_values_by_component(int block_number,
                                            int which_vector,
                                            int which_component,
                                            float *vector_array);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_name_of_reader(char reader_name[Z_MAX_USERD_NAME],
                          int *two_fields);
+
+/*
+ * This mechanism is used to mark the fact that a given 
+ * reader cannot be unloaded.  We set this by default for
+ * C++ based readers as there are known issues with unloading
+ * a C++ DLL on certain platforms (Linux).
+ */
+W32EXPORT int
+USERD_reader_unloadable(void);
+
+#ifdef __cplusplus
+/*
+ * Define a macro that defines the cpp function as part of the 
+ * USERD_get_name_of_reader declaration
+ */
+#ifndef NO_AUTO_UNLOADABLE_CODE
+
+#if defined(LINUX) || defined(SGI)
+
+#define USERD_get_name_of_reader \
+  USERD_reader_unloadable(void) { return(0); } \
+int USERD_get_name_of_reader
+
+#endif
+
+#endif
+
+#endif
      
-W32IMPORT int
+W32EXPORT int
 USERD_get_reader_descrip(char descrip[Z_MAXFILENP]);
 
-W32IMPORT int
+W32EXPORT int
 USERD_set_filenames(char filename_1[],
                     char filename_2[],
                     char the_path[],
                     int swapbytes);
      
-W32IMPORT int
+W32EXPORT int
 USERD_get_number_of_files_in_dataset( void );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_dataset_query_file_info(Z_QFILES *qfiles);
      
-W32IMPORT int
+W32EXPORT int
 USERD_get_changing_geometry_status( void );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_node_label_status( void );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_element_label_status( void );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_number_of_variables( void );
 
-W32IMPORT void
+W32EXPORT void
 USERD_stop_part_building( void );
 
-W32IMPORT int
+W32EXPORT int
 USERD_bkup(FILE *archive_file,
            int backup_type);
 
+/* -----------------------------------
+ *   Optional routine allows getting data
+ *      from the reader to modify server/client behavior
+ * ------------------------------------ */
+W32EXPORT int
+USERD_get_extra_data(int *target,
+      int *nints, int *nflts, int *nchrs,
+      int *pints, float *pflts, char *pchrs);
+
+/* ----------------------------
+ *  Extra "Before" GUI stuff available for all versions of API
+ *  Note: this API suite is entirely optional...
+ * --------------------------- */
+W32EXPORT void USERD_get_extra_gui_numbers(
+	 int *num_Toggles,
+	 int *num_pulldowns,
+	 int *num_fields
+);
+
+W32EXPORT int USERD_get_extra_gui_defaults(
+	 char **toggle_Title,             /* [num_toggles][Z_LEN_GUI_TITLE_STR] */
+	 int *toggle_default_status,      /* [num_toggles] */
+	 char **pulldown_Title,           /* [num_pulldowns][Z_LEN_GUI_TITLE_STR] */
+	 int *pulldown_number_in_list,    /* [num_pulldowns] */
+	 int *pulldown_default_selection, /* [num_pulldowns] */
+	 char ***pulldown_item_strings,   /* [num_pulldowns][Z_MAX_NUM_GUI_PULL_ITEMS][Z_LEN_GUI_PULL_STR] */
+	 char **field_Title,              /* [num_fields][Z_LEN_GUI_TITLE_STR] */
+	 char **field_user_string         /* [num_fields][Z_LEN_GUI_FIELD_STR] */
+);
+
+W32EXPORT void USERD_set_extra_gui_data( 
+		  int *toggle,            /* [num_toggle] */
+                  int *pulldown,          /* [num_pulldown] */
+                  char **field_text       /* [num_fields][Z_LEN_GUI_FIELD_STR] */ 
+);
+
+/* ----------------------------
+ *  Extra "After" GUI stuff available for all versions of API
+ *  Note: this API suite is entirely optional...
+ * --------------------------- */
+W32EXPORT void USERD_get_var_extract_gui_numbers(
+	 int *num_Toggles,
+	 int *num_pulldowns,
+	 int *num_fields
+);
+
+W32EXPORT int USERD_get_var_extract_gui_defaults(
+	 char **toggle_Title,             /* [num_toggles][Z_LEN_GUI_TITLE_STR] */
+	 int *toggle_default_status,      /* [num_toggles] */
+	 char **pulldown_Title,           /* [num_pulldowns][Z_LEN_GUI_TITLE_STR] */
+	 int *pulldown_number_in_list,    /* [num_pulldowns] */
+	 int *pulldown_default_selection, /* [num_pulldowns] */
+	 char ***pulldown_item_strings,   /* [num_pulldowns][Z_MAX_NUM_GUI_PULL_ITEMS][Z_LEN_GUI_PULL_STR] */
+	 char **field_Title,              /* [num_fields][Z_LEN_GUI_TITLE_STR] */
+	 char **field_user_string         /* [num_fields][Z_LEN_GUI_FIELD_STR] */
+);
+
+W32EXPORT void USERD_set_var_extract_gui_data( 
+		  int *toggle,            /* [num_toggle] */
+                  int *pulldown,          /* [num_pulldown] */
+                  char **field_text       /* [num_fields][Z_LEN_GUI_FIELD_STR] */ );
+
+/* --------------------
+ * xy-query data routines
+ * -------------------- */
+W32EXPORT int USERD_get_num_xy_queries(void);
+
+W32EXPORT int USERD_get_xy_query_info(
+	int query_num,
+	char *query_name,
+	char *query_xtitle,
+	char *query_ytitle,
+	int *query_num_pairs);
+
+W32EXPORT int USERD_get_xy_query_data(
+        int query_num,
+	int num_vals,
+	float *x_vals,
+	float *y_vals);
+
+
+/* This routine added so the reader can know if we are at the "right" side of
+ * an interval - namely, interpolation between steps is being done in EnSight
+ * (It can be in any version of EnSight)
+ *----------------------------------------------------------------------------*/
+W32EXPORT void
+USERD_set_right_side( void );
+
+/*---------------------------------------------
+ * Routines that get the geometry in buffers,
+ * used for Unstructured Auto Distribute
+ * (Optional)
+ *---------------------------------------------*/
+W32EXPORT int
+USERD_get_part_coords_in_buffers(int part_number,
+                                 float **coord_array,
+                                 int first,
+                                 int n_beg,
+                                 int n_end,
+                                 int buffer_size,
+                                 int *num_returned);
+
+W32EXPORT int
+USERD_get_part_node_ids_in_buffers(int part_number,
+                                   int *nodeid_array,
+                                   int first,
+                                   int n_beg,
+                                   int n_end,
+                                   int buffer_size,
+                                   int *num_returned);
+
+W32EXPORT int
+USERD_get_part_elements_by_type_in_buffers(int part_number,
+                                           int element_type,
+                                           int **conn_array,
+                                           int first,
+                                           int e_beg,
+                                           int e_end,
+                                           int buffer_size,
+                                           int *num_returned);
+
+W32EXPORT int
+USERD_get_part_element_ids_by_type_in_buffers(int part_number,
+                                              int element_type,
+                                              int *elemid_array,
+                                              int first,
+                                              int e_beg,
+                                              int e_end,
+                                              int buffer_size,
+                                              int *num_returned);
+W32EXPORT int
+USERD_get_var_by_component_in_buffers(int which_variable,
+                                      int which_part,
+                                      int var_type,
+                                      int which_type,
+                                      int imag_data,
+                                      int component,
+                                      float *var_array,
+                                      int first,
+                                      int ne_beg,
+                                      int ne_end,
+                                      int buffer_size,
+                                      int leftside,
+                                      int *num_returned);
+
+W32EXPORT int
+USERD_get_nsided_conn_in_buffers(int part_number,
+                                 int *num_nodes_per_elem_array,
+                                 int *nsided_conn_array,
+                                 int first,
+                                 int e_beg,
+                                 int e_end,
+                                 int buffer_size,
+                                 int *num_returned);
+
+W32EXPORT int
+USERD_get_nfaced_conn_in_buffers(int part_number,
+                                 int *nfaced_fpe_arrray,
+                                 int *nfaced_npf_arrray,
+                                 int *nfaced_conn_array,
+                                 int first,
+                                 int e_beg,
+                                 int e_end,
+                                 int buffer_size,
+                                 int *num_returned);
 
 
 /*-----------------------
@@ -100,30 +295,30 @@ USERD_bkup(FILE *archive_file,
  *-----------------------*/
 #if defined USERD_API_100
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_number_of_global_nodes( void );
      
-W32IMPORT int
+W32EXPORT int
 USERD_get_global_coords(CRD *coord_array);
      
-W32IMPORT int
+W32EXPORT int
 USERD_get_global_node_ids(int *nodeid_array);
      
-W32IMPORT int
+W32EXPORT int
 USERD_get_element_connectivities_for_part(int part_number,
                                           int **conn_array[Z_MAXTYPE]);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_element_ids_for_part(int part_number,
                                int *elemid_array[Z_MAXTYPE]);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_vector_values(int which_vector,
                         int which_part,
                         int which_type,
                         float *vector_array);
      
-W32IMPORT int
+W32EXPORT int
 USERD_get_part_build_info(int *part_id,
                           int *part_types,
                           char *part_descriptions[Z_BUFL],
@@ -131,25 +326,25 @@ USERD_get_part_build_info(int *part_id,
                           int *ijk_dimensions[3],
                           int *iblanking_options[6]);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_scalar_values(int which_scalar,
                         int which_part,
                         int which_type,
                         float *scalar_array);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_variable_info(char **var_description,
                         char **var_filename,
                         int *var_type,
                         int *var_classify);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_description_lines(int which_type,
                             int which_var,
                             char line1[Z_BUFL],
                             char line2[Z_BUFL]);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_variable_value_at_specific(int which_var,
                                      int which_node_or_elem,
                                      int which_part,
@@ -157,15 +352,15 @@ USERD_get_variable_value_at_specific(int which_var,
                                      int time_step,
                                      float values[3]);
 
-W32IMPORT float
+W32EXPORT float
 USERD_get_constant_value(int which_var);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_solution_times(float *solution_times);
-W32IMPORT void
+W32EXPORT void
 USERD_set_time_step(int time_step);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_number_of_time_steps(void);
 
 #endif
@@ -176,30 +371,30 @@ USERD_get_number_of_time_steps(void);
  *----------------------*/
 #if !defined USERD_API_100
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_part_coords(int part_number,
                       float **coord_array);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_part_node_ids(int part_number,
                         int *nodeid_array);
      
-W32IMPORT int
+W32EXPORT int
 USERD_get_part_elements_by_type(int part_number,
                                 int element_type,
                                 int **conn_array);
-W32IMPORT int
+W32EXPORT int
 USERD_get_part_element_ids_by_type(int part_number,
                                    int element_type,
                                    int *elemid_array);
      
-W32IMPORT int
+W32EXPORT int
 USERD_get_reader_version(char version_number[Z_MAX_USERD_NAME]);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_reader_release(char version_number[Z_MAX_USERD_NAME]);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_var_by_component(int which_variable,
                            int which_part,
                            int var_type,
@@ -208,15 +403,15 @@ USERD_get_var_by_component(int which_variable,
                            int component,
                            float *var_array);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_maxsize_info(int *max_number_of_nodes,
                        int *max_number_of_elements[Z_MAXTYPE],
                        int *max_ijk_dimensions[3]);
 
-W32IMPORT void
+W32EXPORT void
 USERD_exit_routine( void );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_gold_variable_info(char **var_description,
                              char **var_filename,
                              int *var_type,
@@ -226,17 +421,17 @@ USERD_get_gold_variable_info(char **var_description,
                              float *var_freq,
                              int *var_contran,
                              int *var_timeset);
-W32IMPORT int
+W32EXPORT int
 USERD_get_model_extents( float extents[6] );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_descrip_lines(int which_type,
                         int which_var,
                         int imag_data,
                         char line1[Z_BUFL],
                         char line2[Z_BUFL]);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_var_value_at_specific(int which_var,
                                 int which_node_or_elem,
                                 int which_part,
@@ -245,40 +440,40 @@ USERD_get_var_value_at_specific(int which_var,
                                 float values[3],
                                 int imag_data);
 
-W32IMPORT float
+W32EXPORT float
 USERD_get_constant_val(int which_var, int imag_data);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_geom_timeset_number(void);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_number_of_timesets(void);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_timeset_description(int timeset_number,
                               char timeset_description[Z_BUFL]);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_sol_times(int timeset_number,
                     float *solution_times);
-W32IMPORT void
+W32EXPORT void
 USERD_set_time_set_and_step(int timeset_number,
                             int time_step);
-W32IMPORT int
+W32EXPORT int
 USERD_get_num_of_time_steps(int timeset_number);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_border_availability(int part_number,
                               int number_of_elements[Z_MAXTYPE]);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_border_elements_by_type(int part_number,
                                   int element_type,
                                   int **conn_array,
                                   short *parent_element_type,
                                   int *parent_element_num);
 
-W32IMPORT void
+W32EXPORT void
 USERD_set_server_number(int serv_num,
                         int tot_servs);
 
@@ -288,14 +483,14 @@ USERD_set_server_number(int serv_num,
 /*----------------------
  * New For Version 2.010
  *----------------------*/
-#if defined USERD_API_201 || defined USERD_API_202 || defined USERD_API_203
-W32IMPORT int
+#if defined USERD_API_201 || defined USERD_API_202 || defined USERD_API_203 || defined USERD_API_204 || defined USERD_API_205 || defined USERD_API_206 || defined USERD_API_207 || defined USERD_API_208 || defined USERD_API_209 || defined USERD_API_210
+W32EXPORT int
 USERD_get_ghosts_in_model_flag( void );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_ghosts_in_block_flag(int block_number);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_block_ghost_flags(int block_number,
                             int *ghost_flags);
 #endif
@@ -303,9 +498,9 @@ USERD_get_block_ghost_flags(int block_number,
 /*--------------------------
  * Modified at Version 2.030
  *--------------------------*/
-#if defined USERD_API_201 || defined USERD_API_202
+#if defined USERD_API_200 || defined USERD_API_201 || defined USERD_API_202 
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_gold_part_build_info(int *part_id,
                                int *part_types,
                                char *part_descriptions[Z_BUFL],
@@ -315,8 +510,8 @@ USERD_get_gold_part_build_info(int *part_id,
                                int *iblanking_options[6]);
 #endif
 
-#if defined USERD_API_203
-W32IMPORT int
+#if defined USERD_API_203 || defined USERD_API_204 || defined USERD_API_205 || defined USERD_API_206 || defined USERD_API_207 || defined USERD_API_208 || defined USERD_API_209 || defined USERD_API_210
+W32EXPORT int
 USERD_get_gold_part_build_info(int *part_id,
                                int *part_types,
                                char *part_descriptions[Z_BUFL],
@@ -330,30 +525,30 @@ USERD_get_gold_part_build_info(int *part_id,
 /*----------------------
  * New For Version 2.030
  *----------------------*/
-#if defined USERD_API_203
-W32IMPORT int
+#if defined USERD_API_203 || defined USERD_API_204 || defined USERD_API_205 || defined USERD_API_206 || defined USERD_API_207 || defined USERD_API_208 || defined USERD_API_209 || defined USERD_API_210
+W32EXPORT int
 USERD_get_number_of_material_sets( void );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_matf_set_info(int *mat_set_ids,
                         char **mat_set_name);
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_number_of_materials( int set_index );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_matf_var_info(int set_index,
                         int *mat_ids,
                         char **mat_desc);
 
-W32IMPORT int
+W32EXPORT int
 USERD_size_matf_data(int set_index,
                      int part_id,
                      int wtyp,
                      int mat_type,
                      int *matf_size );
 
-W32IMPORT int
+W32EXPORT int
 USERD_load_matf_data( int set_index,
                       int part_id,
                       int wtyp,
@@ -361,22 +556,180 @@ USERD_load_matf_data( int set_index,
                       int *ids_list,
                       float *val_list );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_nsided_conn( int part_number,
                        int *nsided_conn_array );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_nfaced_nodes_per_face( int part_number,
                                  int *nfaced_npf_array );
 
-W32IMPORT int
+W32EXPORT int
 USERD_get_nfaced_conn( int part_number,
                        int *nfaced_conn_array );
 
+#endif
+
+/*----------------------
+ * New For Version 2.040
+ *----------------------*/
+#if defined USERD_API_204 || defined USERD_API_205 || defined USERD_API_206 || defined USERD_API_207 || defined USERD_API_208 || defined USERD_API_209 || defined USERD_API_210
+
+W32EXPORT int
+USERD_get_uns_failed_params(
+                char *fail_var_name,           /* variable name to be used in failure
+                                            must be scalar, per elem      */
+                float *threshold_val1,     /* number to compare for failure */
+                float *threshold_val2,     /* number to compare for failure */
+                int *threshold_operator1,   /* Z_GREATER_THAN, Z_LESS_THAN,
+                                            Z_EQUAL_TO */
+                int *threshold_operator2,   /* Z_GREATER_THAN, Z_LESS_THAN,
+                                            Z_EQUAL_TO */
+		int *logic_criteria2
+
+		);
 
 #endif
 
+/*----------------------
+** New For Version 2.050
+**----------------------*/
+#if defined USERD_API_205 || defined USERD_API_206 || defined USERD_API_207 || defined USERD_API_208 || defined USERD_API_209 || defined USERD_API_210
+
+W32EXPORT int
+USERD_get_number_of_species( int set_index );
+
+W32EXPORT int
+USERD_get_matsp_info(int    set_index,
+                      int   *sp_ids,
+                      char **sp_desc,
+                      int   *sppermatcnt,
+                      int   *sppermatlis);
+
+W32EXPORT int
+USERD_rigidbody_existence( void );
+
+#endif
+
+/*--------------------------------------------
+ * New at 2.05, but modified for Version 2.080
+ *-------------------------------------------- */
+#if defined USERD_API_205 || defined USERD_API_206 || defined USERD_API_207
+W32EXPORT int
+USERD_rigidbody_values(int part_number,
+                       float values[10]);
+#endif
+
+#if defined USERD_API_208 || defined USERD_API_209 || defined USERD_API_210
+W32EXPORT int
+USERD_rigidbody_values(int part_number,
+                       float values[14]);
+#endif
+
+
+
+
+/*----------------------
+** New For Version 2.060
+**----------------------*/
+#if defined USERD_API_206 || defined USERD_API_207 || defined USERD_API_208 || defined USERD_API_209 || defined USERD_API_210
+
+W32EXPORT int
+USERD_get_structured_reader_cinching( void );
+
+W32EXPORT int
+USERD_set_block_range_and_stride(int file_pn,
+                                 int mini, int maxi, int stepi,
+                                 int minj, int maxj, int stepj,
+                                 int mink, int maxk, int stepk);
+#endif
      
+/*----------------------
+** New For Version 2.070
+**----------------------*/
+#if defined USERD_API_207 || defined USERD_API_208 || defined USERD_API_209 || defined USERD_API_210
+
+/* non-optional functions go here */
+
+#endif
+
+/* This is optional; defaults to 'Set file' and 'Set results' if not
+ * defined.  If 'two_fields' is true, then both labels must have a
+ * non-NULL string otherwise the defaults will be used.
+ */
+W32EXPORT void
+USERD_set_filename_button_labels(char filename_label_1[Z_MAX_USERD_NAME],
+                                 char filename_label_2[Z_MAX_USERD_NAME]);
+
+/* This is optional; defaults to TRUE if not defined. */
+W32EXPORT int
+USERD_prefer_auto_distribute(void);
+
+
+
+/*----------------------
+** New For Version 2.090
+**----------------------*/
+#if defined USERD_API_209 || defined USERD_API_210
+
+/* non-optional functions go here */
+
+#endif
+
+/* These are optional */
+W32EXPORT int
+USERD_get_vglyph_counts(int *num_vglyph_vectors,
+                        int *num_vglyph_timelines);
+
+W32EXPORT int
+USERD_get_vglyph_timeline_info(int vtl,
+                               int *id,
+                               int *numtimes,
+                               int *before,
+                               int *amidst,
+                               int *after);
+
+W32EXPORT int
+USERD_get_vglyph_timeline_times(int vtl,
+                                float *times);
+
+W32EXPORT int
+USERD_get_vglyph_vector_info(int vg,
+                             int *id,
+                             char *description,
+                             int *type,
+                             int *time_condition,
+                             int *time_line,
+                             int *part,
+                             int *nidloc,
+                             int *eidloc);
+
+W32EXPORT int
+USERD_get_vglyph_vector_values(int vg,
+                               float **values);
+
+W32EXPORT int
+USERD_get_vglyph_vector_xyzloc(int vg,
+                               float **xyzloc);
+
+/*----------------------
+** New For Version 2.100
+**----------------------*/
+#if defined USERD_API_210
+
+W32EXPORT int
+USERD_get_mat_scalars_desc(int set_index,
+                           char **mesv_desc);
+#endif
+
+/* These are optional */
+W32EXPORT int
+USERD_get_matf_set_type(int set_index);
+
+/* special, optional functions */
+W32EXPORT void 
+USERD_reset_routine(void);
+
 /*--------------------------------------------------------------------*/
 #endif /*GLOBAL_EXTERN_PROTO_H*/
 
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C b/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C
index 0a48995579..e65381a637 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C
@@ -52,6 +52,7 @@ Description
 extern "C"
 {
 
+#include "USERD_API.H"
 #include "global_extern.h"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -104,6 +105,7 @@ extern "C"
 #include "USERD_exit_routine.H"
 #include "USERD_get_model_extents.H"
 #include "USERD_get_reader_version.H"
+#include "USERD_get_reader_release.H"
 #include "USERD_get_number_timesets.H"
 #include "USERD_get_timeset_description.H"
 #include "USERD_get_geom_timeset_number.H"
@@ -130,7 +132,7 @@ extern "C"
 
 //**********************************************************************
 //======================================================================
-// STRUCTURED DATA STUFF - not used in foam
+// STRUCTURED DATA STUFF - not used in OpenFOAM
 //======================================================================
 //**********************************************************************
 
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/Make/options b/applications/utilities/postProcessing/graphics/fieldview9Reader/Make/options
index b21a3eef2d..1303d319af 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/Make/options
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/Make/options
@@ -99,4 +99,5 @@ EXE_INC = \
 EXE_LIBS = \
     $(FV_LIBS) \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lmeshTools
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
index 1adeeefa12..a61c912ba0 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
@@ -4,4 +4,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -llagrangian
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
index fe46b10d13..66477ecd8e 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
@@ -15,4 +15,5 @@ EXE_LIBS = \
     -lspecie \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/Make/options b/applications/utilities/postProcessing/miscellaneous/postChannel/Make/options
index b90b6fdd4e..c5e4b6238b 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/Make/options
@@ -6,4 +6,5 @@ EXE_INC = \
 EXE_LIBS = \
     -lmeshTools \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lsampling
diff --git a/applications/utilities/postProcessing/miscellaneous/ptot/Make/options b/applications/utilities/postProcessing/miscellaneous/ptot/Make/options
index fa15f12452..16eb624bec 100644
--- a/applications/utilities/postProcessing/miscellaneous/ptot/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/ptot/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/miscellaneous/wdot/Make/options b/applications/utilities/postProcessing/miscellaneous/wdot/Make/options
index fa15f12452..16eb624bec 100644
--- a/applications/utilities/postProcessing/miscellaneous/wdot/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/wdot/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/patch/patchAverage/Make/options b/applications/utilities/postProcessing/patch/patchAverage/Make/options
index fa15f12452..16eb624bec 100644
--- a/applications/utilities/postProcessing/patch/patchAverage/Make/options
+++ b/applications/utilities/postProcessing/patch/patchAverage/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/patch/patchIntegrate/Make/options b/applications/utilities/postProcessing/patch/patchIntegrate/Make/options
index fa15f12452..16eb624bec 100644
--- a/applications/utilities/postProcessing/patch/patchIntegrate/Make/options
+++ b/applications/utilities/postProcessing/patch/patchIntegrate/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/sampling/probeLocations/Make/options b/applications/utilities/postProcessing/sampling/probeLocations/Make/options
index 04b22c08a4..44392ffc44 100644
--- a/applications/utilities/postProcessing/sampling/probeLocations/Make/options
+++ b/applications/utilities/postProcessing/sampling/probeLocations/Make/options
@@ -7,6 +7,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lmeshTools \
     -lsampling \
     -ltriSurface \
diff --git a/applications/utilities/postProcessing/sampling/sample/Make/options b/applications/utilities/postProcessing/sampling/sample/Make/options
index ae583f3388..4877a53003 100644
--- a/applications/utilities/postProcessing/sampling/sample/Make/options
+++ b/applications/utilities/postProcessing/sampling/sample/Make/options
@@ -8,6 +8,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lmeshTools \
     -lsampling \
     -lsurfMesh \
diff --git a/applications/utilities/postProcessing/scalarField/pPrime2/Make/options b/applications/utilities/postProcessing/scalarField/pPrime2/Make/options
index fa15f12452..02fc4c17b1 100644
--- a/applications/utilities/postProcessing/scalarField/pPrime2/Make/options
+++ b/applications/utilities/postProcessing/scalarField/pPrime2/Make/options
@@ -2,4 +2,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
+
diff --git a/applications/utilities/postProcessing/stressField/stressComponents/Make/options b/applications/utilities/postProcessing/stressField/stressComponents/Make/options
index be60a20b9f..d1016e9d4d 100644
--- a/applications/utilities/postProcessing/stressField/stressComponents/Make/options
+++ b/applications/utilities/postProcessing/stressField/stressComponents/Make/options
@@ -5,5 +5,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lincompressibleRASModels \
     -lincompressibleTransportModels
diff --git a/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C b/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
index aa26a0e0c0..fcf090caa8 100644
--- a/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
+++ b/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
                     mesh,
                     IOobject::NO_READ
                 ),
-                sigma.component(tensor::XX)
+                sigma.component(symmTensor::XX)
             );
             sigmaxx.write();
 
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
                     mesh,
                     IOobject::NO_READ
                 ),
-                sigma.component(tensor::YY)
+                sigma.component(symmTensor::YY)
             );
             sigmayy.write();
 
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
                     mesh,
                     IOobject::NO_READ
                 ),
-                sigma.component(tensor::ZZ)
+                sigma.component(symmTensor::ZZ)
             );
             sigmazz.write();
 
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
                     mesh,
                     IOobject::NO_READ
                 ),
-                sigma.component(tensor::XY)
+                sigma.component(symmTensor::XY)
             );
             sigmaxy.write();
 
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
                     mesh,
                     IOobject::NO_READ
                 ),
-                sigma.component(tensor::XZ)
+                sigma.component(symmTensor::XZ)
             );
             sigmaxz.write();
 
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
                     mesh,
                     IOobject::NO_READ
                 ),
-                sigma.component(tensor::YZ)
+                sigma.component(symmTensor::YZ)
             );
             sigmayz.write();
 
@@ -190,7 +190,7 @@ int main(int argc, char *argv[])
                     mesh,
                     IOobject::NO_READ
                 ),
-                0.0*sigma.component(tensor::YZ)
+                0.0*sigma.component(symmTensor::YZ)
             );
 
             forAll(sigmaUn.boundaryField(), patchI)
diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options
index 5e71b80afa..0bab1a4e41 100644
--- a/applications/utilities/postProcessing/turbulence/R/Make/options
+++ b/applications/utilities/postProcessing/turbulence/R/Make/options
@@ -7,4 +7,5 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
index a524a0aae5..8862565863 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
@@ -7,4 +7,5 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
-    -lfiniteVolume
\ No newline at end of file
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/velocityField/Co/Make/options b/applications/utilities/postProcessing/velocityField/Co/Make/options
index 7bd0a2d1e0..9103ae90ec 100644
--- a/applications/utilities/postProcessing/velocityField/Co/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Co/Make/options
@@ -1,7 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/postProcessing/postCalc \
-    -I$(LIB_SRC)/finiteVolume/lnInclude 
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
-    -lfiniteVolume 
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/velocityField/Lambda2/Make/options b/applications/utilities/postProcessing/velocityField/Lambda2/Make/options
index cbe51627f2..9103ae90ec 100644
--- a/applications/utilities/postProcessing/velocityField/Lambda2/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Lambda2/Make/options
@@ -4,4 +4,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Make/options b/applications/utilities/postProcessing/velocityField/Mach/Make/options
index 132e3be94a..c9733e397a 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Mach/Make/options
@@ -6,5 +6,6 @@ EXE_INC = \
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lbasicThermophysicalModels \
     -lspecie
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options
index aa00dc2b59..7675f43a75 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options
@@ -18,4 +18,5 @@ EXE_LIBS = \
     -lcompressibleRASModels \
     -lcompressibleLESModels \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lmeshTools
diff --git a/applications/utilities/postProcessing/velocityField/Q/Make/options b/applications/utilities/postProcessing/velocityField/Q/Make/options
index cbe51627f2..9103ae90ec 100644
--- a/applications/utilities/postProcessing/velocityField/Q/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Q/Make/options
@@ -4,4 +4,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/velocityField/enstrophy/Make/options b/applications/utilities/postProcessing/velocityField/enstrophy/Make/options
index cbe51627f2..9103ae90ec 100644
--- a/applications/utilities/postProcessing/velocityField/enstrophy/Make/options
+++ b/applications/utilities/postProcessing/velocityField/enstrophy/Make/options
@@ -4,4 +4,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/velocityField/flowType/Make/options b/applications/utilities/postProcessing/velocityField/flowType/Make/options
index cbe51627f2..9103ae90ec 100644
--- a/applications/utilities/postProcessing/velocityField/flowType/Make/options
+++ b/applications/utilities/postProcessing/velocityField/flowType/Make/options
@@ -4,4 +4,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/Make/options b/applications/utilities/postProcessing/velocityField/streamFunction/Make/options
index fa15f12452..16eb624bec 100644
--- a/applications/utilities/postProcessing/velocityField/streamFunction/Make/options
+++ b/applications/utilities/postProcessing/velocityField/streamFunction/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/velocityField/uprime/Make/options b/applications/utilities/postProcessing/velocityField/uprime/Make/options
index cbe51627f2..9103ae90ec 100644
--- a/applications/utilities/postProcessing/velocityField/uprime/Make/options
+++ b/applications/utilities/postProcessing/velocityField/uprime/Make/options
@@ -4,4 +4,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/velocityField/vorticity/Make/options b/applications/utilities/postProcessing/velocityField/vorticity/Make/options
index cbe51627f2..35db088457 100644
--- a/applications/utilities/postProcessing/velocityField/vorticity/Make/options
+++ b/applications/utilities/postProcessing/velocityField/vorticity/Make/options
@@ -4,4 +4,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
+
diff --git a/applications/utilities/postProcessing/wall/wallGradU/Make/options b/applications/utilities/postProcessing/wall/wallGradU/Make/options
index fa15f12452..16eb624bec 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/Make/options
+++ b/applications/utilities/postProcessing/wall/wallGradU/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
index 8cdfe23fd1..4d244f56ba 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options
@@ -10,5 +10,6 @@ EXE_LIBS = \
     -lcompressibleRASModels \
     -lreactionThermophysicalModels \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lspecie \
     -lbasicThermophysicalModels
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
index 89632547e0..8862565863 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options
+++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
@@ -7,4 +7,5 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/Make/options b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
index f6131ce41c..d7446846b0 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
@@ -9,4 +9,5 @@ EXE_INC = \
 EXE_LIBS = \
     -lincompressibleLESModels \
     -lincompressibleTransportModels \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
index 459989eb9d..888f9e440e 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
@@ -14,5 +14,6 @@ EXE_LIBS = \
     -lspecie \
     -lcompressibleRASModels \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lmeshTools \
     -lsampling
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
index 91197141ef..a11404646c 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
@@ -38,11 +38,11 @@ Description
 
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
 #include "incompressible/RAS/RASModel/RASModel.H"
-#include "nutWallFunction/nutWallFunctionFvPatchScalarField.H"
+#include "nutkWallFunction/nutkWallFunctionFvPatchScalarField.H"
 
 #include "basicPsiThermo.H"
 #include "compressible/RAS/RASModel/RASModel.H"
-#include "mutWallFunction/mutWallFunctionFvPatchScalarField.H"
+#include "mutkWallFunction/mutkWallFunctionFvPatchScalarField.H"
 
 #include "wallDist.H"
 
@@ -56,7 +56,7 @@ void calcIncompressibleYPlus
     volScalarField& yPlus
 )
 {
-    typedef incompressible::RASModels::nutWallFunctionFvPatchScalarField
+    typedef incompressible::RASModels::nutkWallFunctionFvPatchScalarField
         wallFunctionPatchField;
 
     #include "createPhi.H"
@@ -108,7 +108,7 @@ void calcCompressibleYPlus
     volScalarField& yPlus
 )
 {
-    typedef compressible::RASModels::mutWallFunctionFvPatchScalarField
+    typedef compressible::RASModels::mutkWallFunctionFvPatchScalarField
         wallFunctionPatchField;
 
     IOobject rhoHeader
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
index d27c95d033..06d42b6c3c 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options
@@ -4,4 +4,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lmeshTools
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 8aae7e124c..5714cccbff 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -41,6 +41,11 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// turbulence constants - file-scope
+static const scalar Cmu(0.09);
+static const scalar kappa(0.41);
+
+
 int main(int argc, char *argv[])
 {
     argList::validOptions.insert("ybl", "scalar");
@@ -48,7 +53,6 @@ int main(int argc, char *argv[])
     argList::validOptions.insert("writenut", "");
 
 #   include "setRootCase.H"
-
 #   include "createTime.H"
 #   include "createMesh.H"
 
@@ -117,10 +121,6 @@ int main(int argc, char *argv[])
     phi = fvc::interpolate(U) & mesh.Sf();
     phi.write();
 
-    // Set turbulence constants
-    dimensionedScalar kappa("kappa", dimless, 0.4187);
-    dimensionedScalar Cmu("Cmu", dimless, 0.09);
-
     // Read and modify turbulence fields if present
 
     IOobject epsilonHeader
@@ -182,11 +182,11 @@ int main(int argc, char *argv[])
         Info<< "Reading field epsilon\n" << endl;
         volScalarField epsilon(epsilonHeader, mesh);
 
-        scalar ck0 = ::pow(Cmu.value(), 0.25)*kappa.value();
+        scalar ck0 = ::pow(Cmu, 0.25)*kappa;
         k = sqr(nut/(ck0*min(y, ybl)));
         k.correctBoundaryConditions();
 
-        scalar ce0 = ::pow(Cmu.value(), 0.75)/kappa.value();
+        scalar ce0 = ::pow(Cmu, 0.75)/kappa;
         epsilon = ce0*k*sqrt(k)/min(y, ybl);
         epsilon.correctBoundaryConditions();
 
diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options
index 1d01ecc4c3..7a1f8e278d 100644
--- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options
+++ b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options
@@ -9,5 +9,5 @@ EXE_LIBS = \
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
-    -lfiniteVolume
-
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
index 166386c8e3..d9164987ff 100644
--- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
+++ b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
@@ -43,12 +43,12 @@ Description
 
 #include "incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H"
 #include "incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H"
-#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H"
+#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H"
 #include "incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H"
 
 #include "compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H"
 #include "compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H"
-#include "compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H"
+#include "compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H"
 #include "compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H"
 
 using namespace Foam;
@@ -190,13 +190,12 @@ void replaceBoundaryType
     const_cast<word&>(IOdictionary::typeName) = oldTypeName;
     const_cast<word&>(dict.type()) = dict.headerClassName();
 
-    // Make a backup of the old field
-    word backupName(dict.name() + ".old");
-    Info<< "    copying " << dict.name() << " to "
-        << backupName << endl;
-    IOdictionary dictOld = dict;
-    dictOld.rename(backupName);
-    dictOld.regIOobject::write();
+    // Make a backup of the old file
+    if (mvBak(dict.objectPath(), "old"))
+    {
+        Info<< "    Backup original file to "
+            << (dict.objectPath() + ".old") << endl;
+    }
 
     // Loop through boundary patches and update
     const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
@@ -234,7 +233,7 @@ void updateCompressibleCase(const fvMesh& mesh)
     (
         mesh,
         "mut",
-        compressible::RASModels::mutWallFunctionFvPatchScalarField::typeName,
+        compressible::RASModels::mutkWallFunctionFvPatchScalarField::typeName,
         "0"
     );
     replaceBoundaryType
@@ -286,7 +285,7 @@ void updateIncompressibleCase(const fvMesh& mesh)
     (
         mesh,
         "nut",
-        incompressible::RASModels::nutWallFunctionFvPatchScalarField::typeName,
+        incompressible::RASModels::nutkWallFunctionFvPatchScalarField::typeName,
         "0"
     );
     replaceBoundaryType
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 6ff9bbce18..e8e441b165 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -72,10 +72,12 @@ namespace Foam
 
 int main(int argc, char *argv[])
 {
-#   include "addRegionOption.H"
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createNamedMesh.H"
+    argList::validOptions.insert("instance", "instance");
+    #include "addRegionOption.H"
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createNamedMesh.H"
 
     fileName regionPrefix = "";
     if (regionName != fvMesh::defaultRegion)
@@ -83,6 +85,12 @@ int main(int argc, char *argv[])
         regionPrefix = regionName;
     }
 
+    word instance = runTime.timeName();
+    if (args.options().found("instance"))
+    {
+        instance = args.options()["instance"];
+    }
+
     // Get the replacement rules from a dictionary
     IOdictionary dict
     (
@@ -196,12 +204,13 @@ int main(int argc, char *argv[])
             Info<< "Loading dictionary " << fieldName << endl;
             const word oldTypeName = IOdictionary::typeName;
             const_cast<word&>(IOdictionary::typeName) = word::null;
+
             IOdictionary fieldDict
             (
                 IOobject
                 (
                     fieldName,
-                    runTime.timeName(),
+                    instance,
                     mesh,
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
diff --git a/applications/utilities/preProcessing/engineSwirl/Make/options b/applications/utilities/preProcessing/engineSwirl/Make/options
index 725122ea1d..02fc4c17b1 100644
--- a/applications/utilities/preProcessing/engineSwirl/Make/options
+++ b/applications/utilities/preProcessing/engineSwirl/Make/options
@@ -1,4 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
-EXE_LIBS = -lfiniteVolume
+EXE_LIBS = \
+    -lfiniteVolume \
+    -lgenericPatchFields
+
diff --git a/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C b/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C
index d2e7981c68..9c96a9a4c2 100644
--- a/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C
+++ b/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C
@@ -84,11 +84,12 @@ int main(int argc, char *argv[])
         }
         else
         {
-            mv
-            (
-                solutionDict.objectPath(),
-                solutionDict.objectPath() + ".old"
-            );
+            if (mvBak(solutionDict.objectPath(), "old"))
+            {
+                Info<< "Backup to    "
+                    << (solutionDict.objectPath() + ".old") << nl;
+            }
+
 
             solutionDict.writeObject
             (
@@ -97,8 +98,8 @@ int main(int argc, char *argv[])
                 IOstream::UNCOMPRESSED
             );
 
-            Info<< "Backup to    " << (solutionDict.objectPath() + ".old") << nl
-                << "Write  to    " << solutionDict.objectPath() << nl << endl;
+            Info<< "Write  to    "
+                << solutionDict.objectPath() << nl << endl;
         }
     }
 
diff --git a/applications/utilities/preProcessing/mapFields/Make/options b/applications/utilities/preProcessing/mapFields/Make/options
index 148fd04d48..7bd964094e 100644
--- a/applications/utilities/preProcessing/mapFields/Make/options
+++ b/applications/utilities/preProcessing/mapFields/Make/options
@@ -8,4 +8,5 @@ EXE_LIBS = \
     -lsampling \
     -lmeshTools \
     -llagrangian \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lgenericPatchFields
diff --git a/applications/utilities/preProcessing/setFields/Make/options b/applications/utilities/preProcessing/setFields/Make/options
index d27c95d033..06d42b6c3c 100644
--- a/applications/utilities/preProcessing/setFields/Make/options
+++ b/applications/utilities/preProcessing/setFields/Make/options
@@ -4,4 +4,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lgenericPatchFields \
     -lmeshTools
diff --git a/applications/utilities/surface/surfaceAdd/surfaceAdd.C b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
index 6441486cd1..587461d403 100644
--- a/applications/utilities/surface/surfaceAdd/surfaceAdd.C
+++ b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
@@ -158,45 +158,33 @@ int main(int argc, char *argv[])
 
 
         label trianglei = 0;
-        label maxRegion1 = labelMin;
 
         // Copy triangles1 into trianglesAll
-        // Determine max region.
-
         forAll(surface1, faceI)
         {
-            facesAll[trianglei] = surface1[faceI];
-
-            maxRegion1 = max(maxRegion1, facesAll[trianglei].region());
-
-            trianglei++;
+            facesAll[trianglei++] = surface1[faceI];
         }
+        label nRegions1 = surface1.patches().size();
 
-        label nRegions1 = maxRegion1 + 1;
 
         if (!mergeRegions)
         {
-            Info<< "Surface " << inFileName1 << " has " << nRegions1 << " regions"
+            Info<< "Surface " << inFileName1 << " has " << nRegions1
+                << " regions"
                 << nl
                 << "All region numbers in " << inFileName2 << " will be offset"
                 << " by this amount" << nl << endl;
         }
 
         // Add (renumbered) surface2 triangles
-        label maxRegion2 = labelMin;
-
         forAll(surface2, faceI)
         {
             const labelledTri& tri = surface2[faceI];
 
             labelledTri& destTri = facesAll[trianglei++];
-
             destTri[0] = tri[0] + points1.size();
             destTri[1] = tri[1] + points1.size();
             destTri[2] = tri[2] + points1.size();
-
-            maxRegion2  = max(maxRegion2, tri.region());
-
             if (mergeRegions)
             {
                 destTri.region() = tri.region();
@@ -207,7 +195,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        label nRegions2 = maxRegion2 + 1;
+        label nRegions2 = surface2.patches().size();
 
         geometricSurfacePatchList newPatches;
 
@@ -218,11 +206,11 @@ int main(int argc, char *argv[])
 
             forAll(surface1.patches(), patchI)
             {
-                newPatches[patchI] = surface1.patches()[ patchI];
+                newPatches[patchI] = surface1.patches()[patchI];
             }
             forAll(surface2.patches(), patchI)
             {
-                newPatches[patchI] = surface2.patches()[ patchI];
+                newPatches[patchI] = surface2.patches()[patchI];
             }
         }
         else
@@ -244,12 +232,12 @@ int main(int argc, char *argv[])
 
             forAll(surface1.patches(), patchI)
             {
-                newPatches[newPatchI++] = surface1.patches()[ patchI];
+                newPatches[newPatchI++] = surface1.patches()[patchI];
             }
 
             forAll(surface2.patches(), patchI)
             {
-                newPatches[newPatchI++] = surface2.patches()[ patchI];
+                newPatches[newPatchI++] = surface2.patches()[patchI];
             }
         }
 
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index 8608fe33af..c14771030f 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -157,14 +157,14 @@ void testSortedEdgeFaces(const triSurface& surf)
         {
             if (findIndex(sortMyFaces, myFaces[i]) == -1)
             {
-                FatalErrorIn("testSortedEdgeFaces") << abort(FatalError);
+                FatalErrorIn("testSortedEdgeFaces(..)") << abort(FatalError);
             }
         }
         forAll(sortMyFaces, i)
         {
             if (findIndex(myFaces, sortMyFaces[i]) == -1)
             {
-                FatalErrorIn("testSortedEdgeFaces") << abort(FatalError);
+                FatalErrorIn("testSortedEdgeFaces(..)") << abort(FatalError);
             }
         }
     }
@@ -304,7 +304,7 @@ label findEdge
     }
 
 
-    FatalErrorIn("findEdge") << "Cannot find edge with labels " << v0
+    FatalErrorIn("findEdge(..)") << "Cannot find edge with labels " << v0
         << ' ' << v1 << " in candidates " << edgeLabels
         << " with vertices:" << UIndirectList<edge>(surf.edges(), edgeLabels)()
         << abort(FatalError);
@@ -343,7 +343,7 @@ label otherEdge
         }
     }
 
-    FatalErrorIn("otherEdge") << "Cannot find other edge on face " << faceI
+    FatalErrorIn("otherEdge(..)") << "Cannot find other edge on face " << faceI
         << " verts:" << surf.localPoints()[faceI]
         << " connected to point " << pointI
         << " faceEdges:" << UIndirectList<edge>(surf.edges(), fEdges)()
@@ -409,7 +409,9 @@ void walkSplitLine
 
             if (eFaces.size() != 2)
             {
-                FatalErrorIn("walkSplitPoint") << abort(FatalError);
+                FatalErrorIn("walkSplitPoint(..)")
+                    << "Can only handle edges with 2 or 4 edges for now."
+                    << abort(FatalError);
             }
 
             if (eFaces[0] == faceI)
@@ -422,7 +424,7 @@ void walkSplitLine
             }
             else
             {
-                FatalErrorIn("walkSplitPoint") << abort(FatalError);
+                FatalErrorIn("walkSplitPoint(..)") << abort(FatalError);
             }
         }
         while (true);
@@ -547,7 +549,7 @@ void calcPointVecs
 
                 surf.write("errorSurf.ftr");
 
-                FatalErrorIn("calcPointVecs")
+                FatalErrorIn("calcPointVecs(..)")
                     << "Cannot find two faces using border edge " << edgeI
                     << " verts:" << edges[edgeI]
                     << " eFaces:" << eFaces << endl
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
index ed06d0a39c..3a8db2cffd 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Select triangles by label
-faces ();
+faces #include "badFaces";
 
 // Select triangles using given points (local point numbering)
 localPoints ( );
diff --git a/bin/foamCheckJobs b/bin/foamCheckJobs
index a2696e1f80..8812c96466 100755
--- a/bin/foamCheckJobs
+++ b/bin/foamCheckJobs
@@ -38,7 +38,7 @@
 #
 #------------------------------------------------------------------------------
 
-PROGNAME=${0##*/}
+Script=${0##*/}
 
 #-------------------------------------------------------------------------------
 #- User settings
@@ -48,9 +48,9 @@ NDAYSLIMIT=7
 #-------------------------------------------------------------------------------
 
 #- work file
-TMPFILE=/tmp/${PROGNAME}$$.tmp
+TMPFILE=/tmp/${Script}$$.tmp
 #- work dir. Needs to be accessible for all machines
-MACHDIR=$HOME/.OpenFOAM/${PROGNAME}
+MACHDIR=$HOME/.OpenFOAM/${Script}
 DEFSTATEFILE=$HOME/.OpenFOAM/foamCheckJobs.out
 
 
@@ -62,6 +62,29 @@ else
 fi
 
 
+usage() {
+    cat<<USAGE
+Usage: $Script [stateFile]
+
+This program checks all the locks in the FOAM_JOB_DIR directory to see if
+their processes are still running. Processes will not release their
+lock if they exit abnormally. This program will try to obtain process
+information on the machine the process ran on and release the lock
+if the program is no longer running.
+
+Note: all machines have to be reachable using ssh.
+
+The output from checking all running jobs is collected in an optional
+file.
+
+FILES:
+    \$FOAM_JOB_DIR/runningJobs    locks for running  processes
+                  /finishedJobs  locks for finished processes
+USAGE
+    exit 1
+}
+
+
 #-------------------------------------------------------------------------------
 #
 # Functions
@@ -83,7 +106,8 @@ getEntry() {
 # notEmpty directory
 # Returns 0 if directory contains files/directories
 notEmpty() {
-    if [ "`ls $1`" ]; then
+    if [ "`ls $1`" ]
+    then
         return 0
     else
         return 1
@@ -96,7 +120,8 @@ notEmpty() {
 #     ==> 13
 dayDiff() {
     date -d "$1" > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
+    if [ $? -ne 0 ]
+    then
         #- option '-d' on date not supported. Give up.
         echo "0"
     else
@@ -119,12 +144,14 @@ dayDiff() {
 # Also handles 'slaves' entries in jobInfo:
 #   slaves           1 ( penfold.23766 );
 getAllJobs() {
-    if notEmpty $1; then
+    if notEmpty $1
+    then
         jobs=$1/*
         for f in $jobs
         do
             line=`grep '^[ ]*slaves' $f 2>/dev/null`
-            if [ $? -eq 0 ]; then
+            if [ $? -eq 0 ]
+            then
                 slaveJobs=`echo "$line" | sed -e 's/.*(\(.*\)).*/\1/'`
                 jobs="$jobs $slaveJobs"
             fi
@@ -138,34 +165,12 @@ getAllJobs() {
 # releaseLock jobId lockFile
 # Releases lock on jobId
 releaseLock () {
-    if [ -f $2 ]; then
+    if [ -f $2 ]
+    then
         #- move lock to finishedJobs
         mv $2 $FOAM_JOB_DIR/finishedJobs/
     fi
-    $ECHO "Lock on job $1 released."
-}
-
-
-printUsage() {
-cat << LABEL
-Usage: $PROGNAME [stateFile]
-
-This program checks all the locks in the license directory to see if
-their processes are still running. Processes will not release their
-lock if they exit abnormally. This program will try to obtain process
-information on the machine the process ran on and release the lock
-if the program is no longer running.
-
-Requirements: the environment variable FOAM_JOB_DIR needs to point to the
-license directory and all machines have to be reachable using ssh.
-
-The output from checking all running jobs is collected in an optional
-file.
-
-FILES:
-    \$FOAM_JOB_DIR/runningJobs    locks for running processes
-                  /finishedJobs     ,,      finished processes
-LABEL
+    echo "Lock on job $1 released."
 }
 
 
@@ -175,39 +180,50 @@ LABEL
 #
 #-------------------------------------------------------------------------------
 
-#- Check a few things
-
-if [ ! "$FOAM_JOB_DIR" ]; then
-    $ECHO "$PROGNAME : FOAM_JOB_DIR environment variable not set."
-    $ECHO "This should point to your central license directory."
-    exit 1
-fi
-
-if [ ! -d "$FOAM_JOB_DIR" ]; then
-    $ECHO "$PROGNAME : The license directory accoring to FOAM_JOB_DIR is not valid."
-    $ECHO "FOAM_JOB_DIR: $FOAM_JOB_DIR"
-    exit 1
-fi
-if [ ! -d "$FOAM_JOB_DIR/runningJobs" -o ! -d "$FOAM_JOB_DIR/finishedJobs" ]; then
-    $ECHO "$PROGNAME : The license directory according to FOAM_JOB_DIR is not valid."
-    $ECHO "FOAM_JOB_DIR: $FOAM_JOB_DIR"
-    exit 1
-fi
-
-
-if [ $# -eq 1 ]; then
-    STATEFILE=$1
-elif [ $# -eq 0 ]; then
+if [ $# -eq 1 ]
+then
+    if [ "$1" = "-h" -o "$1" = "-help" ]
+    then
+        usage
+    fi
+    STATEFILE="$1"
+elif [ $# -eq 0 ]
+then
     STATEFILE=${STATEFILE:-$DEFSTATEFILE}
 else
-    printUsage
+    usage
+fi
+
+
+#- Check a few things
+
+if [ ! "$FOAM_JOB_DIR" ]
+then
+    echo "$Script : FOAM_JOB_DIR environment variable not set."
+    echo
     exit 1
 fi
 
+if [ ! -d "$FOAM_JOB_DIR" ]
+then
+    echo "$Script : directory does not exist."
+    echo "    FOAM_JOB_DIR=$FOAM_JOB_DIR"
+    echo
+    exit 1
+fi
+if [ ! -d "$FOAM_JOB_DIR/runningJobs" -o ! -d "$FOAM_JOB_DIR/finishedJobs" ]
+then
+    echo "$Script : invalid directory."
+    echo "    FOAM_JOB_DIR=$FOAM_JOB_DIR"
+    echo
+    exit 1
+fi
+
+
+
 #- obtain rsh method
 RSH='ssh'
 echo "Using remote shell type : $RSH"
-
 echo ""
 echo "Collecting information on jobs in"
 echo "  $FOAM_JOB_DIR"
@@ -226,13 +242,14 @@ do
     pid=`echo $machinePid | sed -e 's/.*\.\([0-9][0-9]*\)$/\1/'`
 
     fgrep "$machine" $TMPFILE >/dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        $ECHO "$machine" >> $TMPFILE
+    if [ $? -ne 0 ]
+    then
+        echo "$machine" >> $TMPFILE
     fi
 done
-$ECHO "Found machines:"
+echo "Found machines:"
 cat $TMPFILE
-$ECHO ""
+echo ""
 
 
 
@@ -243,31 +260,34 @@ cnt=1
 while true
 do
     machine=`sed -n -e "${cnt}p" $TMPFILE`
-    if [ ! "$machine" ]; then
+    if [ ! "$machine" ]
+    then
         break
     fi
 
     machFile=$MACHDIR/$machine
     rm -f $machFile
-    $ECHO "Contacting $machine to collect process information:"
-    if [ $machine = `hostname` ]; then
-        $ECHO "  foamProcessInfo $machFile"
+    echo "Contacting $machine to collect process information:"
+    if [ $machine = `hostname` ]
+    then
+        echo "  foamProcessInfo $machFile"
         foamProcessInfo $machFile >/dev/null 2>&1
     else
-        $ECHO "  $RSH $machine foamProcessInfo $machFile"
+        echo "  $RSH $machine foamProcessInfo $machFile"
         $RSH $machine foamProcessInfo $machFile >/dev/null 2>&1
     fi
-    if [ $? -ne 0 -o ! -s $machFile ]; then
-        $ECHO "** Failed collecting process information on $machine."
-        $ECHO "Check $machFile and run foamProcessInfo by hand"
+    if [ $? -ne 0 -o ! -s $machFile ]
+    then
+        echo "** Failed collecting process information on $machine."
+        echo "Check $machFile and run foamProcessInfo by hand"
         rm -f $machFile
     else
-        $ECHO "Succesfully collected information in $machFile ..."
+        echo "Succesfully collected information in $machFile ..."
     fi
 
     cnt=`expr $cnt + 1`
 done
-$ECHO ""
+echo ""
 
 
 #- Construct state for runningJobs; move non runnning jobs to finishedJobs
@@ -281,27 +301,32 @@ do
     pid=`echo $machinePid | sed -e 's/.*\.\([0-9][0-9]*\)$/\1/'`
 
     machFile=$MACHDIR/$machine
-    if [ -r $machFile ]; then
+    if [ -r $machFile ]
+    then
         entry=`grep "^$pid " $machFile 2>/dev/null`
-        if [ $? -ne 0 -o ! "$entry" ]; then
-            if [ "$releaseAll" ]; then
+        if [ $? -ne 0 -o ! "$entry" ]
+        then
+            if [ "$releaseAll" ]
+            then
                 releaseLock $machinePid $f
             else
-                $ECHO "Job $machinePid seems to be no longer running. Release lock? (y/a)\c"
+                echo "Job $machinePid seems to be no longer running. Release lock? (y/a)\c"
                 read answ
-                if [ "${answ:-y}" = 'y' ]; then
+                if [ "${answ:-y}" = 'y' ]
+                then
                     releaseLock $machinePid $f
-                elif [ "${answ:-y}" = 'a' ]; then
+                elif [ "${answ:-y}" = 'a' ]
+                then
                     releaseAll='yes'
                     releaseLock $machinePid $f
                 else
                     state='OTHR'
-                    $ECHO "$machinePid $state" >> $STATEFILE
+                    echo "$machinePid $state" >> $STATEFILE
                 fi
             fi
         else
             state=`echo "$entry" | awk '{print $2}'`
-            $ECHO "$machinePid $state" >> $STATEFILE
+            echo "$machinePid $state" >> $STATEFILE
         fi
     fi
 done
@@ -314,29 +339,33 @@ OLDFILES=`find $FOAM_JOB_DIR/finishedJobs -mtime +$NDAYSLIMIT -print`
 
 #- Construct state for finishedJobs and check on date of files.
 
-if notEmpty $FOAM_JOB_DIR/finishedJobs; then
+if notEmpty $FOAM_JOB_DIR/finishedJobs
+then
     dateNow=`date '+%b %d %Y'`
     for f in $FOAM_JOB_DIR/finishedJobs/*
     do
         sz=`ls -s $f | awk '{print $1}'`
-        if [ "$sz" -gt 0 ]; then
+        if [ "$sz" -gt 0 ]
+        then
             machinePid=`basename $f`
             machine=`echo $machinePid | sed -e 's/\.[0-9][0-9]*$//'`
             pid=`echo $machinePid | sed -e 's/.*\.\([0-9][0-9]*\)$/\1/'`
 
             end=`getEntry $f endDate`
-            if [ ! "$end" ]; then
+            if [ ! "$end" ]
+            then
                 state='ABRT'
             else
                 nDaysOld=`dayDiff  "$dateNow" "$end"`
-                if [ "$nDaysOld" -gt $NDAYSLIMIT ]; then
+                if [ "$nDaysOld" -gt $NDAYSLIMIT ]
+                then
                     OLDFILES="$OLDFILES $f"
                 fi
 
                 state='FINI'
             fi
 
-            $ECHO "$machinePid $state" >> $STATEFILE
+            echo "$machinePid $state" >> $STATEFILE
         fi
     done
 fi
@@ -345,11 +374,13 @@ fi
 #- Remove old locks
 
 nOldFiles=`echo "$OLDFILES" | wc -w`
-if [ "$nOldFiles" -gt 0 ]; then
-    $ECHO "You seem to have $nOldFiles locks older than $NDAYSLIMIT days in finishedJobs/"
+if [ "$nOldFiles" -gt 0 ]
+then
+    echo "You seem to have $nOldFiles locks older than $NDAYSLIMIT days in finishedJobs/"
     $ECHO "Do you want to remove these? (y)\c"
     read answ
-    if [ "${answ:-y}" = 'y' ]; then
+    if [ "${answ:-y}" = 'y' ]
+    then
         rm -f $OLDFILES
     fi
 fi
@@ -358,9 +389,9 @@ fi
 rm -f $TMPFILE
 rm -r $MACHDIR
 
-$ECHO ""
-$ECHO "Updated stateFile:"
-$ECHO "  $STATEFILE"
-$ECHO ""
+echo ""
+echo "Updated stateFile:"
+echo "  $STATEFILE"
+echo ""
 
 #------------------------------------------------------------------------------
diff --git a/bin/foamCleanPath b/bin/foamCleanPath
index dca96f490e..225aa0e943 100755
--- a/bin/foamCleanPath
+++ b/bin/foamCleanPath
@@ -32,35 +32,48 @@
 #     Prints its argument (which should be a ':' separated path)
 #     without all
 #         - duplicate elements
-#         - (if '-strip') non-accessible directories
 #         - elements whose start matches a wildcard
+#         - inaccessible directories (with the -strip option)
 #
 #     Note:
 #         - this routine will fail when directories have embedded spaces
 #         - false matches possible if a wildcard contains '.' (sed regex)
 #------------------------------------------------------------------------------
-if [ "$#" -lt 1 -o "$1" = "-h" -o "$1" = "-help" ]
-then
-   cat <<USAGE 1>&2
-Usage: ${0##*/} [-strip] path [wildcard] .. [wildcard]
+usage() {
+    cat <<USAGE 1>&2
+usage: ${0##*/} [-strip] path [wildcard] .. [wildcard]
+
+  Prints its argument (which should be a ':' separated list) cleansed from
+    - duplicate elements
+    - elements whose start matches one of the wildcard(s)
+    - inaccessible directories (with the -strip option)
 
-    Prints its argument (which should be a ':' separated list) cleansed from
-      - duplicate elements
-      - elements whose start matches one of the wildcard(s)
-      - (if '-strip') non-accessible directories
 USAGE
-   exit 1
-fi
+    exit 1
+}
 
 
-strip=''
-if [ "$1" = "-strip" ]
-then
-    strip=true
-    shift
-fi
+unset strip
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -strip)
+        strip=true
+        shift
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
 
 
+[ "$#" -ge 1 ] || usage
+
 dirList="$1"
 shift
 
@@ -79,7 +92,7 @@ do
     wildcard=$1
     shift
     ##DEBUG echo "remove>$wildcard<" 1>&2
-    dirList=`echo "$dirList" | sed -e "s@${wildcard}[^:]*:@@g"`
+    dirList=$(echo "$dirList" | sed -e "s@${wildcard}[^:]*:@@g")
 done
 
 # split on ':' (and on space as well to avoid any surprises)
@@ -97,13 +110,13 @@ do
     if [ -e "$dir" ]
     then
         #- no duplicate dirs
-        duplicate=`echo " $dirList " | sed -ne "s@ $dir @DUP@p"`
+        duplicate=$(echo " $dirList " | sed -ne "s@ $dir @DUP@p")
 
         if [ ! "$duplicate" ]
         then
             dirList="$dirList $dir"
         fi
-    elif [ "$strip" != "true" ]
+    elif [ "$strip" != true ]
     then
         # Print non-existing directories if not in 'strip' mode.
         dirList="$dirList $dir"
diff --git a/bin/foamCopySettings b/bin/foamCopySettings
index 8f461a008b..eaa6a0cc8c 100755
--- a/bin/foamCopySettings
+++ b/bin/foamCopySettings
@@ -32,18 +32,27 @@
 #     Copy OpenFOAM settings from one case to another, without copying
 #     the mesh or results
 #     - requires rsync
+#
+# Note
+#     The foamCopySettings.rc (found with the ~OpenFOAM expansion) can be used
+#     to add any custom rsync options.
 #------------------------------------------------------------------------------
+Script=${0##*/}
 if [ "$1" = "-h" -o "$1" = "-help" -o "$#" -ne 2 ]
 then
     cat <<USAGE 1>&2
-Usage: ${0##*/} srcDir dstDir
+Usage: $Script srcDir dstDir
 
     Copy OpenFOAM settings from one case to another, without copying
     the mesh or results.
     - requires rsync
 
+Note
+    The $Script.rc (found with the ~OpenFOAM expansion) can be used
+    to add any custom rsync options.
+
 USAGE
-   exit 1
+    exit 1
 fi
 
 srcDir=${1%/}
@@ -66,13 +75,33 @@ do
 done
 
 # files and directories to copy
-# avoid processor directories
+# avoid processor directories here too to make for cleaner output
 fileList=$(find -H $srcDir -mindepth 1 -maxdepth 1 -not -name "processor*")
 
+
+# avoid polyMesh and processor* directories
+rsync="rsync --exclude polyMesh --exclude processor*"
+
+#
+# get any extra user options
+# extract lines starting with '--longOption'
+#
+if rcFile=$(foamEtcFile $Script.rc)
+then
+    rsync="$rsync "$(sed -ne '/^ *--/p' $rcFile | tr '\n' ' ')
+fi
+
+
 # TODO:
 #  - verify that it works with multiple mesh regions
 #  - special treatment for starting with negative crank angles
 
+
+echo
+echo "synchronizing with"
+echo "    $rsync"
+echo
+
 for i in $fileList
 do
     name="${i##*/}"
@@ -85,7 +114,7 @@ do
         ;;
     *)
         echo "$i -> $dstDir/$name"
-        rsync --exclude polyMesh --exclude "processor*" -a $i $dstDir
+        $rsync -a $i $dstDir
         ;;
     esac
 done
diff --git a/bin/foamGraphExecTime b/bin/foamGraphExecTime
index 2b1be274b0..3dc2fa2c70 100755
--- a/bin/foamGraphExecTime
+++ b/bin/foamGraphExecTime
@@ -29,6 +29,10 @@
 # Description
 #     
 #------------------------------------------------------------------------------
+if (! -f "$1" ) then
+    echo "No file: '$1'"
+    exit 1
+endif
 
 set tmpTime = newTime$$.dat
 cat $1 | grep "ExecutionTime = " | awk 'BEGIN { NENTRIES = 0 ; TPREV = 0.0 }{NENTRIES++; printf("%f %e\n", NENTRIES, $3 - TPREV); TPREV = $3}' - > $tmpTime
diff --git a/bin/foamGraphResKE b/bin/foamGraphResKE
index ae9d713ef2..d00798f507 100755
--- a/bin/foamGraphResKE
+++ b/bin/foamGraphResKE
@@ -29,6 +29,10 @@
 # Description
 #     
 #------------------------------------------------------------------------------
+if (! -f "$1" ) then
+    echo "No file: '$1'"
+    exit 1
+endif
 
 set tmpK = newK$$.dat
 cat $1 | grep "Solving for k" | grep -v "solution singularity" | sed s/,//g | awk 'BEGIN { NENTRIES = 0 }{NENTRIES++; printf("%f %e\n", NENTRIES, $8)}' - > $tmpK
diff --git a/bin/foamGraphResUVWP b/bin/foamGraphResUVWP
index 036cf47b5a..1b34258fcf 100755
--- a/bin/foamGraphResUVWP
+++ b/bin/foamGraphResUVWP
@@ -29,6 +29,10 @@
 # Description
 #     
 #------------------------------------------------------------------------------
+if (! -f "$1" ) then
+    echo "No file: '$1'"
+    exit 1
+endif
 
 set tmpU = newU$$.dat
 cat $1 | grep "Solving for Ux" | grep -v "solution singularity" | sed s/,//g | awk 'BEGIN { NENTRIES = 0 }{NENTRIES++; printf("%d %e\n", NENTRIES, $8)}' - > $tmpU
diff --git a/bin/foamLog b/bin/foamLog
index a82410da4d..06b2a2c5dc 100755
--- a/bin/foamLog
+++ b/bin/foamLog
@@ -35,17 +35,11 @@
 
 PROGDIR=`dirname $0`
 PROGNAME=`basename $0`
-
-if [ -r $HOME/.${PROGNAME}.db ]; then
-    DBFILE=$HOME/.${PROGNAME}.db
-else
-    DBFILE=$PROGDIR/$PROGNAME.db
-fi
-
+DBFILE=${PROGNAME}.db
 
 printUsage() {
-cat <<LABUSAGE
-$PROGNAME - extracts xy files from Foam logs.
+cat <<USAGE
+$PROGNAME - extracts xy files from OpenFOAM logs.
 
 Usage: $PROGNAME [-n][-s] <log>
            extracts xy files from log
@@ -54,39 +48,47 @@ Usage: $PROGNAME [-n][-s] <log>
        $PROGNAME -h
            for a help message
 
-LABUSAGE
+USAGE
 }
 
 
 printHelp() {
 printUsage
 cat <<LABHELP
-The default is to extract for all the 'Solved for' variables the
-initial residual, the final residual and the number of iterations. On
-top of this a (user editable) database of standard non-solved for
-variables is used to extract data like Courant number, execution time.
+The default is to extract for all the 'Solved for' variables the initial
+residual, the final residual and the number of iterations. Additionally, a
+(user editable) database is used to extract data for standard non-solved for
+variables like Courant number, and execution time.
 
-$PROGNAME -l shows all the possible variables but does not extract them.
+$PROGNAME -l lists all the possible variables without extracting them.
 
-The program will generate and run an awk script which writes a set of
-files, logs/<var>_<subIter>, for every <var> specified, for every
-occurrence inside a time step.
+The program will generate and run an awk script which writes a set of files,
+logs/<var>_<subIter>, for every <var> specified, for every occurrence inside
+a time step.
 
-For variables that are 'Solved for' the initial residual name will 
-be <var>, the final residual will get name <var>FinalRes,
+For variables that are 'Solved for', the initial residual name will be
+<var>, the final residual receive the name <var>FinalRes,
 
-The files are a simple xy format with the first column Time (default)
+The files are output in a simple xy format with the first column Time (default)
 and the second the extracted values. Option -n creates single column
 files with the extracted data only.
 
 
-The query database is a simple text format with three entries per line, 
-separated with '/'. Column 1 is the name of the variable (cannot contain
-spaces), column 2 is the extended regular expression (egrep) to select
-the line and column 3 is the string (fgrep) to select the column inside the
-line. The value taken will be the first (non-space)word after this
-column. The database will either be \$HOME/.${PROGNAME}.db or if not
-found  $PROGDIR/${PROGNAME}.db.
+The query database is a simple text format with three entries per line,
+separated with '/' :
+  Column 1 is the name of the variable (cannot contain spaces).
+  Column 2 is the extended regular expression (egrep) to select the line.
+  Column 3 is the string (fgrep) to select the column inside the line.
+The value taken will be the first (non-space)word after this column.
+The database ($PROGNAME.db) will taken from these locations:
+
+    .
+    $HOME/.OpenFOAM/$WM_PROJECT_VERSION
+    $HOME/.OpenFOAM
+    $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION
+    $WM_PROJECT_INST_DIR/site
+    $WM_PROJECT_DIR/etc
+    $PROGDIR/tools
 
 Option -s suppresses the default information and only prints the extracted
 variables.
@@ -95,9 +97,28 @@ LABHELP
 }
 
 
+# The various places to be searched:
+for i in \
+    . \
+    $HOME/.OpenFOAM/$WM_PROJECT_VERSION \
+    $HOME/.OpenFOAM \
+    $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION \
+    $WM_PROJECT_INST_DIR/site \
+    $WM_PROJECT_DIR/etc \
+    $PROGDIR/tools \
+    ;
+do
+    if [ -r $i/$DBFILE ]
+    then
+        DBFILE="$i/$DBFILE"
+        break
+    fi
+done
+
 
 myEcho() {
-  if [ "$VERBOSE" ]; then
+  if [ "$VERBOSE" ]
+  then
       echo "$*"
   fi
 }
@@ -112,7 +133,8 @@ getSolvedVars() {
 # getQueries dbFile queryName
 # Gets regular expressions for a certain queryName from the database
 getQueries() {
-    if [ ! -f "$1" ]; then
+    if [ ! -f "$1" ]
+    then
         echo "Cannot find dbFile $1"
         exit 1
     fi
@@ -123,7 +145,8 @@ getQueries() {
     NUMQ=`grep -v '^#' $1 | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $3}'`
 
     #echo "For $queryName found line selection /$LINEQ/ , column selection /$NUMQ/" 1>&2
-    #if [ ! "$LINEQ" -o ! "$NUMQ" ]; then
+    #if [ ! "$LINEQ" -o ! "$NUMQ" ]
+    #then
     #    echo "Did not find query for $2 in database $1" 1>&2
     #fi
 }
@@ -149,6 +172,7 @@ getSolveQueryList() {
     done
 }
 
+
 # getAllQueries dbFile logFile
 # Gets all queries from database and from logfile
 getAllQueries() {
@@ -164,9 +188,11 @@ getAllQueries() {
     do
         getQueries $1 "$var"
         line=`egrep "$LINEQ" $2`
-        if [ "$line" ]; then
+        if [ "$line" ]
+        then
             column=`echo "$line" | fgrep "$NUMQ"`
-            if [ "$column" ]; then
+            if [ "$column" ]
+            then
                 queries="$queries $var"
             fi
         fi
@@ -178,6 +204,7 @@ getAllQueries() {
     done | sort -u
 }
 
+
 #-----------------------------
 # Main
 #-----------------------------
@@ -190,18 +217,23 @@ LISTONLY=''
 while getopts nslh flags
 do
     case $flags in
-        n)  TIMENAME=""
-            ;;
-        h)  printHelp
-            exit 0
-            ;;
-        s)  VERBOSE=""
-            ;;
-        l)  LISTONLY='yes'
-            ;;
-	    \?) printUsage
-            exit 1
-            ;;
+    n)
+        TIMENAME=""
+        ;;
+    h)
+        printHelp
+        exit 0
+        ;;
+    s)
+        VERBOSE=""
+        ;;
+    l)
+        LISTONLY='yes'
+        ;;
+    \?)
+        printUsage
+        exit 1
+        ;;
     esac
 done
 
@@ -209,18 +241,22 @@ done
 # Shift options
 shift `expr $OPTIND - 1`
 
-if [ ! -f $DBFILE ]; then
+if [ ! -f $DBFILE ]
+then
     echo "$PROGNAME: Cannot read database $DBFILE"
     exit 1
 fi
 
-if [ "$LISTONLY" ]; then
-    if [ $# -ne 1 ]; then
+if [ "$LISTONLY" ]
+then
+    if [ $# -ne 1 ]
+    then
         printUsage
         exit 1
     fi
     LOG=$1;
-    if [ ! -r $LOG ]; then
+    if [ ! -r $LOG ]
+    then
         echo "$PROGNAME: Cannot read log $LOG"
         exit 1
     fi
@@ -228,14 +264,16 @@ if [ "$LISTONLY" ]; then
     exit 0
 fi
 
-if [ $# -ne 1 ]; then
+if [ $# -ne 1 ]
+then
     printUsage
     exit 1
 fi
 
 CASEDIR=.
 LOG=$1
-if [ ! -r $LOG ]; then
+if [ ! -r $LOG ]
+then
     echo "$PROGNAME: Cannot read log $LOG"
     exit 1
 fi
@@ -243,17 +281,20 @@ fi
 QUERYNAMES=`getAllQueries $DBFILE $LOG`
 
 
-if [ ! "$CASEDIR" ]; then
+if [ ! "$CASEDIR" ]
+then
     printUsage
     exit 1
 fi
 
-if [ ! -d "$CASEDIR" ]; then
+if [ ! -d "$CASEDIR" ]
+then
     echo "$PROGNAME: Cannot read $CASEDIR"
     exit 1
 fi
 
-if [ ! -f "$LOG" ]; then
+if [ ! -f "$LOG" ]
+then
     echo "$PROGNAME: Cannot read log file $LOG"
     exit 1
 fi
@@ -276,8 +317,6 @@ myEcho ""
 # Generate Awk program
 #-----------------------------
 
-
-
 #-- header
 
 rm -f $AWKFILE; touch $AWKFILE
@@ -317,9 +356,6 @@ function extract(inLine,columnSel,outVar,
 LABEL
 
 
-
-
-
 #-- Generate code for iteration separator (increments 'Iteration')
 getQueries $DBFILE 'Separator'
 cat <<LABSEP >> $AWKFILE
@@ -361,30 +397,32 @@ cat <<LABSOLVE >> $AWKFILE
 
     varName=varNameVal[1]
     file=varName "_" subIter[varName]++
-    file="$CASEDIR/logs/" file 
+    file="$CASEDIR/logs/" file
     extract(\$0, "Initial residual = ", val)
     print $TIMENAME "\t" val[1] > file
 
     varName=varNameVal[1] "FinalRes"
     file=varName "_" subIter[varName]++
-    file="$CASEDIR/logs/" file 
+    file="$CASEDIR/logs/" file
     extract(\$0, "Final residual = ", val)
     print $TIMENAME "\t" val[1] > file
 
     varName=varNameVal[1] "Iters"
     file=varName "_" subIter[varName]++
-    file="$CASEDIR/logs/" file 
+    file="$CASEDIR/logs/" file
     extract(\$0, "No Iterations ", val)
     print $TIMENAME "\t" val[1] > file
 }
 
 LABSOLVE
 
+
 #-- generate code to process queries
 for queryName in $QUERYNAMES
 do
     getQueries $DBFILE $queryName
-    if [ "$LINEQ" -a "$NUMQ" ]; then
+    if [ "$LINEQ" -a "$NUMQ" ]
+    then
         counter=${queryName}Cnt
 
         echo "#-- Extraction of $queryName" >> $AWKFILE
@@ -399,7 +437,6 @@ do
 done
 
 
-
 #-----------------------------
 # Run awk program on log
 #-----------------------------
@@ -415,5 +452,6 @@ done
 #-----------------------------
 myEcho "Generated XY files for:"
 getAllQueries $DBFILE $LOG
+myEcho "End"
 
 #------------------------------------------------------------------------------
diff --git a/bin/foamNew b/bin/foamNew
index 6ef67f7387..d1b31693b9 100755
--- a/bin/foamNew
+++ b/bin/foamNew
@@ -33,7 +33,6 @@
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
-
 usage: ${0##*/} <type> {args}
 
 * create a new standard OpenFOAM source or template file
@@ -44,22 +43,18 @@ USAGE
     exit 1
 }
 
-if [ "$#" -lt 2 ]
-then
-    usage "wrong number of arguments, expected 2 (or more)"
-fi
+
+# this implicitly covers a lone -help, but let other scripts handle the rest
+[ "$#" -gt 1 ] || usage
 
 case "$1" in
--h | -help)
-    usage
-    ;;
 source)
     shift
-    $WM_PROJECT_DIR/bin/foamTemplates/source/newSource $*
+    $WM_PROJECT_DIR/bin/templates/source/foamNewSource $*
     ;;
 template)
     shift
-    $WM_PROJECT_DIR/bin/foamTemplates/sourceTemplate/newSourceTemplate $*
+    $WM_PROJECT_DIR/bin/templates/sourceTemplate/foamNewTemplate $*
     ;;
 *)
     usage "unknown type"
diff --git a/bin/foamNewSource b/bin/foamNewSource
new file mode 120000
index 0000000000..1195efa3f3
--- /dev/null
+++ b/bin/foamNewSource
@@ -0,0 +1 @@
+templates/source/foamNewSource
\ No newline at end of file
diff --git a/bin/foamNewTemplate b/bin/foamNewTemplate
new file mode 120000
index 0000000000..daefeb4929
--- /dev/null
+++ b/bin/foamNewTemplate
@@ -0,0 +1 @@
+templates/sourceTemplate/foamNewTemplate
\ No newline at end of file
diff --git a/bin/foamPrintJobs b/bin/foamPrintJobs
index 2b2ca15938..a2851f2902 100755
--- a/bin/foamPrintJobs
+++ b/bin/foamPrintJobs
@@ -30,10 +30,8 @@
 #     Uses finishedJobs/ and runningJobs/ and stateFile to print job info
 #
 #------------------------------------------------------------------------------
+Script=${0##*/}
 
-PROGNAME=`basename $0`
-TMPFILE=/tmp/${PROGNAME}$$.tmp
-TMPFILE2=/tmp/${PROGNAME}$$.tmp2
 JOBSTRING='%4s %8s %20s %10s %8s %4s %12s %12s %20s\n'
 DEFSTATEFILE=$HOME/.OpenFOAM/foamCheckJobs.out
 
@@ -44,18 +42,19 @@ DEFSTATEFILE=$HOME/.OpenFOAM/foamCheckJobs.out
 #
 #-------------------------------------------------------------------------------
 
-printUsage() {
-cat << LABEL
-Usage: $PROGNAME [stateFile]
+usage() {
+    cat<<USAGE
+Usage: $Script [stateFile]
 
-This program prints a table of all the running and finished jobs.
+This program prints a table of all running and finished jobs.
 
 It is normally used in conjunction with foamCheckJobs which outputs
 a "stateFile" containing the actual process status of all jobs.
 
-If stateFile is not supplied the default $DEFSTATEFILE
-is used.
-LABEL
+If stateFile is not supplied, the default is used:
+    $DEFSTATEFILE
+USAGE
+    exit 1
 }
 
 
@@ -81,7 +80,8 @@ getEntry() {
 # notEmpty directory
 # Returns 0 if directory contains files/directories
 notEmpty() {
-    if [ "`ls $1`" ]; then
+    if [ "`ls $1`" ]
+    then
         return 0
     else
         return 1
@@ -104,37 +104,47 @@ leftStr() {
 #
 #-------------------------------------------------------------------------------
 
-if [ ! "$FOAM_JOB_DIR" ]; then
-    echo "$PROGNAME : FOAM_JOB_DIR environment variable not set."
-    exit 1
-fi
-
-if [ ! -d "$FOAM_JOB_DIR" ]; then
-    echo "$PROGNAME : directory does not exist."
-    echo "            FOAM_JOB_DIR: $FOAM_JOB_DIR"
-fi
-if [ ! -d "$FOAM_JOB_DIR/runningJobs" -o ! -d "$FOAM_JOB_DIR/finishedJobs" ]; then
-    echo "$PROGNAME : invalid directory."
-    echo "            FOAM_JOB_DIR: $FOAM_JOB_DIR"
-fi
-
-
-if [ $# -eq 1 ]; then
-    if [ "$1" = '-h' ]; then
-        printUsage
-        exit 1
+if [ $# -eq 1 ]
+then
+    if [ "$1" = "-h" -o "$1" = "-help" ]
+    then
+        usage
     else
-        STATEFILE=$1
+        STATEFILE="$1"
     fi
-elif [ $# -eq 0 ]; then
+elif [ $# -eq 0 ]
+then
     STATEFILE=${STATEFILE:-$DEFSTATEFILE}
 else
-    printUsage
+    usage
+fi
+
+#- Check a few things
+
+if [ ! "$FOAM_JOB_DIR" ]
+then
+    echo "$Script : FOAM_JOB_DIR environment variable not set."
+    echo
+    exit 1
+fi
+if [ ! -d "$FOAM_JOB_DIR" ]
+then
+    echo "$Script : directory does not exist."
+    echo "    FOAM_JOB_DIR=$FOAM_JOB_DIR"
+    echo
+    exit 1
+fi
+if [ ! -d "$FOAM_JOB_DIR/runningJobs" -o ! -d "$FOAM_JOB_DIR/finishedJobs" ]
+then
+    echo "$Script : invalid directory."
+    echo "    FOAM_JOB_DIR=$FOAM_JOB_DIR"
+    echo
     exit 1
 fi
 
 
-if [ -f "$STATEFILE" ]; then
+if [ -f "$STATEFILE" ]
+then
     echo ""
     echo "Using process information from"
     echo "  $STATEFILE"
@@ -160,7 +170,8 @@ printJob '----' '----' '----' '-------' '---' '----' '-----' '---' '----'
 
 #-- print running
 echo "Running:"
-if notEmpty $FOAM_JOB_DIR/runningJobs; then
+if notEmpty $FOAM_JOB_DIR/runningJobs
+then
     for f in `ls -t $FOAM_JOB_DIR/runningJobs/*`
     do
         machinePid=`basename $f`
@@ -170,14 +181,15 @@ if notEmpty $FOAM_JOB_DIR/runningJobs; then
 
         pid=`echo $machinePid | sed -e 's/.*\.\([0-9][0-9]*\)$/\1/'`
 
-        if [ "$STATEFILE" ]; then
+        if [ "$STATEFILE" ]
+        then
             stat=`getEntry $STATEFILE $machinePid`
         fi
         stat=${stat:-'UNKN'}
 
         case=`getEntry $f 'case'`
         case=${case:-'---'}
-        case=`echo $case | sed -e 's!/.*!!'`       #strip of processorXXX ending
+        case=`echo $case | sed -e 's!/.*!!'`  # strip processorXXX ending
         case=`rightStr 20 "$case"`
 
         start=`getEntry $f 'startDate'`
@@ -187,7 +199,8 @@ if notEmpty $FOAM_JOB_DIR/runningJobs; then
         end='---'
 
         code=`getEntry $f 'code'`
-        if [ "$code" ]; then
+        if [ "$code" ]
+        then
             code=`basename $code`
         else
             code='---'
@@ -196,7 +209,8 @@ if notEmpty $FOAM_JOB_DIR/runningJobs; then
 
         nProcs=`getEntry $f 'nProcs'`
         nProcs=${nProcs:-'1'}
-        if [ $nProcs -eq 1 ]; then
+        if [ $nProcs -eq 1 ]
+        then
             nProcs='---'
         fi
         nProcs=`rightStr 3 "$nProcs"`
@@ -213,7 +227,8 @@ fi
 #-- print finished
 echo ""
 echo "Finished:"
-if notEmpty $FOAM_JOB_DIR/finishedJobs; then
+if notEmpty $FOAM_JOB_DIR/finishedJobs
+then
     for f in `ls -t $FOAM_JOB_DIR/finishedJobs/*`
     do
         machinePid=`basename $f`
@@ -227,13 +242,14 @@ if notEmpty $FOAM_JOB_DIR/finishedJobs; then
         end=${end:-'---'}
         end=`leftStr 12 "$end"`
 
-        if [ "$STATEFILE" ]; then
+        if [ "$STATEFILE" ]
+        then
             stat=`getEntry $STATEFILE $machinePid`
         fi
         stat=${stat:-'UNKN'}
 
         case=`getEntry $f case`
-        case=`echo $case | sed -e 's!/.*!!'`       #strip of processorXXX ending
+        case=`echo $case | sed -e 's!/.*!!'`  # strip processorXXX ending
         case=${case:-'---'}
         case=`rightStr 20 "$case"`
 
@@ -242,7 +258,8 @@ if notEmpty $FOAM_JOB_DIR/finishedJobs; then
         start=`leftStr 12 "$start"`
 
         code=`getEntry $f code`
-        if [ "$code" ]; then
+        if [ "$code" ]
+        then
             code=`basename $code`
         else
             code='---'
@@ -251,7 +268,8 @@ if notEmpty $FOAM_JOB_DIR/finishedJobs; then
 
         nProcs=`getEntry $f 'nProcs'`
         nProcs=${nProcs:-'1'}
-        if [ $nProcs -eq 1 ]; then
+        if [ $nProcs -eq 1 ]
+        then
             nProcs='---'
         fi
         nProcs=`rightStr 3 "$nProcs"`
diff --git a/bin/foamTemplates/foamCommentStyles b/bin/templates/foamCommentStyles
similarity index 100%
rename from bin/foamTemplates/foamCommentStyles
rename to bin/templates/foamCommentStyles
diff --git a/bin/foamTemplates/foamScript b/bin/templates/foamScript
similarity index 100%
rename from bin/foamTemplates/foamScript
rename to bin/templates/foamScript
diff --git a/bin/foamTemplates/source/foamTemplate.C b/bin/templates/source/_Template.C
similarity index 84%
rename from bin/foamTemplates/source/foamTemplate.C
rename to bin/templates/source/_Template.C
index 1f86ef69f8..a45d3ff6ac 100644
--- a/bin/foamTemplates/source/foamTemplate.C
+++ b/bin/templates/source/_Template.C
@@ -24,11 +24,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "className.H"
+#include "CLASSNAME.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const dataType Foam::className::staticData();
+const dataType Foam::CLASSNAME::staticData();
 
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
@@ -42,21 +42,21 @@ const dataType Foam::className::staticData();
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::className::className()
+Foam::CLASSNAME::CLASSNAME()
 :
     baseClassName(),
     data_()
 {}
 
 
-Foam::className::className(const dataType& data)
+Foam::CLASSNAME::CLASSNAME(const dataType& data)
 :
     baseClassName(),
     data_(data)
 {}
 
 
-Foam::className::className(const className&)
+Foam::CLASSNAME::CLASSNAME(const CLASSNAME&)
 :
     baseClassName(),
     data_()
@@ -65,15 +65,15 @@ Foam::className::className(const className&)
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::className> Foam::className::New()
+Foam::autoPtr<Foam::CLASSNAME> Foam::CLASSNAME::New()
 {
-    return autoPtr<className>(new className);
+    return autoPtr<CLASSNAME>(new CLASSNAME);
 }
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::className::~className()
+Foam::CLASSNAME::~CLASSNAME()
 {}
 
 
@@ -82,12 +82,12 @@ Foam::className::~className()
 
 // * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
 
-void Foam::className::operator=(const className& rhs)
+void Foam::CLASSNAME::operator=(const CLASSNAME& rhs)
 {
     // Check for assignment to self
     if (this == &rhs)
     {
-        FatalErrorIn("Foam::className::operator=(const Foam::className&)")
+        FatalErrorIn("Foam::CLASSNAME::operator=(const Foam::CLASSNAME&)")
             << "Attempted assignment to self"
             << abort(FatalError);
     }
diff --git a/bin/foamTemplates/source/foamTemplate.H b/bin/templates/source/_Template.H
similarity index 79%
rename from bin/foamTemplates/source/foamTemplate.H
rename to bin/templates/source/_Template.H
index e0b6cf2157..b86edcbde9 100644
--- a/bin/foamTemplates/source/foamTemplate.H
+++ b/bin/templates/source/_Template.H
@@ -23,19 +23,19 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::className
+    Foam::CLASSNAME
 
 Description
 
 SourceFiles
-    classNameI.H
-    className.C
-    classNameIO.C
+    CLASSNAMEI.H
+    CLASSNAME.C
+    CLASSNAMEIO.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef className_H
-#define className_H
+#ifndef CLASSNAME_H
+#define CLASSNAME_H
 
 #include ".H"
 
@@ -49,16 +49,16 @@ class Istream;
 class Ostream;
 
 // Forward declaration of friend functions and operators
-class className;
-Istream& operator>>(Istream&, className&);
-Ostream& operator<<(Ostream&, const className&);
+class CLASSNAME;
+Istream& operator>>(Istream&, CLASSNAME&);
+Ostream& operator<<(Ostream&, const CLASSNAME&);
 
 
 /*---------------------------------------------------------------------------*\
-                          Class className Declaration
+                         Class CLASSNAME Declaration
 \*---------------------------------------------------------------------------*/
 
-class className
+class CLASSNAME
 :
     public baseClassName
 {
@@ -71,10 +71,10 @@ class className
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        className(const className&);
+        CLASSNAME(const CLASSNAME&);
 
         //- Disallow default bitwise assignment
-        void operator=(const className&);
+        void operator=(const CLASSNAME&);
 
 
 public:
@@ -88,26 +88,26 @@ public:
     // Constructors
 
         //- Construct null
-        className();
+        CLASSNAME();
 
         //- Construct from components
-        className(const dataType& data);
+        CLASSNAME(const dataType& data);
 
         //- Construct from Istream
-        className(Istream&);
+        CLASSNAME(Istream&);
 
         //- Construct as copy
-        className(const className&);
+        CLASSNAME(const CLASSNAME&);
 
 
     // Selectors
 
         //- Select null constructed
-        static autoPtr<className> New();
+        static autoPtr<CLASSNAME> New();
 
 
     //- Destructor
-    ~className();
+    ~CLASSNAME();
 
 
     // Member Functions
@@ -123,7 +123,7 @@ public:
 
     // Member Operators
 
-        void operator=(const className&);
+        void operator=(const CLASSNAME&);
 
 
     // Friend Functions
@@ -132,8 +132,8 @@ public:
 
     // IOstream Operators
 
-        friend Istream& operator>>(Istream&, className&);
-        friend Ostream& operator<<(Ostream&, const className&);
+        friend Istream& operator>>(Istream&, CLASSNAME&);
+        friend Ostream& operator<<(Ostream&, const CLASSNAME&);
 };
 
 
@@ -143,7 +143,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "classNameI.H"
+#include "CLASSNAMEI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/bin/foamTemplates/source/foamAppTemplate.C b/bin/templates/source/_TemplateApp.C
similarity index 99%
rename from bin/foamTemplates/source/foamAppTemplate.C
rename to bin/templates/source/_TemplateApp.C
index 46c089c1a8..7ce97539e6 100644
--- a/bin/foamTemplates/source/foamAppTemplate.C
+++ b/bin/templates/source/_TemplateApp.C
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    className
+    CLASSNAME
 
 Description
 
diff --git a/bin/foamTemplates/source/foamTemplateI.H b/bin/templates/source/_TemplateI.H
similarity index 100%
rename from bin/foamTemplates/source/foamTemplateI.H
rename to bin/templates/source/_TemplateI.H
diff --git a/bin/foamTemplates/source/foamTemplateIO.C b/bin/templates/source/_TemplateIO.C
similarity index 83%
rename from bin/foamTemplates/source/foamTemplateIO.C
rename to bin/templates/source/_TemplateIO.C
index d9119ed354..c6d595100a 100644
--- a/bin/foamTemplates/source/foamTemplateIO.C
+++ b/bin/templates/source/_TemplateIO.C
@@ -24,12 +24,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "className.H"
+#include "CLASSNAME.H"
 #include "IOstreams.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::className::className(Istream& is)
+Foam::CLASSNAME::CLASSNAME(Istream& is)
 :
     base1(is),
     base2(is),
@@ -37,31 +37,31 @@ Foam::className::className(Istream& is)
     member2(is)
 {
     // Check state of Istream
-    is.check("Foam::className::className(Foam::Istream&)");
+    is.check("Foam::CLASSNAME::CLASSNAME(Foam::Istream&)");
 }
 
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, className&)
+Foam::Istream& Foam::operator>>(Istream& is, CLASSNAME&)
 {
     // Check state of Istream
     is.check
     (
-        "Foam::Istream& Foam::operator>>(Foam::Istream&, Foam::className&)"
+        "Foam::Istream& Foam::operator>>(Foam::Istream&, Foam::CLASSNAME&)"
     );
 
     return is;
 }
 
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const className&)
+Foam::Ostream& Foam::operator<<(Ostream& os, const CLASSNAME&)
 {
     // Check state of Ostream
     os.check
     (
         "Foam::Ostream& Foam::operator<<(Foam::Ostream&, "
-        "const Foam::className&)"
+        "const Foam::CLASSNAME&)"
     );
 
     return os;
diff --git a/bin/foamTemplates/source/newSource b/bin/templates/source/foamNewSource
similarity index 69%
rename from bin/foamTemplates/source/newSource
rename to bin/templates/source/foamNewSource
index 927ad36b31..ec1ad7b2e1 100755
--- a/bin/foamTemplates/source/newSource
+++ b/bin/templates/source/foamNewSource
@@ -24,18 +24,18 @@
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 # Script
-#     foamNew
+#     foamNewSource
 #
 # Description
 #     Create a new standard OpenFOAM source file
 #
 #------------------------------------------------------------------------------
 Script=${0##*/}
+Template="$WM_PROJECT_DIR/bin/templates/source/_Template"
 
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
-
 usage: $Script <type> <class name>
 
 * create a new standard OpenFOAM source file
@@ -46,49 +46,56 @@ USAGE
     exit 1
 }
 
-if [ "$#" -ne 2 ]; then
-   usage "wrong number of arguments, expected 2"
-fi
 
-unset suffix fileType
+# this implicitly covers a lone -help
+[ "$#" -gt 1 ] || usage
+
+className="$2"
+unset subType Type
+
 case "$1" in
+-h | -help)
+    usage
+    ;;
 C|H)
-   template=foamTemplate
-   fileType=$1
-   ;;
+    Type=".$1"
+    ;;
 I)
-   suffix=$1
-   template=foamTemplateI
-   fileType=H
-   ;;
+    Type="$1.H"
+    ;;
 IO)
-   suffix=$1
-   template=foamTemplateIO
-   fileType=C
-   ;;
+    Type="$1.C"
+    ;;
 app|App)
-   template=foamAppTemplate
-   fileType=C
-   if [ ! -d Make ]; then
-       echo "foamNew: Creating Make/files and Make/options"
-       wmakeFilesAndOptions
-   fi
-   ;;
+    subType=App
+    Type=".C"
+    ;;
 *)
-   usage "unknown type"
-   ;;
+    usage "unknown type"
+    ;;
 esac
+[ "$#" -eq 2 ] || usage "wrong number of arguments"
+shift 2
 
 
-fileName=$2$suffix.$fileType
+fileName="$className$Type"
 
-if [ -e "$fileName" ]; then
-   echo "Cannot make $fileName, file exists"
-   exit 1
+
+echo "$Script: Creating new interface file $fileName"
+if [ -e "$fileName" ]
+then
+    echo "   Error: file exists"
+    exit 1
 fi
 
-echo $Script: Creating new interface file $fileName
-sed s/className/$2/g \
-    $WM_PROJECT_DIR/bin/foamTemplates/source/$template.$fileType > $fileName
+
+# process class name
+sed "s/CLASSNAME/$className/g" $Template$subType$Type > $fileName
+
+
+if [ "$subType" = App -a ! -d Make ]
+then
+    wmakeFilesAndOptions
+fi
 
 #------------------------------------------------------------------------------
diff --git a/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.C b/bin/templates/sourceTemplate/_TemplateTemplate.C
similarity index 78%
rename from bin/foamTemplates/sourceTemplate/foamTemplateTemplate.C
rename to bin/templates/sourceTemplate/_TemplateTemplate.C
index 5acafb25e7..c73d5043a1 100644
--- a/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.C
+++ b/bin/templates/sourceTemplate/_TemplateTemplate.C
@@ -24,12 +24,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "ClassName.H"
+#include "CLASSNAME.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<TemplateClassArgument>
-const dataType Foam::ClassName<TemplateArgument>::staticData();
+const dataType Foam::CLASSNAME<TemplateArgument>::staticData();
 
 
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
@@ -38,7 +38,7 @@ const dataType Foam::ClassName<TemplateArgument>::staticData();
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<TemplateClassArgument>
-Foam::ClassName<TemplateArgument>::ClassName()
+Foam::CLASSNAME<TemplateArgument>::CLASSNAME()
 :
     baseClassName(),
     data_()
@@ -46,7 +46,7 @@ Foam::ClassName<TemplateArgument>::ClassName()
 
 
 template<TemplateClassArgument>
-Foam::ClassName<TemplateArgument>::ClassName(const dataType& data)
+Foam::CLASSNAME<TemplateArgument>::CLASSNAME(const dataType& data)
 :
     baseClassName(),
     data_(data)
@@ -54,12 +54,12 @@ Foam::ClassName<TemplateArgument>::ClassName(const dataType& data)
 
 
 template<TemplateClassArgument>
-Foam::ClassName<TemplateArgument>::ClassName
+Foam::CLASSNAME<TemplateArgument>::CLASSNAME
 (
-    const ClassName<TemplateArgument>&
+    const CLASSNAME<TemplateArgument>&
 )
 :
-    baseClassName(),
+    baseCLASSNAME(),
     data_()
 {}
 
@@ -67,12 +67,12 @@ Foam::ClassName<TemplateArgument>::ClassName
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<TemplateClassArgument>
-Foam::autoPtr<Foam::ClassName<TemplateArgument> >
-Foam::ClassName<TemplateArgument>::New()
+Foam::autoPtr<Foam::CLASSNAME<TemplateArgument> >
+Foam::CLASSNAME<TemplateArgument>::New()
 {
-    return autoPtr<ClassName<TemplateArgument> >
+    return autoPtr<CLASSNAME<TemplateArgument> >
     (
-        new ClassName<TemplateArgument>
+        new CLASSNAME<TemplateArgument>
     );
 }
 
@@ -80,7 +80,7 @@ Foam::ClassName<TemplateArgument>::New()
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<TemplateClassArgument>
-Foam::ClassName<TemplateArgument>::~ClassName()
+Foam::CLASSNAME<TemplateArgument>::~CLASSNAME()
 {}
 
 
@@ -96,9 +96,9 @@ Foam::ClassName<TemplateArgument>::~ClassName()
 // * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
 
 template<TemplateClassArgument>
-void Foam::ClassName<TemplateArgument>::operator=
+void Foam::CLASSNAME<TemplateArgument>::operator=
 (
-    const ClassName<TemplateArgument>& rhs
+    const CLASSNAME<TemplateArgument>& rhs
 )
 {
     // Check for assignment to self
@@ -106,8 +106,8 @@ void Foam::ClassName<TemplateArgument>::operator=
     {
         FatalErrorIn
         (
-            "Foam::ClassName<TemplateArgument>::operator="
-            "(const Foam::ClassName<TemplateArgument>&)"
+            "Foam::CLASSNAME<TemplateArgument>::operator="
+            "(const Foam::CLASSNAME<TemplateArgument>&)"
         )   << "Attempted assignment to self"
             << abort(FatalError);
     }
diff --git a/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H b/bin/templates/sourceTemplate/_TemplateTemplate.H
similarity index 77%
rename from bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H
rename to bin/templates/sourceTemplate/_TemplateTemplate.H
index 76bdd55860..6e24ddda2a 100644
--- a/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H
+++ b/bin/templates/sourceTemplate/_TemplateTemplate.H
@@ -23,19 +23,19 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::ClassName
+    Foam::CLASSNAME
 
 Description
 
 SourceFiles
-    ClassNameI.H
-    ClassName.C
-    ClassNameIO.C
+    CLASSNAMEI.H
+    CLASSNAME.C
+    CLASSNAMEIO.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef ClassName_H
-#define ClassName_H
+#ifndef CLASSNAME_H
+#define CLASSNAME_H
 
 #include ".H"
 
@@ -51,21 +51,21 @@ class someClass;
 // Forward declaration of friend functions and operators
 
 template<TemplateClassArgument>
-class ClassName;
+class CLASSNAME;
 
 template<TemplateClassArgument>
-Istream& operator>>(Istream&, ClassName<TemplateArgument>&);
+Istream& operator>>(Istream&, CLASSNAME<TemplateArgument>&);
 
 template<TemplateClassArgument>
-Ostream& operator<<(Ostream&, const ClassName<TemplateArgument>&);
+Ostream& operator<<(Ostream&, const CLASSNAME<TemplateArgument>&);
 
 
 /*---------------------------------------------------------------------------*\
-                         Class ClassName Declaration
+                         Class CLASSNAME Declaration
 \*---------------------------------------------------------------------------*/
 
 template<TemplateClassArgument>
-class ClassName
+class CLASSNAME
 :
     public baseClassName
 {
@@ -77,10 +77,10 @@ class ClassName
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        ClassName(const ClassName<TemplateArgument>&);
+        CLASSNAME(const CLASSNAME<TemplateArgument>&);
 
         //- Disallow default bitwise assignment
-        void operator=(const ClassName<TemplateArgument>&);
+        void operator=(const CLASSNAME<TemplateArgument>&);
 
 
 public:
@@ -94,33 +94,33 @@ public:
     // Constructors
 
         //- Construct null
-        ClassName();
+        CLASSNAME();
 
         //- Construct from components
-        ClassName(const dataType& data);
+        CLASSNAME(const dataType& data);
 
         //- Construct from Istream
-        ClassName(Istream&);
+        CLASSNAME(Istream&);
 
         //- Construct as copy
-        ClassName(const ClassName<TemplateArgument>&);
+        CLASSNAME(const CLASSNAME<TemplateArgument>&);
 
 
     // Selectors
 
         //- Select null constructed
-        static autoPtr<ClassName<TemplateArgument> > New();
+        static autoPtr<CLASSNAME<TemplateArgument> > New();
 
 
     //- Destructor
-    ~ClassName();
+    ~CLASSNAME();
 
 
     // Member Functions
 
     // Member Operators
 
-        void operator=(const ClassName<TemplateArgument>&);
+        void operator=(const CLASSNAME<TemplateArgument>&);
 
 
     // Friend Functions
@@ -130,10 +130,10 @@ public:
     // IOstream Operators
 
         friend Istream& operator>> <TemplateArgument>
-        (Istream&, ClassName<TemplateArgument>&);
+        (Istream&, CLASSNAME<TemplateArgument>&);
 
         friend Ostream& operator<< <TemplateArgument>
-        (Ostream&, const ClassName<TemplateArgument>&);
+        (Ostream&, const CLASSNAME<TemplateArgument>&);
 };
 
 
@@ -143,12 +143,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "ClassNameI.H"
+#include "CLASSNAMEI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "ClassName.C"
+#   include "CLASSNAME.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/bin/foamTemplates/sourceTemplate/foamTemplateTemplateI.H b/bin/templates/sourceTemplate/_TemplateTemplateI.H
similarity index 100%
rename from bin/foamTemplates/sourceTemplate/foamTemplateTemplateI.H
rename to bin/templates/sourceTemplate/_TemplateTemplateI.H
diff --git a/bin/foamTemplates/sourceTemplate/foamTemplateTemplateIO.C b/bin/templates/sourceTemplate/_TemplateTemplateIO.C
similarity index 85%
rename from bin/foamTemplates/sourceTemplate/foamTemplateTemplateIO.C
rename to bin/templates/sourceTemplate/_TemplateTemplateIO.C
index 1c805f6f6a..9453630b68 100644
--- a/bin/foamTemplates/sourceTemplate/foamTemplateTemplateIO.C
+++ b/bin/templates/sourceTemplate/_TemplateTemplateIO.C
@@ -24,13 +24,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "ClassName.H"
+#include "CLASSNAME.H"
 #include "IOstreams.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<TemplateClassArgument>
-Foam::ClassName<TemplateArgument>::ClassName(Istream& is)
+Foam::CLASSNAME<TemplateArgument>::CLASSNAME(Istream& is)
 :
     base1(is),
     base2(is),
@@ -38,7 +38,7 @@ Foam::ClassName<TemplateArgument>::ClassName(Istream& is)
     member2(is)
 {
     // Check state of Istream
-    is.check("Foam::ClassName<TemplateArgument>::ClassName(Foam::Istream&)");
+    is.check("Foam::CLASSNAME<TemplateArgument>::CLASSNAME(Foam::Istream&)");
 }
 
 
@@ -48,14 +48,14 @@ template<TemplateClassArgument>
 Foam::Istream& Foam::operator>>
 (
     Istream& is,
-    ClassName<TemplateArgument>&
+    CLASSNAME<TemplateArgument>&
 )
 {
     // Check state of Istream
     is.check
     (
         "Foam::Istream& Foam::operator>>"
-        "(Foam::Istream&, Foam::ClassName<TemplateArgument>&)"
+        "(Foam::Istream&, Foam::CLASSNAME<TemplateArgument>&)"
     );
 
     return is;
@@ -66,14 +66,14 @@ template<TemplateClassArgument>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const ClassName<TemplateArgument>&
+    const CLASSNAME<TemplateArgument>&
 )
 {
     // Check state of Ostream
     os.check
     (
         "Foam::Ostream& Foam::operator<<"
-        "(Ostream&, const ClassName<TemplateArgument>&)"
+        "(Ostream&, const CLASSNAME<TemplateArgument>&)"
     );
 
     return os;
diff --git a/bin/foamTemplates/sourceTemplate/newSourceTemplate b/bin/templates/sourceTemplate/foamNewTemplate
similarity index 74%
rename from bin/foamTemplates/sourceTemplate/newSourceTemplate
rename to bin/templates/sourceTemplate/foamNewTemplate
index b62a7f4c0e..edf4fd3bce 100755
--- a/bin/foamTemplates/sourceTemplate/newSourceTemplate
+++ b/bin/templates/sourceTemplate/foamNewTemplate
@@ -24,13 +24,14 @@
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 # Script
-#     newSourceTemplate
+#     foamNewTemplate
 #
 # Description
 #     Create a new standard OpenFOAM templated source file
 #
 #------------------------------------------------------------------------------
 Script=${0##*/}
+Template="$WM_PROJECT_DIR/bin/templates/sourceTemplate/_TemplateTemplate"
 
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
@@ -46,51 +47,50 @@ USAGE
     exit 1
 }
 
-if [ "$#" -le 2 ]; then
-   usage "wrong number of arguments, expected 3 (or more)"
-fi
+# this implicitly covers a lone -help
+[ "$#" -gt 1 ] || usage
+
+
+className="$2"
+unset Type
 
-unset suffix fileType
 case "$1" in
+-h | -help)
+    usage
+    ;;
 C|H)
-   Template=Template
-   fileType=$1
-   className=$2
-   ;;
+    Type=".$1"
+    ;;
 I)
-   suffix=$1
-   Template=TemplateI
-   fileType=H
-   className=$2
-   ;;
+    Type="$1.H"
+    ;;
 IO)
-   suffix=$1
-   Template=TemplateIO
-   fileType=C
-   className=$2
-   ;;
+    Type="$1.C"
+    ;;
 *)
-   usage "unknown type"
-   ;;
+    usage "unknown type"
+    ;;
 esac
+[ "$#" -ge 3 ] || usage "wrong number of arguments"
+shift 2
+
+fileName="$className$Type"
 
 
-fileName=$className$suffix.$fileType
-
-if [ -e "$fileName" ]; then
-   echo "Cannot make $fileName, file exists"
-   exit 1
+echo "$Script: Creating new template interface file $fileName"
+if [ -e "$fileName" ]
+then
+    echo "   Error: file exists"
+    exit 1
 fi
 
-shift 2
-echo "$Script: Creating new interface file $fileName"
 
 # process class name
-sed -e "s/ClassName/$className/g" \
-    $WM_PROJECT_DIR/bin/foamTemplates/sourceTemplate/foamTemplate$Template.$fileType > $fileName.1
+sed -e "s/CLASSNAME/$className/g" $Template$Type > $fileName.1
+
 
 # process template arguments
-for tArg in $*
+for tArg
 do
     sed -e "s/TemplateClassArgument/class $tArg, TemplateClassArgument/g" \
         -e "s/TemplateArgument/$tArg, TemplateArgument/g" \
@@ -99,7 +99,8 @@ do
     mv $fileName.2 $fileName.1
 done
 
-# remove remaining ", Template argument"
+
+# remove remaining ", Template .."
 sed -e "s/, TemplateClassArgument//g" \
     -e "s/, TemplateArgument//g" \
     $fileName.1 > $fileName
diff --git a/bin/foamLog.db b/bin/tools/foamLog.db
similarity index 100%
rename from bin/foamLog.db
rename to bin/tools/foamLog.db
diff --git a/etc/controlDict b/etc/controlDict
index a76ef3c335..c1d7416515 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -366,7 +366,6 @@ DebugSwitches
     directMappedVelocityFlux 0;
     directionMixed      0;
     directional         0;
-    disallowDefaultFvsPatchField 0;
     disallowGenericFvPatchField 0;
     disallowGenericPointPatchField 0;
     disallowGenericPolyPatch    0;
diff --git a/etc/settings.csh b/etc/settings.csh
index 4370744be4..ad327c5e57 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -89,6 +89,11 @@ case OpenFOAM:
         _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
     breaksw
+    case Gcc44:
+        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+    breaksw
     case Gcc43:
         setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
         _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
diff --git a/etc/settings.sh b/etc/settings.sh
index 9d39e1eb86..074a21bb17 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -105,6 +105,11 @@ OpenFOAM)
         _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
         ;;
+    Gcc44)
+        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        ;;
     Gcc43)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
         _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
diff --git a/src/Allwmake b/src/Allwmake
index 5473238ed3..ebef2d8d0d 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -1,13 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
-if [ "$PWD" != "$WM_PROJECT_DIR/src" ]
-then
-    echo "Error: Current directory in not \$WM_PROJECT_DIR/src"
-    echo "    The environment variable are not consistent with the installation."
+wmakeCheckPwd "$WM_PROJECT_DIR/src" || {
+    echo "Error: Current directory is not \$WM_PROJECT_DIR/src"
+    echo "    The environment variables are inconsistent with the installation."
     echo "    Check the OpenFOAM entries in your dot-files and source them."
     exit 1
-fi
+}
 
 set -x
 
@@ -32,6 +31,7 @@ decompositionMethods/Allwmake
 
 wmake libso meshTools
 wmake libso finiteVolume
+wmake libso genericPatchFields
 
 wmake libso sampling
 
diff --git a/src/ODE/ODESolvers/ODESolver/newODESolver.C b/src/ODE/ODESolvers/ODESolver/newODESolver.C
index f10bf0bbd1..9f3472ce0c 100644
--- a/src/ODE/ODESolvers/ODESolver/newODESolver.C
+++ b/src/ODE/ODESolvers/ODESolver/newODESolver.C
@@ -47,7 +47,7 @@ Foam::autoPtr<Foam::ODESolver> Foam::ODESolver::New
         )   << "Unknown ODESolver type "
             << ODESolverTypeName << endl << endl
             << "Valid  ODESolvers are : " << endl
-            << ODEConstructorTablePtr_->toc()
+            << ODEConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 8e2f04c359..7bff2143ec 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -345,6 +345,9 @@ $(globalMeshData)/globalIndex.C
 
 $(polyMesh)/syncTools/syncTools.C
 
+zone = $(polyMesh)/zones/zone
+$(zone)/zone.C
+
 cellZone = $(polyMesh)/zones/cellZone
 $(cellZone)/cellZone.C
 $(cellZone)/newCellZone.C
@@ -478,7 +481,6 @@ $(pointPatchFields)/pointPatchField/pointPatchFields.C
 
 basicPointPatchFields = $(pointPatchFields)/basic
 $(basicPointPatchFields)/calculated/calculatedPointPatchFields.C
-$(basicPointPatchFields)/generic/genericPointPatchFields.C
 $(basicPointPatchFields)/coupled/coupledPointPatchFields.C
 $(basicPointPatchFields)/value/valuePointPatchFields.C
 $(basicPointPatchFields)/fixedValue/fixedValuePointPatchFields.C
diff --git a/src/OpenFOAM/Make/options b/src/OpenFOAM/Make/options
index c5c5809076..4eba86ae56 100644
--- a/src/OpenFOAM/Make/options
+++ b/src/OpenFOAM/Make/options
@@ -1,5 +1,4 @@
-EXE_INC = \
-    -I$(WM_THIRD_PARTY_DIR)/zlib-1.2.3
+EXE_INC =
 
 LIB_LIBS = \
     $(FOAM_LIBBIN)/libOSspecific.o \
diff --git a/src/OpenFOAM/algorithms/MeshWave/MeshWave.C b/src/OpenFOAM/algorithms/MeshWave/MeshWave.C
index 30538359ab..5049fe05a7 100644
--- a/src/OpenFOAM/algorithms/MeshWave/MeshWave.C
+++ b/src/OpenFOAM/algorithms/MeshWave/MeshWave.C
@@ -22,22 +22,10 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "MeshWave.H"
 #include "polyMesh.H"
-#include "processorPolyPatch.H"
-#include "cyclicPolyPatch.H"
-#include "OPstream.H"
-#include "IPstream.H"
-#include "PstreamReduceOps.H"
-#include "debug.H"
-#include "typeInfo.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index c2034a69ea..10bcadc761 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -231,7 +231,6 @@ Foam::HashTable<T, Key, Hash>::find
 }
 
 
-// Return the table of contents
 template<class T, class Key, class Hash>
 Foam::List<Key> Foam::HashTable<T, Key, Hash>::toc() const
 {
@@ -247,6 +246,16 @@ Foam::List<Key> Foam::HashTable<T, Key, Hash>::toc() const
 }
 
 
+template<class T, class Key, class Hash>
+Foam::List<Key> Foam::HashTable<T, Key, Hash>::sortedToc() const
+{
+    List<Key> sortedList = this->toc();
+    sort(sortedList);
+
+    return sortedList;
+}
+
+
 template<class T, class Key, class Hash>
 bool Foam::HashTable<T, Key, Hash>::set
 (
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 3871db3a50..666b93ebec 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -198,6 +198,9 @@ public:
             //- Return the table of contents
             List<Key> toc() const;
 
+            //- Return the table of contents as a sorted list
+            List<Key> sortedToc() const;
+
             //- Print information
             Ostream& printInfo(Ostream&) const;
 
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
index a7827ec6cb..5afd48d0f3 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
@@ -69,6 +69,14 @@ public:
             const UList<label>&
         );
 
+        //- Construct given the complete list and by transferring addressing
+        inline BiIndirectList
+        (
+            const UList<T>& posList,
+            const UList<T>& negList,
+            const Xfer< List<label> >&
+        );
+
 
     // Member Functions
 
@@ -80,12 +88,17 @@ public:
             inline const UList<T>& posList() const;
             inline const UList<T>& negList() const;
             inline const List<label>& addressing() const;
-            inline List<label>& addressing();
 
             //- Calculate index given whether index is into posList or negList
             inline static label posIndex(const label);
             inline static label negIndex(const label);
 
+        // Edit
+
+            //- Reset addressing
+            inline void resetAddressing(const UList<label>&);
+            inline void resetAddressing(const Xfer< List<label> >&);
+
 
         // Member Operators
 
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
index b30769d107..e6f33f709e 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
@@ -40,6 +40,20 @@ inline Foam::BiIndirectList<T>::BiIndirectList
 {}
 
 
+template<class T>
+inline Foam::BiIndirectList<T>::BiIndirectList
+(
+    const UList<T>& posList,
+    const UList<T>& negList,
+    const Xfer< List<label> >& addr
+)
+:
+    posList_(const_cast<UList<T>&>(posList)),
+    negList_(const_cast<UList<T>&>(negList)),
+    addressing_(addr)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
@@ -79,9 +93,22 @@ inline const Foam::List<Foam::label>& Foam::BiIndirectList<T>::addressing()
 
 
 template<class T>
-inline Foam::List<Foam::label>& Foam::BiIndirectList<T>::addressing()
+inline void Foam::BiIndirectList<T>::resetAddressing
+(
+    const UList<label>& addr
+)
 {
-    return addressing_;
+    addressing_ = addr;
+}
+
+
+template<class T>
+inline void Foam::BiIndirectList<T>::resetAddressing
+(
+    const Xfer< List<label> >& addr
+)
+{
+    addressing_.transfer(addr());
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index 776d7b65db..cfdc03d7dc 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -63,6 +63,8 @@ public:
         //- Construct given the complete list and the addressing array
         inline IndirectList(const UList<T>&, const UList<label>&);
 
+        //- Construct given the complete list and by transferring addressing
+        inline IndirectList(const UList<T>&, const Xfer< List<label> >&);
 
     // Member Functions
 
@@ -77,7 +79,8 @@ public:
         // Edit
 
             //- Reset addressing
-            void resetAddressing(const UList<label>&);
+            inline void resetAddressing(const UList<label>&);
+            inline void resetAddressing(const Xfer< List<label> >&);
 
 
         // Member Operators
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
index 0ae5311d97..a1e2bf9a54 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
@@ -38,6 +38,18 @@ inline Foam::IndirectList<T>::IndirectList
 {}
 
 
+template<class T>
+inline Foam::IndirectList<T>::IndirectList
+(
+    const UList<T>& completeList,
+    const Xfer< List<label> >& addr
+)
+:
+    completeList_(const_cast<UList<T>&>(completeList)),
+    addressing_(addr)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
@@ -78,6 +90,16 @@ inline void Foam::IndirectList<T>::resetAddressing
 }
 
 
+template<class T>
+inline void Foam::IndirectList<T>::resetAddressing
+(
+    const Xfer< List<label> >& addr
+)
+{
+    addressing_.transfer(addr());
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index 08422fd9ba..fb6d9a0678 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -162,13 +162,14 @@ Foam::List<T>::List(const UList<T>& a, const unallocLabelList& map)
 {
     if (this->size_)
     {
+        // Note:cannot use List_ELEM since third argument has to be index.
+
         this->v_ = new T[this->size_];
 
-        List_ACCESS(T, (*this), vp);
-        List_CONST_ACCESS(T, a, ap);
-        List_FOR_ALL(map, i)
-            List_ELEM((*this), vp, i) = List_ELEM(a, ap, (map[i]));
-        List_END_FOR_ALL
+        forAll(*this, i)
+        {
+            this->v_[i] = a[map[i]];
+        }
     }
 }
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C
index 3d889af961..4ad3f6bbec 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C
@@ -78,7 +78,15 @@ inline void Foam::IPstream::readFromBuffer
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::IPstream::~IPstream()
-{}
+{
+    if (bufPosition_ < messageSize_)
+    {
+        FatalErrorIn("IPstream::~IPstream()")
+            << "Message not fully consumed. messageSize:" << messageSize_
+            << " bytes of which only " << bufPosition_
+            << " consumed." << Foam::abort(FatalError);
+    }
+}
 
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index dff94c259f..5e8e5cbbb7 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -350,6 +350,31 @@ public:
                 return oldCommsType;
             }
 
+            //- Transfer buffer
+            const List<char>& buf() const
+            {
+                return buf_;
+            }
+
+            //- Transfer buffer
+            List<char>& buf()
+            {
+                return buf_;
+            }
+
+            //- Current buffer read/write location
+            int bufPosition() const
+            {
+                return bufPosition_;
+            }
+
+            //- Current buffer read/write location
+            int& bufPosition()
+            {
+                return bufPosition_;
+            }
+
+
         //- Exit program
         static void exit(int errnum = 1);
 
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
index 482abb8bf3..d98d75d076 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
@@ -42,41 +42,47 @@ char Foam::ISstream::nextValid()
         while (get(c) && isspace(c))
         {}
 
-        // Return if stream is bad
+        // Return if stream is bad - ie, previous get() failed
         if (bad() || isspace(c))
         {
-            return 0;
+            break;
         }
 
         // Is this the start of a C/C++ comment?
         if (c == '/')
         {
-            // If cannot get another character, return this one
             if (!get(c))
             {
+                // cannot get another character - return this one
                 return '/';
             }
 
             if (c == '/')
             {
-                // This is the start of a C++ style one-line comment
+                // C++ style single-line comment - skip through past end-of-line
                 while (get(c) && c != '\n')
                 {}
             }
             else if (c == '*')
             {
-                // This is the start of a C style comment
+                // within a C-style comment
                 while (true)
                 {
+                    // search for end of C-style comment - '*/'
                     if (get(c) && c == '*')
                     {
-                        if (get(c) && c == '/')
+                        if (get(c))
                         {
-                            break;
-                        }
-                        else
-                        {
-                            putback(c);
+                            if (c == '/')
+                            {
+                                // matched '*/'
+                                break;
+                            }
+                            else if (c == '*')
+                            {
+                                // check again
+                                putback(c);
+                            }
                         }
                     }
 
@@ -86,23 +92,28 @@ char Foam::ISstream::nextValid()
                     }
                 }
             }
-            else  // A lone '/' so return it.
+            else
             {
+                // The '/' did not start a C/C++ comment - return it
                 putback(c);
                 return '/';
             }
         }
-        else  // c is a valid character so return it
+        else
         {
+            // a valid character - return it
             return c;
         }
     }
+
+    return 0;
 }
 
 
 Foam::Istream& Foam::ISstream::read(token& t)
 {
-    static char numberBuffer[100];
+    static const int maxLen = 128;
+    static char buf[maxLen];
 
     // Return the put back token if it exists
     if (Istream::getBack(t))
@@ -113,8 +124,8 @@ Foam::Istream& Foam::ISstream::read(token& t)
     // Assume that the streams supplied are in working order.
     // Lines are counted by '\n'
 
-    // Get next 'valid character': i.e. proceed through any white space
-    // and/or comments until a semantically valid character is hit upon.
+    // Get next 'valid character': i.e. proceed through any whitespace
+    // and/or comments until a semantically valid character is found
 
     char c = nextValid();
 
@@ -131,7 +142,7 @@ Foam::Istream& Foam::ISstream::read(token& t)
     // Analyse input starting with this character.
     switch (c)
     {
-        // First check for punctuation characters.
+        // Check for punctuation first
 
         case token::END_STATEMENT :
         case token::BEGIN_LIST :
@@ -144,7 +155,7 @@ Foam::Istream& Foam::ISstream::read(token& t)
         case token::COMMA :
         case token::ASSIGN :
         case token::ADD :
-     // case token::SUBTRACT : // Handled later as the posible start of a number
+        // NB: token::SUBTRACT handled later as the possible start of a Number
         case token::MULTIPLY :
         case token::DIVIDE :
         {
@@ -152,121 +163,163 @@ Foam::Istream& Foam::ISstream::read(token& t)
             return *this;
         }
 
-        // Strings: enclosed by double quotes.
+
+        // String: enclosed by double quotes.
         case token::BEGIN_STRING :
         {
             putback(c);
             string* sPtr = new string;
 
-            if (!read(*sPtr).bad())
-            {
-                t = sPtr;
-            }
-            else
+            if (read(*sPtr).bad())
             {
                 delete sPtr;
                 t.setBad();
             }
+            else
+            {
+                t = sPtr;
+            }
+
             return *this;
         }
 
-        // Numbers: do not distinguish at this point between Types.
+
+        // Number: integer or floating point
+        //
+        // ideally match the equivalent of this regular expression
+        //
+        //    /[-+]?([0-9]+\.?[0-9]*|\.[0-9]+)([Ee][-+]?[0-9]+)?/
+        //
         case '-' :
         case '.' :
         case '0' : case '1' : case '2' : case '3' : case '4' :
         case '5' : case '6' : case '7' : case '8' : case '9' :
         {
-            bool isScalar = false;
+            bool asLabel = (c != '.');
 
-            if (c == '.')
-            {
-                isScalar = true;
-            }
-
-            int i=0;
-            numberBuffer[i++] = c;
+            int nChar = 0;
+            buf[nChar++] = c;
 
+            // get everything that could resemble a number and let
+            // strtod() determine the validity
             while
             (
                 is_.get(c)
              && (
                     isdigit(c)
-                 || c == '.'
-                 || c == 'e'
-                 || c == 'E'
                  || c == '+'
                  || c == '-'
+                 || c == '.'
+                 || c == 'E'
+                 || c == 'e'
                 )
             )
             {
-                numberBuffer[i++] = c;
-
-                if (!isdigit(c))
+                if (asLabel)
                 {
-                    isScalar = true;
+                    asLabel = isdigit(c);
+                }
+
+                buf[nChar++] = c;
+                if (nChar == maxLen)
+                {
+                    // runaway argument - avoid buffer overflow
+                    buf[maxLen-1] = '\0';
+
+                    FatalIOErrorIn("ISstream::read(token&)", *this)
+                        << "number '" << buf << "...'\n"
+                        << "    is too long (max. " << maxLen << " characters)"
+                        << exit(FatalIOError);
+
+                    t.setBad();
+                    return *this;
                 }
             }
-            numberBuffer[i] = '\0';
+            buf[nChar] = '\0';
 
             setState(is_.rdstate());
-
-            if (!is_.bad())
+            if (is_.bad())
             {
-                is_.putback(c);
-
-                if (i == 1 && numberBuffer[0] == '-')
-                {
-                    t = token::punctuationToken(token::SUBTRACT);
-                }
-                else if (isScalar)
-                {
-                    t = scalar(atof(numberBuffer));
-                }
-                else
-                {
-                    long lt = atol(numberBuffer);
-                    t = label(lt);
-
-                    // If the integer is too large to be represented as a label
-                    // return it as a scalar
-                    if (t.labelToken() != lt)
-                    {
-                        isScalar = true;
-                        t = scalar(atof(numberBuffer));
-                    }
-                }
+                t.setBad();
             }
             else
             {
-                t.setBad();
+                is_.putback(c);
+
+                if (nChar == 1 && buf[0] == '-')
+                {
+                    // a single '-' is punctuation
+                    t = token::punctuationToken(token::SUBTRACT);
+                }
+                else
+                {
+                    char *endptr;
+
+                    if (asLabel)
+                    {
+                        long longVal(strtol(buf, &endptr, 10));
+                        t = label(longVal);
+
+                        // return as a scalar if doesn't fit in a label
+                        if (t.labelToken() != longVal)
+                        {
+                            t = scalar(strtod(buf, &endptr));
+                        }
+                    }
+                    else
+                    {
+                        scalar scalarVal(strtod(buf, &endptr));
+                        t = scalarVal;
+
+// ---------------------------------------
+// this would also be possible if desired:
+// ---------------------------------------
+//                        // return as a label when possible
+//                        // eg, 1E6 -> 1000000
+//                        if (scalarVal <= labelMax && scalarVal >= labelMin)
+//                        {
+//                            label labelVal(scalarVal);
+//
+//                            if (labelVal == scalarVal)
+//                            {
+//                                t = labelVal;
+//                            }
+//                        }
+                    }
+
+                    // not everything converted: bad format or trailing junk
+                    if (*endptr)
+                    {
+                        t.setBad();
+                    }
+                }
             }
 
             return *this;
         }
 
-        // Should be a word (which can be a single character)
+
+        // Should be a word (which can also be a single character)
         default:
         {
             putback(c);
             word* wPtr = new word;
 
-            if (!read(*wPtr).bad())
-            {
-                if (token::compound::isCompound(*wPtr))
-                {
-                    t = token::compound::New(*wPtr, *this).ptr();
-                    delete wPtr;
-                }
-                else
-                {
-                    t = wPtr;
-                }
-            }
-            else
+            if (read(*wPtr).bad())
             {
                 delete wPtr;
                 t.setBad();
             }
+            else if (token::compound::isCompound(*wPtr))
+            {
+                t = token::compound::New(*wPtr, *this).ptr();
+                delete wPtr;
+            }
+            else
+            {
+                t = wPtr;
+            }
+
             return *this;
         }
     }
@@ -286,69 +339,64 @@ Foam::Istream& Foam::ISstream::read(word& str)
     static const int errLen = 80; // truncate error message for readability
     static char buf[maxLen];
 
-    register int i = 0;
-    register int bc = 0;
+    register int nChar = 0;
+    register int listDepth = 0;
     char c;
 
     while (get(c) && word::valid(c))
     {
-        if (fail())
-        {
-            if (i < maxLen-1)
-            {
-                buf[i] = '\0';
-            }
-            else
-            {
-                buf[maxLen-1] = '\0';
-            }
-            buf[errLen] = '\0';
-
-            FatalIOErrorIn("ISstream::read(word&)", *this)
-                << "problem while reading word '" << buf << "'\n"
-                << exit(FatalIOError);
-
-            return *this;
-        }
-
-        if (i >= maxLen)
-        {
-            buf[maxLen-1] = '\0';
-            buf[errLen] = '\0';
-
-            FatalIOErrorIn("ISstream::read(word&)", *this)
-                << "word '" << buf << "' ...\n"
-                << "    is too long (max. " << maxLen << " characters)"
-                << exit(FatalIOError);
-
-            return *this;
-        }
-
         if (c == token::BEGIN_LIST)
         {
-            bc++;
+            listDepth++;
         }
         else if (c == token::END_LIST)
         {
-            bc--;
-
-            if (bc == -1)
+            if (listDepth)
+            {
+                listDepth--;
+            }
+            else
             {
                 break;
             }
         }
 
-        buf[i++] = c;
+        buf[nChar++] = c;
+        if (nChar == maxLen)
+        {
+            buf[errLen] = '\0';
+
+            FatalIOErrorIn("ISstream::read(word&)", *this)
+                << "word '" << buf << "...'\n"
+                << "    is too long (max. " << maxLen << " characters)"
+                << exit(FatalIOError);
+
+            return *this;
+        }
     }
 
-    if (i == 0)
+    // we could probably skip this check
+    if (bad())
+    {
+        buf[errLen] = buf[nChar] = '\0';
+
+        FatalIOErrorIn("ISstream::read(word&)", *this)
+            << "problem while reading word '" << buf << "...' after "
+            << nChar << " characters\n"
+            << exit(FatalIOError);
+
+        return *this;
+    }
+
+    if (nChar == 0)
     {
         FatalIOErrorIn("ISstream::read(word&)", *this)
             << "invalid first character found : " << c
             << exit(FatalIOError);
     }
 
-    buf[i] = '\0';        // Terminator
+    // done reading
+    buf[nChar] = '\0';
     str = buf;
     putback(c);
 
@@ -366,8 +414,6 @@ Foam::Istream& Foam::ISstream::read(string& str)
 
     if (!get(c))
     {
-        buf[0] = '\0';
-
         FatalIOErrorIn("ISstream::read(string&)", *this)
             << "cannot read start of string"
             << exit(FatalIOError);
@@ -375,36 +421,32 @@ Foam::Istream& Foam::ISstream::read(string& str)
         return *this;
     }
 
-    char endTok = token::END_STRING;
-
     // Note, we could also handle single-quoted strings here (if desired)
     if (c != token::BEGIN_STRING)
     {
-        buf[0] = '\0';
-
         FatalIOErrorIn("ISstream::read(string&)", *this)
-            << "Incorrect start of string character"
+            << "Incorrect start of string character found : " << c
             << exit(FatalIOError);
 
         return *this;
     }
 
-    register int i = 0;
+    register int nChar = 0;
     bool escaped = false;
 
     while (get(c))
     {
-        if (c == endTok)
+        if (c == token::END_STRING)
         {
             if (escaped)
             {
                 escaped = false;
-                i--;    // overwrite backslash
+                nChar--;    // overwrite backslash
             }
             else
             {
-                // done reading string
-                buf[i] = '\0';
+                // done reading
+                buf[nChar] = '\0';
                 str = buf;
                 return *this;
             }
@@ -414,12 +456,11 @@ Foam::Istream& Foam::ISstream::read(string& str)
             if (escaped)
             {
                 escaped = false;
-                i--;    // overwrite backslash
+                nChar--;    // overwrite backslash
             }
             else
             {
-                buf[i] = '\0';
-                buf[errLen] = '\0';
+                buf[errLen] = buf[nChar] = '\0';
 
                 FatalIOErrorIn("ISstream::read(string&)", *this)
                     << "found '\\n' while reading string \""
@@ -438,10 +479,9 @@ Foam::Istream& Foam::ISstream::read(string& str)
             escaped = false;
         }
 
-        buf[i] = c;
-        if (i++ == maxLen)
+        buf[nChar++] = c;
+        if (nChar == maxLen)
         {
-            buf[maxLen-1] = '\0';
             buf[errLen] = '\0';
 
             FatalIOErrorIn("ISstream::read(string&)", *this)
@@ -455,8 +495,7 @@ Foam::Istream& Foam::ISstream::read(string& str)
 
 
     // don't worry about a dangling backslash if string terminated prematurely
-    buf[i] = '\0';
-    buf[errLen] = '\0';
+    buf[errLen] = buf[nChar] = '\0';
 
     FatalIOErrorIn("ISstream::read(string&)", *this)
         << "problem while reading string \"" << buf << "...\""
diff --git a/src/OpenFOAM/db/IOstreams/token/token.C b/src/OpenFOAM/db/IOstreams/token/token.C
index f74dbd7381..271ec286a7 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.C
+++ b/src/OpenFOAM/db/IOstreams/token/token.C
@@ -67,7 +67,7 @@ Foam::autoPtr<Foam::token::compound> Foam::token::compound::New
         FatalErrorIn("token::compound::New(const word&, Istream&)")
             << "Unknown compound type " << compoundType << nl << nl
             << "Valid compound types:" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index cc2c8e710d..f0c67306be 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -127,11 +127,10 @@ void Foam::Time::setControls()
         }
         else
         {
-            WarningIn("Time::setControls()")
-                << "    expected startTime, firstTime or latestTime"
-                << " found '" << startFrom
-                << "' in dictionary " << controlDict_.name() << nl
-                << "    Setting time to " << startTime_ << endl;
+            FatalIOErrorIn("Time::setControls()", controlDict_)
+                << "expected startTime, firstTime or latestTime"
+                << " found '" << startFrom << "'"
+                << exit(FatalIOError);
         }
     }
 
@@ -151,10 +150,10 @@ void Foam::Time::setControls()
           > Pstream::nProcs()*deltaT_/10.0
         )
         {
-            FatalErrorIn("Time::setControls()")
+            FatalIOErrorIn("Time::setControls()", controlDict_)
                 << "Start time is not the same for all processors" << nl
                 << "processor " << Pstream::myProcNo() << " has startTime "
-                << startTime_ << exit(FatalError);
+                << startTime_ << exit(FatalIOError);
         }
     }
 
@@ -638,10 +637,10 @@ Foam::Time& Foam::Time::operator+=(const scalar deltaT)
 
 Foam::Time& Foam::Time::operator++()
 {
-    readModifiedObjects();
-
     if (!subCycling_)
     {
+        readModifiedObjects();
+
         if (timeIndex_ == startTimeIndex_)
         {
             functionObjects_.start();
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
index e386a30f20..b116494157 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
@@ -81,7 +81,8 @@ bool Foam::functionEntry::execute
         (
             "functionEntry::execute"
             "(const word& functionName, dictionary& parentDict, Istream&)"
-        )   << "Unknown functionEntry " << functionName
+        )   << "Unknown functionEntry '" << functionName
+            << "' in " << is.name() << " near line " << is.lineNumber()
             << endl << endl
             << "Valid functionEntries are :" << endl
             << executedictionaryIstreamMemberFunctionTablePtr_->toc()
@@ -126,7 +127,8 @@ bool Foam::functionEntry::execute
         (
             "functionEntry::execute"
             "(const word&, const dictionary&, primitiveEntry&, Istream&)"
-        )   << "Unknown functionEntry " << functionName
+        )   << "Unknown functionEntry '" << functionName
+            << "' in " << is.name() << " near line " << is.lineNumber()
             << endl << endl
             << "Valid functionEntries are :" << endl
             << executeprimitiveEntryIstreamMemberFunctionTablePtr_->toc()
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.C
index 32f6660465..223b251c43 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.C
@@ -26,6 +26,7 @@ License
 
 #include "removeEntry.H"
 #include "dictionary.H"
+#include "stringListOps.H"
 #include "IStringStream.H"
 #include "OStringStream.H"
 #include "addToMemberFunctionSelectionTable.H"
@@ -64,22 +65,12 @@ bool Foam::functionEntries::removeEntry::execute
     Istream& is
 )
 {
-    token currToken(is);
-    is.putBack(currToken);
+    wordList dictKeys = parentDict.toc();
+    labelList indices = findStrings<word>(readList<wordRe>(is), dictKeys);
 
-    if (currToken == token::BEGIN_LIST)
+    forAll(indices, indexI)
     {
-        wordList keys(is);
-
-        forAll(keys, keyI)
-        {
-            parentDict.remove(keys[keyI]);
-        }
-    }
-    else
-    {
-        word key(is);
-        parentDict.remove(key);
+        parentDict.remove(dictKeys[indices[indexI]]);
     }
 
     return true;
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
index b98da86e67..148f8e260e 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
@@ -28,13 +28,16 @@ Class
 Description
     Remove a dictionary entry.
 
-    The @c \#remove directive takes a word or a list of words. For example,
+    The @c \#remove directive takes a list or a single wordRe.
+    For example,
     @verbatim
         #remove entry0
-        #remove ( entry1 entry2 entry3 )
+        #remove ( entry1 entry2 entry3 otherEntry )
+        #remove "entry[1-3]"
+        #remove ( "entry[1-3]" otherEntry )
     @endverbatim
 
-    The removable only occurs in the current context.
+    The removal only occurs in the current context.
     Removing sub-entries or parent entries is not supported.
 
 SourceFiles
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index 3157cea04b..b07f5d790d 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -89,7 +89,7 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
         )   << "Unknown function type "
             << functionType << nl << nl
             << "Valid functions are : " << nl
-            << dictionaryConstructorTablePtr_->toc() << endl
+            << dictionaryConstructorTablePtr_->sortedToc() << endl
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C
index 0669f0e796..8efa87c3ec 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C
@@ -55,7 +55,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
             << patchFieldType
             << endl << endl
             << "Valid patchField types are :" << endl
-            << pointPatchConstructorTablePtr_->toc()
+            << pointPatchConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -111,7 +111,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
             )   << "Unknown patchField type " << patchFieldType
                 << " for patch type " << p.type() << endl << endl
                 << "Valid patchField types are :" << endl
-                << dictionaryConstructorTablePtr_->toc()
+                << dictionaryConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
     }
@@ -182,7 +182,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
         )   << "unknown patchTypefield type "
             << ptf.type() << endl << endl
             << "Valid patchField types are :" << endl
-            << patchMapperConstructorTablePtr_->toc()
+            << patchMapperConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 16f216adf6..845b852e95 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -60,8 +60,8 @@ Foam::argList::initValidTables dummyInitValidTables;
 // transform sequences with "(" ... ")" into string lists in the process
 bool Foam::argList::regroupArgv(int& argc, char**& argv)
 {
-    int level = 0;
     int nArgs = 0;
+    int listDepth = 0;
     string tmpString;
 
     // note: we also re-write directly into args_
@@ -70,16 +70,16 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
     {
         if (strcmp(argv[argI], "(") == 0)
         {
-            level++;
+            listDepth++;
             tmpString += "(";
         }
         else if (strcmp(argv[argI], ")") == 0)
         {
-            if (level >= 1)
+            if (listDepth)
             {
-                level--;
+                listDepth--;
                 tmpString += ")";
-                if (level == 0)
+                if (listDepth == 0)
                 {
                     args_[nArgs++] = tmpString;
                     tmpString.clear();
@@ -90,7 +90,7 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
                 args_[nArgs++] = argv[argI];
             }
         }
-        else if (level)
+        else if (listDepth)
         {
             // quote each string element
             tmpString += "\"";
@@ -117,6 +117,10 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
 // get rootPath_ / globalCase_ from one of the following forms
 //   * [-case dir]
 //   * cwd
+//
+// Also export FOAM_CASE and FOAM_CASENAME environment variables
+// so they can be used immediately (eg, in decomposeParDict)
+//
 void Foam::argList::getRootCase()
 {
     fileName casePath;
@@ -151,6 +155,26 @@ void Foam::argList::getRootCase()
     rootPath_   = casePath.path();
     globalCase_ = casePath.name();
     case_       = globalCase_;
+
+
+    // Set the case and case-name as an environment variable
+    if (rootPath_[0] == '/')
+    {
+        // absolute path - use as-is
+        setEnv("FOAM_CASE", rootPath_/globalCase_, true);
+        setEnv("FOAM_CASENAME", globalCase_, true);
+    }
+    else
+    {
+        // qualify relative path
+        fileName casePath = cwd()/rootPath_/globalCase_;
+        casePath.clean();
+
+        setEnv("FOAM_CASE", casePath, true);
+        setEnv("FOAM_CASENAME", casePath.name(), true);
+    }
+
+
 }
 
 
@@ -531,24 +555,6 @@ Foam::argList::argList
     }
     jobInfo.write();
 
-
-    // Set the case and case-name as an environment variable
-    if (rootPath_[0] == '/')
-    {
-        // absolute path - use as-is
-        setEnv("FOAM_CASE", rootPath_/globalCase_, true);
-        setEnv("FOAM_CASENAME", globalCase_, true);
-    }
-    else
-    {
-        // qualify relative path
-        fileName casePath = cwd()/rootPath_/globalCase_;
-        casePath.clean();
-
-        setEnv("FOAM_CASE", casePath, true);
-        setEnv("FOAM_CASENAME", casePath.name(), true);
-    }
-
     // Switch on signal trapping. We have to wait until after Pstream::init
     // since this sets up its own ones.
     sigFpe_.set(bannerEnabled);
diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C
index adb9371333..ed9fde5817 100644
--- a/src/OpenFOAM/graph/graph.C
+++ b/src/OpenFOAM/graph/graph.C
@@ -168,7 +168,7 @@ autoPtr<graph::writer> graph::writer::New(const word& graphFormat)
         )   << "Unknown graph format " << graphFormat
             << endl << endl
             << "Valid graph formats are : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
index c85cf074be..aa97913cf0 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
@@ -97,7 +97,7 @@ Foam::lduMatrix::preconditioner::New
             )   << "Unknown symmetric matrix preconditioner "
                 << name << nl << nl
                 << "Valid symmetric matrix preconditioners :" << endl
-                << symMatrixConstructorTablePtr_->toc()
+                << symMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
 
@@ -125,7 +125,7 @@ Foam::lduMatrix::preconditioner::New
             )   << "Unknown asymmetric matrix preconditioner "
                 << name << nl << nl
                 << "Valid asymmetric matrix preconditioners :" << endl
-                << asymMatrixConstructorTablePtr_->toc()
+                << asymMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
index 4ce5381fb1..6f4b38d147 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
@@ -98,7 +98,7 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
             )   << "Unknown symmetric matrix smoother "
                 << name << nl << nl
                 << "Valid symmetric matrix smoothers are :" << endl
-                << symMatrixConstructorTablePtr_->toc()
+                << symMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
 
@@ -127,7 +127,7 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
             )   << "Unknown asymmetric matrix smoother "
                 << name << nl << nl
                 << "Valid asymmetric matrix smoothers are :" << endl
-                << asymMatrixConstructorTablePtr_->toc()
+                << asymMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
index cb17295a3e..0114c0f08a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
@@ -77,7 +77,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
                 "lduMatrix::solver::New", solverControls
             )   << "Unknown symmetric matrix solver " << name << nl << nl
                 << "Valid symmetric matrix solvers are :" << endl
-                << symMatrixConstructorTablePtr_->toc()
+                << symMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
 
@@ -106,7 +106,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
                 "lduMatrix::solver::New", solverControls
             )   << "Unknown asymmetric matrix solver " << name << nl << nl
                 << "Valid asymmetric matrix solvers are :" << endl
-                << asymMatrixConstructorTablePtr_->toc()
+                << asymMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index 633b8e2f37..47e1d4dbd3 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -124,9 +124,9 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
             )   << "Unknown GAMGAgglomeration type "
                 << agglomeratorType << ".\n"
                 << "Valid algebraic GAMGAgglomeration types are :"
-                << lduMatrixConstructorTablePtr_->toc() << endl
+                << lduMatrixConstructorTablePtr_->sortedToc() << endl
                 << "Valid algebraic GAMGAgglomeration types are :"
-                << lduMeshConstructorTablePtr_->toc()
+                << lduMeshConstructorTablePtr_->sortedToc()
                 << exit(FatalError);
         }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C
index 61251878c1..a083dcae54 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::GAMGInterfaceField> Foam::GAMGInterfaceField::New
             "const lduInterfaceField& fineInterface)"
         )   << "Unknown GAMGInterfaceField type " << coupleType << ".\n"
             << "Valid GAMGInterfaceField types are :"
-            << lduInterfaceConstructorTablePtr_->toc()
+            << lduInterfaceConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C
index 196a91f0c4..7cb1ecf147 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C
@@ -52,7 +52,7 @@ Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
             "const labelField& neighbourRestrictAddressing)"
         )   << "Unknown GAMGInterface type " << coupleType << ".\n"
             << "Valid GAMGInterface types are :"
-            << lduInterfaceConstructorTablePtr_->toc()
+            << lduInterfaceConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C
index 4e870225e6..4146954746 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C
@@ -60,7 +60,7 @@ autoPtr<facePointPatch> facePointPatch::New
             << patch.type()
             << endl << endl
             << "Valid facePointPatch types are :" << endl
-            << polyPatchConstructorTablePtr_->toc()
+            << polyPatchConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index cc4278e221..e2c2dbf773 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -172,8 +172,8 @@ const Foam::List<Foam::labelPair>& Foam::mapDistribute::schedule() const
 Foam::mapDistribute::mapDistribute
 (
     const label constructSize,
-    const labelListList& subMap,
-    const labelListList& constructMap
+    const Xfer<labelListList>& subMap,
+    const Xfer<labelListList>& constructMap
 )
 :
     constructSize_(constructSize),
@@ -183,22 +183,6 @@ Foam::mapDistribute::mapDistribute
 {}
 
 
-//- (optionally destructively) construct from components
-Foam::mapDistribute::mapDistribute
-(
-    const label constructSize,
-    labelListList& subMap,
-    labelListList& constructMap,
-    const bool reUse                // clone or reuse
-)
-:
-    constructSize_(constructSize),
-    subMap_(subMap, reUse),
-    constructMap_(constructMap, reUse),
-    schedulePtr_()
-{}
-
-
 Foam::mapDistribute::mapDistribute
 (
     const labelList& sendProcs,
@@ -286,7 +270,7 @@ Foam::mapDistribute::mapDistribute(const mapDistribute& map)
 
 void Foam::mapDistribute::compact(const boolList& elemIsUsed)
 {
-    // 1. send back to sender. Have him delete the corresponding element
+    // 1. send back to sender. Have sender delete the corresponding element
     //    from the submap and do the same to the constructMap locally
     //    (and in same order).
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
index d2cfe64ca5..c6962355fd 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
@@ -83,23 +83,36 @@ class mapDistribute
 
 public:
 
+    // Public classes
+
+        //- combineReduce operator for lists. Used for counting.
+        class listEq
+        {
+
+        public:
+
+            template<class T>
+            void operator()(T& x, const T& y) const
+            {
+                forAll(y, i)
+                {
+                    if (y[i].size())
+                    {
+                        x[i] = y[i];
+                    }
+                }
+            }
+        };
+
+
     // Constructors
 
         //- Construct from components
         mapDistribute
         (
             const label constructSize,
-            const labelListList& subMap,
-            const labelListList& constructMap
-        );
-
-        //- (optionally destructively) construct from components
-        mapDistribute
-        (
-            const label constructSize,
-            labelListList& subMap,
-            labelListList& constructMap,
-            const bool reUse                // clone or reuse
+            const Xfer<labelListList>& subMap,
+            const Xfer<labelListList>& constructMap
         );
 
         //- Construct from reverse addressing: per data item the send
@@ -205,11 +218,7 @@ public:
             template<class T>
             void distribute(List<T>& fld) const
             {
-                if
-                (
-                    Pstream::defaultCommsType == Pstream::nonBlocking
-                 && contiguous<T>()
-                )
+                if (Pstream::defaultCommsType == Pstream::nonBlocking)
                 {
                     distribute
                     (
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H
index 5782308d19..ce05673908 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeLagrangian.H
@@ -68,35 +68,15 @@ public:
         mapDistributeLagrangian
         (
             const label nNewParticles,
-            const labelListList& subParticleMap,
-            const labelListList& constructParticleMap,
-            const labelListList& constructCellLabels
+            const Xfer<labelListList>& subParticleMap,
+            const Xfer<labelListList>& constructParticleMap,
+            const Xfer<labelListList>& constructCellLabels
         )
         :
             particleMap_(nNewParticles, subParticleMap, constructParticleMap),
             constructCellLabels_(constructCellLabels)
         {}
 
-        //- Construct from components and steal storage
-        mapDistributeLagrangian
-        (
-            const label nNewParticles,
-            labelListList& subParticleMap,
-            labelListList& constructParticleMap,
-            labelListList& constructCellLabels,
-            const bool reUse
-        )
-        :
-            particleMap_
-            (
-                nNewParticles,
-                subParticleMap,
-                constructParticleMap,
-                reUse
-            ),
-            constructCellLabels_(constructCellLabels, reUse)
-        {}
-
 
     // Member Functions
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
index a5e4f16341..29649665b4 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.C
@@ -66,27 +66,27 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
     const label nOldPoints,
     const label nOldFaces,
     const label nOldCells,
-    const labelList& oldPatchStarts,
-    const labelList& oldPatchNMeshPoints,
+    const Xfer<labelList>& oldPatchStarts,
+    const Xfer<labelList>& oldPatchNMeshPoints,
 
     // how to subset pieces of mesh to send across
-    const labelListList& subPointMap,
-    const labelListList& subFaceMap,
-    const labelListList& subCellMap,
-    const labelListList& subPatchMap,
+    const Xfer<labelListList>& subPointMap,
+    const Xfer<labelListList>& subFaceMap,
+    const Xfer<labelListList>& subCellMap,
+    const Xfer<labelListList>& subPatchMap,
 
     // how to reconstruct received mesh
-    const labelListList& constructPointMap,
-    const labelListList& constructFaceMap,
-    const labelListList& constructCellMap,
-    const labelListList& constructPatchMap
+    const Xfer<labelListList>& constructPointMap,
+    const Xfer<labelListList>& constructFaceMap,
+    const Xfer<labelListList>& constructCellMap,
+    const Xfer<labelListList>& constructPatchMap
 )
 :
     mesh_(mesh),
     nOldPoints_(nOldPoints),
     nOldFaces_(nOldFaces),
     nOldCells_(nOldCells),
-    oldPatchSizes_(oldPatchStarts.size()),
+    oldPatchSizes_(oldPatchStarts().size()),
     oldPatchStarts_(oldPatchStarts),
     oldPatchNMeshPoints_(oldPatchNMeshPoints),
     pointMap_(mesh.nPoints(), subPointMap, constructPointMap),
@@ -98,44 +98,6 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
 }
 
 
-//- (optionally destructively) construct from components
-Foam::mapDistributePolyMesh::mapDistributePolyMesh
-(
-    const polyMesh& mesh,
-    const label nOldPoints,
-    const label nOldFaces,
-    const label nOldCells,
-    labelList& oldPatchStarts,
-    labelList& oldPatchNMeshPoints,
-
-    labelListList& subPointMap,
-    labelListList& subFaceMap,
-    labelListList& subCellMap,
-    labelListList& subPatchMap,
-    labelListList& constructPointMap,
-    labelListList& constructFaceMap,
-    labelListList& constructCellMap,
-    labelListList& constructPatchMap,
-    const bool reUse                // clone or reuse
-)
-:
-    mesh_(mesh),
-    nOldPoints_(nOldPoints),
-    nOldFaces_(nOldFaces),
-    nOldCells_(nOldCells),
-    oldPatchSizes_(oldPatchStarts.size()),
-    oldPatchStarts_(oldPatchStarts, reUse),
-    oldPatchNMeshPoints_(oldPatchNMeshPoints, reUse),
-
-    pointMap_(mesh.nPoints(), subPointMap, constructPointMap, reUse),
-    faceMap_(mesh.nFaces(), subFaceMap, constructFaceMap, reUse),
-    cellMap_(mesh.nCells(), subCellMap, constructCellMap, reUse),
-    patchMap_(mesh.boundaryMesh().size(), subPatchMap, constructPatchMap, reUse)
-{
-    calcPatchSizes();
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::mapDistributePolyMesh::distributePointIndices(labelList& lst) const
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
index bf5857170b..8fdfe7e8fb 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributePolyMesh.H
@@ -120,42 +120,20 @@ public:
             const label nOldPoints,
             const label nOldFaces,
             const label nOldCells,
-            const labelList& oldPatchStarts,
-            const labelList& oldPatchNMeshPoints,
+            const Xfer<labelList>& oldPatchStarts,
+            const Xfer<labelList>& oldPatchNMeshPoints,
 
             // how to subset pieces of mesh to send across
-            const labelListList& subPointMap,
-            const labelListList& subFaceMap,
-            const labelListList& subCellMap,
-            const labelListList& subPatchMap,
+            const Xfer<labelListList>& subPointMap,
+            const Xfer<labelListList>& subFaceMap,
+            const Xfer<labelListList>& subCellMap,
+            const Xfer<labelListList>& subPatchMap,
 
             // how to reconstruct received mesh
-            const labelListList& constructPointMap,
-            const labelListList& constructFaceMap,
-            const labelListList& constructCellMap,
-            const labelListList& constructPatchMap
-        );
-
-        //- (optionally destructively) construct from components
-        //  Note that mesh has to be changed already!
-        mapDistributePolyMesh
-        (
-            const polyMesh& mesh,
-            const label nOldPoints,
-            const label nOldFaces,
-            const label nOldCells,
-            labelList& oldPatchStarts,
-            labelList& oldPatchNMeshPoints,
-
-            labelListList& subPointMap,
-            labelListList& subFaceMap,
-            labelListList& subCellMap,
-            labelListList& subPatchMap,
-            labelListList& constructPointMap,
-            labelListList& constructFaceMap,
-            labelListList& constructCellMap,
-            labelListList& constructPatchMap,
-            const bool reUse                // clone or reuse
+            const Xfer<labelListList>& constructPointMap,
+            const Xfer<labelListList>& constructFaceMap,
+            const Xfer<labelListList>& constructCellMap,
+            const Xfer<labelListList>& constructPatchMap
         );
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index 5f5d7a9fcf..da1ed19d1e 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -25,6 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "Pstream.H"
+#include "PstreamCombineReduceOps.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -184,138 +185,269 @@ void Foam::mapDistribute::distribute
     {
         if (!contiguous<T>())
         {
-            FatalErrorIn
-            (
-                "template<class T>\n"
-                "void mapDistribute::distribute\n"
-                "(\n"
-                "    const Pstream::commsTypes commsType,\n"
-                "    const List<labelPair>& schedule,\n"
-                "    const label constructSize,\n"
-                "    const labelListList& subMap,\n"
-                "    const labelListList& constructMap,\n"
-                "    List<T>& field\n"
-                ")\n"
-            )   << "Non-blocking only supported for contiguous data."
-                << exit(FatalError);
-        }
+            // 1. convert to contiguous buffer
+            // 2. send buffer
+            // 3. receive buffer
+            // 4. read from buffer into List<T>
 
-        // Set up sends to neighbours
+            List<List<char> > sendFields(Pstream::nProcs());
+            labelListList allNTrans(Pstream::nProcs());
+            labelList& nsTransPs = allNTrans[Pstream::myProcNo()];
+            nsTransPs.setSize(Pstream::nProcs(), 0);
 
-        List<List<T > > sendFields(Pstream::nProcs());
-
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = subMap[domain];
-
-            if (domain != Pstream::myProcNo() && map.size())
+            // Stream data into sendField buffers
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
             {
-                List<T>& subField = sendFields[domain];
+                const labelList& map = subMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    // Put data into send buffer
+                    OPstream toDomain(Pstream::nonBlocking, domain);
+                    toDomain << UIndirectList<T>(field, map);
+
+                    // Store the size
+                    nsTransPs[domain] = toDomain.bufPosition();
+
+                    // Transfer buffer out
+                    sendFields[domain].transfer(toDomain.buf());
+                    toDomain.bufPosition() = 0;
+
+                }
+            }
+
+            // Send sizes across
+            combineReduce(allNTrans, listEq());
+
+            // Start sending buffers
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = subMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    OPstream::write
+                    (
+                        Pstream::nonBlocking,
+                        domain,
+                        reinterpret_cast<const char*>
+                        (
+                            sendFields[domain].begin()
+                        ),
+                        nsTransPs[domain]
+                    );
+                }
+            }
+
+            // Set up receives from neighbours
+
+            PtrList<IPstream> fromSlave(Pstream::nProcs());
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    // Start receiving
+                    fromSlave.set
+                    (
+                        domain,
+                        new IPstream
+                        (
+                            Pstream::nonBlocking,
+                            domain,
+                            allNTrans[domain][Pstream::myProcNo()]
+                        )
+                    );
+                }
+            }
+
+
+            {
+                // Set up 'send' to myself
+                const labelList& mySubMap = subMap[Pstream::myProcNo()];
+                List<T> mySubField(mySubMap.size());
+                forAll(mySubMap, i)
+                {
+                    mySubField[i] = field[mySubMap[i]];
+                }
+                // Combine bits. Note that can reuse field storage
+                field.setSize(constructSize);
+                // Receive sub field from myself
+                {
+                    const labelList& map = constructMap[Pstream::myProcNo()];
+
+                    forAll(map, i)
+                    {
+                        field[map[i]] = mySubField[i];
+                    }
+                }
+            }
+
+
+            // Wait till all finished
+            IPstream::waitRequests();
+            OPstream::waitRequests();
+
+            // Consume
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    List<T> recvField(fromSlave[domain]);
+
+                    if (recvField.size() != map.size())
+                    {
+                        FatalErrorIn
+                        (
+                            "template<class T>\n"
+                            "void mapDistribute::distribute\n"
+                            "(\n"
+                            "    const Pstream::commsTypes commsType,\n"
+                            "    const List<labelPair>& schedule,\n"
+                            "    const label constructSize,\n"
+                            "    const labelListList& subMap,\n"
+                            "    const labelListList& constructMap,\n"
+                            "    List<T>& field\n"
+                            ")\n"
+                        )   << "Expected from processor " << domain
+                            << " " << map.size() << " but received "
+                            << recvField.size() << " elements."
+                            << abort(FatalError);
+                    }
+
+                    forAll(map, i)
+                    {
+                        field[map[i]] = recvField[i];
+                    }
+
+                    // Delete receive buffer
+                    fromSlave.set(domain, NULL);
+                }
+            }
+        }
+        else
+        {
+            // Set up sends to neighbours
+
+            List<List<T > > sendFields(Pstream::nProcs());
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = subMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    List<T>& subField = sendFields[domain];
+                    subField.setSize(map.size());
+                    forAll(map, i)
+                    {
+                        subField[i] = field[map[i]];
+                    }
+
+                    OPstream::write
+                    (
+                        Pstream::nonBlocking,
+                        domain,
+                        reinterpret_cast<const char*>(subField.begin()),
+                        subField.byteSize()
+                    );
+                }
+            }
+
+            // Set up receives from neighbours
+
+            List<List<T > > recvFields(Pstream::nProcs());
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    recvFields[domain].setSize(map.size());
+                    IPstream::read
+                    (
+                        Pstream::nonBlocking,
+                        domain,
+                        reinterpret_cast<char*>(recvFields[domain].begin()),
+                        recvFields[domain].byteSize()
+                    );
+                }
+            }
+
+
+            // Set up 'send' to myself
+
+            {
+                const labelList& map = subMap[Pstream::myProcNo()];
+
+                List<T>& subField = sendFields[Pstream::myProcNo()];
                 subField.setSize(map.size());
                 forAll(map, i)
                 {
                     subField[i] = field[map[i]];
                 }
-
-                OPstream::write
-                (
-                    Pstream::nonBlocking,
-                    domain,
-                    reinterpret_cast<const char*>(subField.begin()),
-                    subField.size()*sizeof(T)
-                );
             }
-        }
 
-        // Set up receives from neighbours
 
-        List<List<T > > recvFields(Pstream::nProcs());
+            // Combine bits. Note that can reuse field storage
 
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = constructMap[domain];
+            field.setSize(constructSize);
 
-            if (domain != Pstream::myProcNo() && map.size())
+
+            // Receive sub field from myself (sendFields[Pstream::myProcNo()])
             {
-                recvFields[domain].setSize(map.size());
-                IPstream::read
-                (
-                    Pstream::nonBlocking,
-                    domain,
-                    reinterpret_cast<char*>(recvFields[domain].begin()),
-                    recvFields[domain].size()*sizeof(T)
-                );
-            }
-        }
-
-
-        // Set up 'send' to myself
-
-        {
-            const labelList& map = subMap[Pstream::myProcNo()];
-
-            List<T>& subField = sendFields[Pstream::myProcNo()];
-            subField.setSize(map.size());
-            forAll(map, i)
-            {
-                subField[i] = field[map[i]];
-            }
-        }
-
-
-        // Combine bits. Note that can reuse field storage
-
-        field.setSize(constructSize);
-
-
-        // Receive sub field from myself (sendFields[Pstream::myProcNo()])
-        {
-            const labelList& map = constructMap[Pstream::myProcNo()];
-            const List<T>& subField = sendFields[Pstream::myProcNo()];
-
-            forAll(map, i)
-            {
-                field[map[i]] = subField[i];
-            }
-        }
-
-
-        // Wait for all to finish
-
-        OPstream::waitRequests();
-        IPstream::waitRequests();
-
-        // Collect neighbour fields
-
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = constructMap[domain];
-
-            if (domain != Pstream::myProcNo() && map.size())
-            {
-                if (recvFields[domain].size() != map.size())
-                {
-                    FatalErrorIn
-                    (
-                        "template<class T>\n"
-                        "void mapDistribute::distribute\n"
-                        "(\n"
-                        "    const Pstream::commsTypes commsType,\n"
-                        "    const List<labelPair>& schedule,\n"
-                        "    const label constructSize,\n"
-                        "    const labelListList& subMap,\n"
-                        "    const labelListList& constructMap,\n"
-                        "    List<T>& field\n"
-                        ")\n"
-                    )   << "Expected from processor " << domain
-                        << " " << map.size() << " but received "
-                        << recvFields[domain].size() << " elements."
-                        << abort(FatalError);
-                }
+                const labelList& map = constructMap[Pstream::myProcNo()];
+                const List<T>& subField = sendFields[Pstream::myProcNo()];
 
                 forAll(map, i)
                 {
-                    field[map[i]] = recvFields[domain][i];
+                    field[map[i]] = subField[i];
+                }
+            }
+
+
+            // Wait for all to finish
+
+            OPstream::waitRequests();
+            IPstream::waitRequests();
+
+            // Collect neighbour fields
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    if (recvFields[domain].size() != map.size())
+                    {
+                        FatalErrorIn
+                        (
+                            "template<class T>\n"
+                            "void mapDistribute::distribute\n"
+                            "(\n"
+                            "    const Pstream::commsTypes commsType,\n"
+                            "    const List<labelPair>& schedule,\n"
+                            "    const label constructSize,\n"
+                            "    const labelListList& subMap,\n"
+                            "    const labelListList& constructMap,\n"
+                            "    List<T>& field\n"
+                            ")\n"
+                        )   << "Expected from processor " << domain
+                            << " " << map.size() << " but received "
+                            << recvFields[domain].size() << " elements."
+                            << abort(FatalError);
+                    }
+
+                    forAll(map, i)
+                    {
+                        field[map[i]] = recvFields[domain][i];
+                    }
                 }
             }
         }
@@ -488,137 +620,263 @@ void Foam::mapDistribute::distribute
     {
         if (!contiguous<T>())
         {
-            FatalErrorIn
-            (
-                "template<class T>\n"
-                "void mapDistribute::distribute\n"
-                "(\n"
-                "    const Pstream::commsTypes commsType,\n"
-                "    const List<labelPair>& schedule,\n"
-                "    const label constructSize,\n"
-                "    const labelListList& subMap,\n"
-                "    const labelListList& constructMap,\n"
-                "    List<T>& field\n"
-                ")\n"
-            )   << "Non-blocking only supported for contiguous data."
-                << exit(FatalError);
-        }
+            // 1. convert to contiguous buffer
+            // 2. send buffer
+            // 3. receive buffer
+            // 4. read from buffer into List<T>
 
-        // Set up sends to neighbours
+            List<List<char> > sendFields(Pstream::nProcs());
+            labelListList allNTrans(Pstream::nProcs());
+            labelList& nsTransPs = allNTrans[Pstream::myProcNo()];
+            nsTransPs.setSize(Pstream::nProcs());
 
-        List<List<T > > sendFields(Pstream::nProcs());
-
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = subMap[domain];
-
-            if (domain != Pstream::myProcNo() && map.size())
+            // Stream data into sendField buffers
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
             {
-                List<T>& subField = sendFields[domain];
+                const labelList& map = subMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    // Put data into send buffer
+                    OPstream toDomain(Pstream::nonBlocking, domain);
+                    toDomain << UIndirectList<T>(field, map);
+
+                    // Store the size
+                    nsTransPs[domain] = toDomain.bufPosition();
+
+                    // Transfer buffer out
+                    sendFields[domain].transfer(toDomain.buf());
+                    toDomain.bufPosition() = 0;
+                }
+            }
+
+            // Send sizes across
+            combineReduce(allNTrans, listEq());
+
+            // Start sending buffers
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = subMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    OPstream::write
+                    (
+                        Pstream::nonBlocking,
+                        domain,
+                        reinterpret_cast<const char*>
+                        (
+                            sendFields[domain].begin()
+                        ),
+                        nsTransPs[domain]
+                    );
+                }
+            }
+
+            // Set up receives from neighbours
+
+            PtrList<IPstream> fromSlave(Pstream::nProcs());
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    // Start receiving
+                    fromSlave.set
+                    (
+                        domain,
+                        new IPstream
+                        (
+                            Pstream::nonBlocking,
+                            domain,
+                            allNTrans[domain][Pstream::myProcNo()]
+                        )
+                    );
+                }
+            }
+
+
+            {
+                // Set up 'send' to myself
+                List<T> mySubField(field, subMap[Pstream::myProcNo()]);
+                // Combine bits. Note that can reuse field storage
+                field.setSize(constructSize);
+                field = nullValue;
+                // Receive sub field from myself
+                {
+                    const labelList& map = constructMap[Pstream::myProcNo()];
+
+                    forAll(map, i)
+                    {
+                        cop(field[map[i]], mySubField[i]);
+                    }
+                }
+            }
+
+
+            // Wait till all finished
+            IPstream::waitRequests();
+            OPstream::waitRequests();
+
+            // Consume
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    List<T> recvField(fromSlave[domain]);
+
+                    if (recvField.size() != map.size())
+                    {
+                        FatalErrorIn
+                        (
+                            "template<class T>\n"
+                            "void mapDistribute::distribute\n"
+                            "(\n"
+                            "    const Pstream::commsTypes commsType,\n"
+                            "    const List<labelPair>& schedule,\n"
+                            "    const label constructSize,\n"
+                            "    const labelListList& subMap,\n"
+                            "    const labelListList& constructMap,\n"
+                            "    List<T>& field\n"
+                            ")\n"
+                        )   << "Expected from processor " << domain
+                            << " " << map.size() << " but received "
+                            << recvField.size() << " elements."
+                            << abort(FatalError);
+                    }
+
+                    forAll(map, i)
+                    {
+                        cop(field[map[i]], recvField[i]);
+                    }
+
+                    // Delete receive buffer
+                    fromSlave.set(domain, NULL);
+                }
+            }
+        }
+        else
+        {
+            // Set up sends to neighbours
+
+            List<List<T > > sendFields(Pstream::nProcs());
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = subMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    List<T>& subField = sendFields[domain];
+                    subField.setSize(map.size());
+                    forAll(map, i)
+                    {
+                        subField[i] = field[map[i]];
+                    }
+
+                    OPstream::write
+                    (
+                        Pstream::nonBlocking,
+                        domain,
+                        reinterpret_cast<const char*>(subField.begin()),
+                        subField.size()*sizeof(T)
+                    );
+                }
+            }
+
+            // Set up receives from neighbours
+
+            List<List<T > > recvFields(Pstream::nProcs());
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    recvFields[domain].setSize(map.size());
+                    IPstream::read
+                    (
+                        Pstream::nonBlocking,
+                        domain,
+                        reinterpret_cast<char*>(recvFields[domain].begin()),
+                        recvFields[domain].size()*sizeof(T)
+                    );
+                }
+            }
+
+            // Set up 'send' to myself
+
+            {
+                const labelList& map = subMap[Pstream::myProcNo()];
+
+                List<T>& subField = sendFields[Pstream::myProcNo()];
                 subField.setSize(map.size());
                 forAll(map, i)
                 {
                     subField[i] = field[map[i]];
                 }
-
-                OPstream::write
-                (
-                    Pstream::nonBlocking,
-                    domain,
-                    reinterpret_cast<const char*>(subField.begin()),
-                    subField.size()*sizeof(T)
-                );
             }
-        }
 
-        // Set up receives from neighbours
 
-        List<List<T > > recvFields(Pstream::nProcs());
+            // Combine bits. Note that can reuse field storage
 
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = constructMap[domain];
+            field.setSize(constructSize);
+            field = nullValue;
 
-            if (domain != Pstream::myProcNo() && map.size())
+            // Receive sub field from myself (subField)
             {
-                recvFields[domain].setSize(map.size());
-                IPstream::read
-                (
-                    Pstream::nonBlocking,
-                    domain,
-                    reinterpret_cast<char*>(recvFields[domain].begin()),
-                    recvFields[domain].size()*sizeof(T)
-                );
-            }
-        }
-
-        // Set up 'send' to myself
-
-        {
-            const labelList& map = subMap[Pstream::myProcNo()];
-
-            List<T>& subField = sendFields[Pstream::myProcNo()];
-            subField.setSize(map.size());
-            forAll(map, i)
-            {
-                subField[i] = field[map[i]];
-            }
-        }
-
-
-        // Combine bits. Note that can reuse field storage
-
-        field.setSize(constructSize);
-        field = nullValue;
-
-        // Receive sub field from myself (subField)
-        {
-            const labelList& map = constructMap[Pstream::myProcNo()];
-            const List<T>& subField = sendFields[Pstream::myProcNo()];
-
-            forAll(map, i)
-            {
-                cop(field[map[i]], subField[i]);
-            }
-        }
-
-
-        // Wait for all to finish
-
-        OPstream::waitRequests();
-        IPstream::waitRequests();
-
-        // Collect neighbour fields
-
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            const labelList& map = constructMap[domain];
-
-            if (domain != Pstream::myProcNo() && map.size())
-            {
-                if (recvFields[domain].size() != map.size())
-                {
-                    FatalErrorIn
-                    (
-                        "template<class T>\n"
-                        "void mapDistribute::distribute\n"
-                        "(\n"
-                        "    const Pstream::commsTypes commsType,\n"
-                        "    const List<labelPair>& schedule,\n"
-                        "    const label constructSize,\n"
-                        "    const labelListList& subMap,\n"
-                        "    const labelListList& constructMap,\n"
-                        "    List<T>& field\n"
-                        ")\n"
-                    )   << "Expected from processor " << domain
-                        << " " << map.size() << " but received "
-                        << recvFields[domain].size() << " elements."
-                        << abort(FatalError);
-                }
+                const labelList& map = constructMap[Pstream::myProcNo()];
+                const List<T>& subField = sendFields[Pstream::myProcNo()];
 
                 forAll(map, i)
                 {
-                    cop(field[map[i]], recvFields[domain][i]);
+                    cop(field[map[i]], subField[i]);
+                }
+            }
+
+
+            // Wait for all to finish
+
+            OPstream::waitRequests();
+            IPstream::waitRequests();
+
+            // Collect neighbour fields
+
+            for (label domain = 0; domain < Pstream::nProcs(); domain++)
+            {
+                const labelList& map = constructMap[domain];
+
+                if (domain != Pstream::myProcNo() && map.size())
+                {
+                    if (recvFields[domain].size() != map.size())
+                    {
+                        FatalErrorIn
+                        (
+                            "template<class T>\n"
+                            "void mapDistribute::distribute\n"
+                            "(\n"
+                            "    const Pstream::commsTypes commsType,\n"
+                            "    const List<labelPair>& schedule,\n"
+                            "    const label constructSize,\n"
+                            "    const labelListList& subMap,\n"
+                            "    const labelListList& constructMap,\n"
+                            "    List<T>& field\n"
+                            ")\n"
+                        )   << "Expected from processor " << domain
+                            << " " << map.size() << " but received "
+                            << recvFields[domain].size() << " elements."
+                            << abort(FatalError);
+                    }
+
+                    forAll(map, i)
+                    {
+                        cop(field[map[i]], recvFields[domain][i]);
+                    }
                 }
             }
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 0b9c08b39e..265b61cc4b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -1305,7 +1305,7 @@ bool Foam::cyclicPolyPatch::order
     {
         label baffleI = 0;
 
-        forAll(*this, faceI)
+        forAll(pp, faceI)
         {
             const face& f = pp.localFaces()[faceI];
             const labelList& pFaces = pp.pointFaces()[f[0]];
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C
index f456fc8404..deceda1eef 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C
@@ -59,7 +59,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
         )   << "Unknown polyPatch type " << patchType << " for patch " << name
             << endl << endl
             << "Valid polyPatch types are :" << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -107,7 +107,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
                 << " for patch " << name
                 << endl << endl
                 << "Valid polyPatch types are :" << endl
-                << dictionaryConstructorTablePtr_->toc()
+                << dictionaryConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneID/ZoneID.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneID/ZoneID.H
index 5c98efd84a..b6800dceb6 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneID/ZoneID.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneID/ZoneID.H
@@ -114,6 +114,7 @@ public:
                 return index_ > -1;
             }
 
+
         // Edit
 
             //- Update
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
index ff8041fc60..a7672104da 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    A subset of mesh cells.
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellZone.H"
@@ -45,59 +42,9 @@ namespace Foam
     addToRunTimeSelectionTable(cellZone, cellZone, dictionary);
 }
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-const Foam::Map<Foam::label>& Foam::cellZone::cellLookupMap() const
-{
-    if (!cellLookupMapPtr_)
-    {
-        calcCellLookupMap();
-    }
-
-    return *cellLookupMapPtr_;
-}
-
-
-void Foam::cellZone::calcCellLookupMap() const
-{
-    if (debug)
-    {
-        Info<< "void cellZone::calcCellLookupMap() const : "
-            << "Calculating cell lookup map"
-            << endl;
-    }
-
-    if (cellLookupMapPtr_)
-    {
-        FatalErrorIn
-        (
-            "void cellZone::calcCellLookupMap() const"
-        )   << "cell lookup map already calculated"
-            << abort(FatalError);
-    }
-
-    const labelList& addr = *this;
-
-    cellLookupMapPtr_ = new Map<label>(2*addr.size());
-    Map<label>& clm = *cellLookupMapPtr_;
-
-    forAll (addr, cellI)
-    {
-        clm.insert(addr[cellI], cellI);
-    }
-
-    if (debug)
-    {
-        Info<< "void cellZone::calcCellLookupMap() const : "
-            << "Finished calculating cell lookup map"
-            << endl;
-    }
-}
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::cellZone::cellZone
 (
     const word& name,
@@ -106,11 +53,8 @@ Foam::cellZone::cellZone
     const cellZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(name),
-    index_(index),
-    zoneMesh_(zm),
-    cellLookupMapPtr_(NULL)
+    zone(name, addr, index),
+    zoneMesh_(zm)
 {}
 
 
@@ -122,15 +66,11 @@ Foam::cellZone::cellZone
     const cellZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(name),
-    index_(index),
-    zoneMesh_(zm),
-    cellLookupMapPtr_(NULL)
+    zone(name, addr, index),
+    zoneMesh_(zm)
 {}
 
 
-// Construct from dictionary
 Foam::cellZone::cellZone
 (
     const word& name,
@@ -139,16 +79,11 @@ Foam::cellZone::cellZone
     const cellZoneMesh& zm
 )
 :
-    labelList(dict.lookup("cellLabels")),
-    name_(name),
-    index_(index),
-    zoneMesh_(zm),
-    cellLookupMapPtr_(NULL)
+    zone("cell", name, dict, index),
+    zoneMesh_(zm)
 {}
 
 
-// Construct given the original zone and resetting the
-//  cell list and zone mesh information
 Foam::cellZone::cellZone
 (
     const cellZone& cz,
@@ -157,11 +92,8 @@ Foam::cellZone::cellZone
     const cellZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(cz.name()),
-    index_(index),
-    zoneMesh_(zm),
-    cellLookupMapPtr_(NULL)
+    zone(cz, addr, index),
+    zoneMesh_(zm)
 {}
 
 Foam::cellZone::cellZone
@@ -172,38 +104,22 @@ Foam::cellZone::cellZone
     const cellZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(cz.name()),
-    index_(index),
-    zoneMesh_(zm),
-    cellLookupMapPtr_(NULL)
+    zone(cz, addr, index),
+    zoneMesh_(zm)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::cellZone::~cellZone()
-{
-    clearAddressing();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::label Foam::cellZone::whichCell(const label globalCellID) const
 {
-    const Map<label>& clm = cellLookupMap();
-
-    Map<label>::const_iterator clmIter = clm.find(globalCellID);
-
-    if (clmIter == clm.end())
-    {
-        return -1;
-    }
-    else
-    {
-        return clmIter();
-    }
+    return zone::localID(globalCellID);
 }
 
 
@@ -213,45 +129,9 @@ const Foam::cellZoneMesh& Foam::cellZone::zoneMesh() const
 }
 
 
-void Foam::cellZone::clearAddressing()
-{
-    deleteDemandDrivenData(cellLookupMapPtr_);
-}
-
-
 bool Foam::cellZone::checkDefinition(const bool report) const
 {
-    const labelList& addr = *this;
-
-    bool boundaryError = false;
-
-    forAll(addr, i)
-    {
-        if (addr[i] < 0 || addr[i] >= zoneMesh_.mesh().nCells())
-        {
-            boundaryError = true;
-
-            if (report)
-            {
-                SeriousErrorIn
-                (
-                    "bool cellZone::checkDefinition("
-                    "const bool report) const"
-                )   << "Zone " << name()
-                    << " contains invalid cell label " << addr[i] << nl
-                    << "Valid cell labels are 0.."
-                    << zoneMesh_.mesh().nCells()-1 << endl;
-            }
-        }
-    }
-    return boundaryError;
-}
-
-
-void Foam::cellZone::write(Ostream& os) const
-{
-    os  << nl << name()
-        << nl << static_cast<const labelList&>(*this);
+    return zone::checkDefinition(zoneMesh_.mesh().nCells(), report);
 }
 
 
@@ -284,10 +164,10 @@ void Foam::cellZone::operator=(const labelList& addr)
 
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const cellZone& p)
+Foam::Ostream& Foam::operator<<(Ostream& os, const cellZone& cz)
 {
-    p.write(os);
-    os.check("Ostream& operator<<(Ostream& f, const cellZone& p");
+    cz.write(os);
+    os.check("Ostream& operator<<(Ostream& os, const cellZone& cz");
     return os;
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index b133eee436..67c9c2f52f 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -42,12 +42,8 @@ SourceFiles
 #ifndef cellZone_H
 #define cellZone_H
 
-#include "labelList.H"
-#include "typeInfo.H"
-#include "dictionary.H"
+#include "zone.H"
 #include "cellZoneMeshFwd.H"
-#include "pointFieldFwd.H"
-#include "Map.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,36 +62,22 @@ Ostream& operator<<(Ostream&, const cellZone&);
 
 class cellZone
 :
-    public labelList
+    public zone
 {
-    // Private data
 
-        //- Name of zone
-        word name_;
+protected:
 
-        //- Index of zone
-        label index_;
+    // Protected data
 
         //- Reference to zone list
         const cellZoneMesh& zoneMesh_;
 
-        // Demand-driven private data
-
-            //- Map of cell labels in zone for fast location lookup
-            mutable Map<label>* cellLookupMapPtr_;
-
 
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
         cellZone(const cellZone&);
 
-        //- Return map of local cell indices
-        const Map<label>& cellLookupMap() const;
-
-        //- Build map of local cell indices
-        void calcCellLookupMap() const;
-
 
 public:
 
@@ -208,45 +190,19 @@ public:
 
 
     //- Destructor
-
-        virtual ~cellZone();
+    virtual ~cellZone();
 
 
     // Member Functions
 
-        //- Return name
-        const word& name() const
-        {
-            return name_;
-        }
-
-        //- Map storing the local cell index for every global cell
-        //  index.  Used to find out the index of cell in the zone from
-        //  the known global cell index.  If the cell is not in the
-        //  zone, returns -1
+        //- Helper function to re-direct to zone::localID(...)
         label whichCell(const label globalCellID) const;
 
-        //- Return the index of this zone in zone list
-        label index() const
-        {
-            return index_;
-        }
-
         //- Return zoneMesh reference
         const cellZoneMesh& zoneMesh() const;
 
-        //- Clear addressing
-        void clearAddressing();
-
         //- Check zone definition. Return true if in error.
-        bool checkDefinition(const bool report = false) const;
-
-        //- Correct patch after moving points
-        virtual void movePoints(const pointField&)
-        {}
-
-        //- Write
-        virtual void write(Ostream&) const;
+        virtual bool checkDefinition(const bool report = false) const;
 
         //- Write dictionary
         virtual void writeDict(Ostream&) const;
@@ -261,8 +217,9 @@ public:
         void operator=(const labelList&);
 
 
-    // Ostream Operator
+    // I-O
 
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream&, const cellZone&);
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
index e715812150..607f47511a 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
@@ -22,15 +22,11 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellZone.H"
 #include "dictionary.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
@@ -61,8 +57,8 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
             "const label, const cellZoneMesh&)",
             dict
         )   << "Unknown cellZone type " << zoneType << endl << endl
-            << "Valid cellZone types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << "Valid cellZone types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -70,6 +66,4 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index d4cc0a2843..e56730bd9e 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    A subset of mesh faces.
-
 \*---------------------------------------------------------------------------*/
 
 #include "faceZone.H"
@@ -100,54 +97,6 @@ void Foam::faceZone::calcFaceZonePatch() const
 }
 
 
-const Foam::Map<Foam::label>& Foam::faceZone::faceLookupMap() const
-{
-    if (!faceLookupMapPtr_)
-    {
-        calcFaceLookupMap();
-    }
-
-    return *faceLookupMapPtr_;
-}
-
-
-void Foam::faceZone::calcFaceLookupMap() const
-{
-    if (debug)
-    {
-        Info<< "void faceZone::calcFaceLookupMap() const : "
-            << "Calculating face lookup map"
-            << endl;
-    }
-
-    if (faceLookupMapPtr_)
-    {
-        FatalErrorIn
-        (
-            "void faceZone::calcFaceLookupMap() const"
-        )   << "face lookup map already calculated"
-            << abort(FatalError);
-    }
-
-    const labelList& addr = *this;
-
-    faceLookupMapPtr_ = new Map<label>(2*addr.size());
-    Map<label>& flm = *faceLookupMapPtr_;
-
-    forAll (addr, faceI)
-    {
-        flm.insert(addr[faceI], faceI);
-    }
-
-    if (debug)
-    {
-        Info<< "void faceZone::calcFaceLookupMap() const : "
-            << "Finished calculating face lookup map"
-            << endl;
-    }
-}
-
-
 void Foam::faceZone::calcCellLayers() const
 {
     if (debug)
@@ -228,16 +177,13 @@ Foam::faceZone::faceZone
     const faceZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(name),
+    zone(name, addr, index),
     flipMap_(fm),
-    index_(index),
     zoneMesh_(zm),
     patchPtr_(NULL),
     masterCellsPtr_(NULL),
     slaveCellsPtr_(NULL),
-    mePtr_(NULL),
-    faceLookupMapPtr_(NULL)
+    mePtr_(NULL)
 {
     checkAddressing();
 }
@@ -252,22 +198,18 @@ Foam::faceZone::faceZone
     const faceZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(name),
+    zone(name, addr, index),
     flipMap_(fm),
-    index_(index),
     zoneMesh_(zm),
     patchPtr_(NULL),
     masterCellsPtr_(NULL),
     slaveCellsPtr_(NULL),
-    mePtr_(NULL),
-    faceLookupMapPtr_(NULL)
+    mePtr_(NULL)
 {
     checkAddressing();
 }
 
 
-// Construct from dictionary
 Foam::faceZone::faceZone
 (
     const word& name,
@@ -276,23 +218,18 @@ Foam::faceZone::faceZone
     const faceZoneMesh& zm
 )
 :
-    labelList(dict.lookup("faceLabels")),
-    name_(name),
+    zone("face", name, dict, index),
     flipMap_(dict.lookup("flipMap")),
-    index_(index),
     zoneMesh_(zm),
     patchPtr_(NULL),
     masterCellsPtr_(NULL),
     slaveCellsPtr_(NULL),
-    mePtr_(NULL),
-    faceLookupMapPtr_(NULL)
+    mePtr_(NULL)
 {
     checkAddressing();
 }
 
 
-// Construct given the original zone and resetting the
-// face list and zone mesh information
 Foam::faceZone::faceZone
 (
     const faceZone& fz,
@@ -302,16 +239,13 @@ Foam::faceZone::faceZone
     const faceZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(fz.name()),
+    zone(fz, addr, index),
     flipMap_(fm),
-    index_(index),
     zoneMesh_(zm),
     patchPtr_(NULL),
     masterCellsPtr_(NULL),
     slaveCellsPtr_(NULL),
-    mePtr_(NULL),
-    faceLookupMapPtr_(NULL)
+    mePtr_(NULL)
 {
     checkAddressing();
 }
@@ -326,16 +260,13 @@ Foam::faceZone::faceZone
     const faceZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(fz.name()),
+    zone(fz, addr, index),
     flipMap_(fm),
-    index_(index),
     zoneMesh_(zm),
     patchPtr_(NULL),
     masterCellsPtr_(NULL),
     slaveCellsPtr_(NULL),
-    mePtr_(NULL),
-    faceLookupMapPtr_(NULL)
+    mePtr_(NULL)
 {
     checkAddressing();
 }
@@ -351,29 +282,18 @@ Foam::faceZone::~faceZone()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::label Foam::faceZone::whichFace(const label globalFaceID) const
-{
-    const Map<label>& flm = faceLookupMap();
-
-    Map<label>::const_iterator flmIter = flm.find(globalFaceID);
-
-    if (flmIter == flm.end())
-    {
-        return -1;
-    }
-    else
-    {
-        return flmIter();
-    }
-}
-
-
 const Foam::faceZoneMesh& Foam::faceZone::zoneMesh() const
 {
     return zoneMesh_;
 }
 
 
+Foam::label Foam::faceZone::whichFace(const label globalFaceID) const
+{
+    return zone::localID(globalFaceID);
+}
+
+
 const Foam::primitiveFacePatch& Foam::faceZone::operator()() const
 {
     if (!patchPtr_)
@@ -450,13 +370,14 @@ const Foam::labelList& Foam::faceZone::meshEdges() const
 
 void Foam::faceZone::clearAddressing()
 {
+    zone::clearAddressing();
+
     deleteDemandDrivenData(patchPtr_);
 
     deleteDemandDrivenData(masterCellsPtr_);
     deleteDemandDrivenData(slaveCellsPtr_);
 
     deleteDemandDrivenData(mePtr_);
-    deleteDemandDrivenData(faceLookupMapPtr_);
 }
 
 
@@ -504,30 +425,7 @@ void Foam::faceZone::updateMesh(const mapPolyMesh& mpm)
 
 bool Foam::faceZone::checkDefinition(const bool report) const
 {
-    const labelList& addr = *this;
-
-    bool boundaryError = false;
-
-    forAll(addr, i)
-    {
-        if (addr[i] < 0 || addr[i] >= zoneMesh().mesh().faces().size())
-        {
-            boundaryError = true;
-
-            if (report)
-            {
-                SeriousErrorIn
-                (
-                    "bool faceZone::checkDefinition("
-                    "const bool report) const"
-                )   << "Zone " << name()
-                    << " contains invalid face label " << addr[i] << nl
-                    << "Valid face labels are 0.."
-                    << zoneMesh().mesh().faces().size()-1 << endl;
-            }
-        }
-    }
-    return boundaryError;
+    return zone::checkDefinition(zoneMesh().mesh().faces().size(), report);
 }
 
 
@@ -642,10 +540,10 @@ void Foam::faceZone::writeDict(Ostream& os) const
 
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const faceZone& p)
+Foam::Ostream& Foam::operator<<(Ostream& os, const faceZone& fz)
 {
-    p.write(os);
-    os.check("Ostream& operator<<(Ostream& f, const faceZone& p");
+    fz.write(os);
+    os.check("Ostream& operator<<(Ostream& os, const faceZone& fz");
     return os;
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 16c7e82b09..7b1b46d2c4 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -41,13 +41,10 @@ SourceFiles
 #ifndef faceZone_H
 #define faceZone_H
 
-#include "typeInfo.H"
-#include "dictionary.H"
-#include "labelList.H"
+#include "zone.H"
 #include "faceZoneMeshFwd.H"
 #include "boolList.H"
 #include "primitiveFacePatch.H"
-#include "Map.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,20 +65,17 @@ Ostream& operator<<(Ostream&, const faceZone&);
 
 class faceZone
 :
-    public labelList
+    public zone
 {
-    // Private data
 
-        //- Name of zone
-        word name_;
+protected:
+
+    // Protected data
 
         //- Flip map for all faces in the zone.  Set to true if the
         //  face needs to be flipped to achieve the correct orientation.
         boolList flipMap_;
 
-        //- Index of zone
-        label index_;
-
         //- Reference to zone list
         const faceZoneMesh& zoneMesh_;
 
@@ -100,9 +94,6 @@ class faceZone
             //- Global edge addressing
             mutable labelList* mePtr_;
 
-            //- Map of face labels in zone for fast location lookup
-            mutable Map<label>* faceLookupMapPtr_;
-
 
     // Private Member Functions
 
@@ -118,9 +109,6 @@ class faceZone
         //- Return map of local face indices
         const Map<label>& faceLookupMap() const;
 
-        //- Build map of local face indices
-        void calcFaceLookupMap() const;
-
         //- Calculate master and slave face layer
         void calcCellLayers() const;
 
@@ -244,38 +232,23 @@ public:
 
 
     //- Destructor
-
-        virtual ~faceZone();
+    virtual ~faceZone();
 
 
     // Member Functions
 
-        //- Return name
-        const word& name() const
-        {
-            return name_;
-        }
-
         //- Return face flip map
         const boolList& flipMap() const
         {
             return flipMap_;
         }
 
-        //- Map storing the local face index for every global face index.
-        //  Used to find out the index of face in the zone from the known global
-        //  face index.  If the face is not in the zone, returns -1
-        label whichFace(const label globalFaceID) const;
+        //- Helper function to re-direct to zone::localID(...)
+        label whichFace(const label globalCellID) const;
 
         //- Return reference to primitive patch
         const primitiveFacePatch& operator()() const;
 
-        //- Return the index of this zone in zone list
-        label index() const
-        {
-            return index_;
-        }
-
         //- Return zoneMesh reference
         const faceZoneMesh& zoneMesh() const;
 
@@ -294,23 +267,23 @@ public:
 
 
         //- Clear addressing
-        void clearAddressing();
+        virtual void clearAddressing();
 
         //- Reset addressing and flip map (clearing demand-driven data)
-        void resetAddressing(const labelList&, const boolList&);
+        virtual void resetAddressing(const labelList&, const boolList&);
 
         //- Check zone definition. Return true if in error.
-        bool checkDefinition(const bool report = false) const;
+        virtual bool checkDefinition(const bool report = false) const;
 
         //- Check whether all procs have faces synchronised. Return
         //  true if in error.
-        bool checkParallelSync(const bool report = false) const;
+        virtual bool checkParallelSync(const bool report = false) const;
 
         //- Correct patch after moving points
         virtual void movePoints(const pointField&);
 
         //- Update for changes in topology
-        void updateMesh(const mapPolyMesh& mpm);
+        virtual void updateMesh(const mapPolyMesh& mpm);
 
         //- Write
         virtual void write(Ostream&) const;
@@ -319,8 +292,9 @@ public:
         virtual void writeDict(Ostream&) const;
 
 
-    // Ostream Operator
+    // I-O
 
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream&, const faceZone&);
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
index 5e77ee7778..07f85cc180 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
@@ -22,15 +22,11 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "faceZone.H"
 #include "dictionary.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
@@ -61,8 +57,8 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
             "const label, const faceZoneMesh&)",
             dict
         )   << "Unknown faceZone type " << zoneType << endl << endl
-            << "Valid faceZone types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << "Valid faceZone types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -70,6 +66,4 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
index afdc80e322..695e9f3bb6 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
@@ -22,15 +22,11 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointZone.H"
 #include "dictionary.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
@@ -61,14 +57,13 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
             "const label, const pointZoneMesh&)",
             dict
         )   << "Unknown pointZone type " << zoneType << endl << endl
-            << "Valid pointZone types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << "Valid pointZone types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
     return autoPtr<pointZone>(cstrIter()(name, dict, index, zm));
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
index d1c450691f..c6098a38a2 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    A subset of mesh points.
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointZone.H"
@@ -43,59 +40,9 @@ namespace Foam
     addToRunTimeSelectionTable(pointZone, pointZone, dictionary);
 }
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-const Foam::Map<Foam::label>& Foam::pointZone::pointLookupMap() const
-{
-    if (!pointLookupMapPtr_)
-    {
-        calcPointLookupMap();
-    }
-
-    return *pointLookupMapPtr_;
-}
-
-
-void Foam::pointZone::calcPointLookupMap() const
-{
-    if (debug)
-    {
-        Info<< "void pointZone::calcPointLookupMap() const : "
-            << "Calculating point lookup map"
-            << endl;
-    }
-
-    if (pointLookupMapPtr_)
-    {
-        FatalErrorIn
-        (
-            "void pointZone::calcPointLookupMap() const"
-        )   << "point lookup map already calculated"
-            << abort(FatalError);
-    }
-
-    const labelList& addr = *this;
-
-    pointLookupMapPtr_ = new Map<label>(2*addr.size());
-    Map<label>& plm = *pointLookupMapPtr_;
-
-    forAll (addr, pointI)
-    {
-        plm.insert(addr[pointI], pointI);
-    }
-
-    if (debug)
-    {
-        Info<< "void pointZone::calcPointLookupMap() const : "
-            << "Finished calculating point lookup map"
-            << endl;
-    }
-}
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::pointZone::pointZone
 (
     const word& name,
@@ -104,11 +51,8 @@ Foam::pointZone::pointZone
     const pointZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(name),
-    index_(index),
-    zoneMesh_(zm),
-    pointLookupMapPtr_(NULL)
+    zone(name, addr, index),
+    zoneMesh_(zm)
 {}
 
 
@@ -120,15 +64,11 @@ Foam::pointZone::pointZone
     const pointZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(name),
-    index_(index),
-    zoneMesh_(zm),
-    pointLookupMapPtr_(NULL)
+    zone(name, addr, index),
+    zoneMesh_(zm)
 {}
 
 
-// Construct from dictionary
 Foam::pointZone::pointZone
 (
     const word& name,
@@ -137,16 +77,11 @@ Foam::pointZone::pointZone
     const pointZoneMesh& zm
 )
 :
-    labelList(dict.lookup("pointLabels")),
-    name_(name),
-    index_(index),
-    zoneMesh_(zm),
-    pointLookupMapPtr_(NULL)
+    zone("point", name, dict, index),
+    zoneMesh_(zm)
 {}
 
 
-// Construct given the original zone and resetting the
-// point list and zone mesh information
 Foam::pointZone::pointZone
 (
     const pointZone& pz,
@@ -155,11 +90,8 @@ Foam::pointZone::pointZone
     const pointZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(pz.name()),
-    index_(index),
-    zoneMesh_(zm),
-    pointLookupMapPtr_(NULL)
+    zone(pz, addr, index),
+    zoneMesh_(zm)
 {}
 
 
@@ -171,92 +103,40 @@ Foam::pointZone::pointZone
     const pointZoneMesh& zm
 )
 :
-    labelList(addr),
-    name_(pz.name()),
-    index_(index),
-    zoneMesh_(zm),
-    pointLookupMapPtr_(NULL)
+    zone(pz, addr, index),
+    zoneMesh_(zm)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::pointZone::~pointZone()
-{
-    clearAddressing();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::label Foam::pointZone::whichPoint(const label globalPointID) const
-{
-    const Map<label>& plm = pointLookupMap();
-
-    Map<label>::const_iterator plmIter = plm.find(globalPointID);
-
-    if (plmIter == plm.end())
-    {
-        return -1;
-    }
-    else
-    {
-        return plmIter();
-    }
-}
-
-
 const Foam::pointZoneMesh& Foam::pointZone::zoneMesh() const
 {
     return zoneMesh_;
 }
 
 
-void Foam::pointZone::clearAddressing()
+Foam::label Foam::pointZone::whichPoint(const label globalPointID) const
 {
-    deleteDemandDrivenData(pointLookupMapPtr_);
+    return zone::localID(globalPointID);
 }
 
 
 bool Foam::pointZone::checkDefinition(const bool report) const
 {
-    const labelList& addr = *this;
-
-    bool boundaryError = false;
-
-    forAll(addr, i)
-    {
-        if (addr[i] < 0 || addr[i] >= zoneMesh_.mesh().points().size())
-        {
-            boundaryError = true;
-
-            if (report)
-            {
-                SeriousErrorIn
-                (
-                    "bool pointZone::checkDefinition("
-                    "const bool report) const"
-                )   << "Zone " << name()
-                    << " contains invalid point label " << addr[i] << nl
-                    << "Valid point labels are 0.."
-                    << zoneMesh_.mesh().points().size()-1 << endl;
-            }
-        }
-    }
-    return boundaryError;
-}
-
-
-void Foam::pointZone::write(Ostream& os) const
-{
-    os  << nl << name()
-        << nl << static_cast<const labelList&>(*this);
+    return zone::checkDefinition(zoneMesh_.mesh().points().size(), report);
 }
 
 
 void Foam::pointZone::writeDict(Ostream& os) const
 {
-    os  << nl << name() << nl << token::BEGIN_BLOCK << nl
+    os  << nl << name_ << nl << token::BEGIN_BLOCK << nl
         << "    type " << type() << token::END_STATEMENT << nl;
 
     writeEntry("pointLabels", os);
@@ -267,10 +147,10 @@ void Foam::pointZone::writeDict(Ostream& os) const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-void Foam::pointZone::operator=(const pointZone& cz)
+void Foam::pointZone::operator=(const pointZone& pz)
 {
     clearAddressing();
-    labelList::operator=(cz);
+    labelList::operator=(pz);
 }
 
 
@@ -283,10 +163,10 @@ void Foam::pointZone::operator=(const labelList& addr)
 
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const pointZone& p)
+Foam::Ostream& Foam::operator<<(Ostream& os, const pointZone& pz)
 {
-    p.write(os);
-    os.check("Ostream& operator<<(Ostream& f, const pointZone& p");
+    pz.write(os);
+    os.check("Ostream& operator<<(Ostream& os, const pointZone& pz");
     return os;
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
index 66719530f5..89f8349461 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
@@ -43,12 +43,8 @@ SourceFiles
 #ifndef pointZone_H
 #define pointZone_H
 
-#include "labelList.H"
-#include "typeInfo.H"
-#include "dictionary.H"
+#include "zone.H"
 #include "pointZoneMeshFwd.H"
-#include "Map.H"
-#include "pointField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -67,37 +63,22 @@ Ostream& operator<<(Ostream&, const pointZone&);
 
 class pointZone
 :
-    public labelList
+    public zone
 {
+
+protected:
+
     // Private data
 
-        //- Name of zone
-        word name_;
-
-        //- Index of zone
-        label index_;
-
         //- Reference to zone list
         const pointZoneMesh& zoneMesh_;
 
 
-        // Demand-driven private data
-
-            //- Map of point labels in zone for fast location lookup
-            mutable Map<label>* pointLookupMapPtr_;
-
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
         pointZone(const pointZone&);
 
-        //- Return map of local point indices
-        const Map<label>& pointLookupMap() const;
-
-        //- Build map of local point indices
-        void calcPointLookupMap() const;
-
 
 public:
 
@@ -210,46 +191,24 @@ public:
 
 
     //- Destructor
-
-        virtual ~pointZone();
+    virtual ~pointZone();
 
 
     // Member Functions
 
-        //- Return name
-        const word& name() const
-        {
-            return name_;
-        }
-
-        //- Map storing the local point index for every global point
-        //  index.  Used to find out the index of point in the zone from
-        //  the known global point index.  If the point is not in the
-        //  zone, returns -1
-        label whichPoint(const label globalPointID) const;
-
-        //- Return the index of this zone in zone list
-        label index() const
-        {
-            return index_;
-        }
-
         //- Return zoneMesh reference
         const pointZoneMesh& zoneMesh() const;
 
-        //- Clear addressing
-        void clearAddressing();
+        //- Helper function to re-direct to zone::localID(...)
+        label whichPoint(const label globalPointID) const;
 
         //- Check zone definition. Return true if in error.
-        bool checkDefinition(const bool report = false) const;
+        virtual bool checkDefinition(const bool report = false) const;
 
         //- Correct patch after moving points
         virtual void movePoints(const pointField&)
         {}
 
-        //- Write
-        virtual void write(Ostream&) const;
-
         //- Write dictionary
         virtual void writeDict(Ostream&) const;
 
@@ -263,8 +222,9 @@ public:
         void operator=(const labelList&);
 
 
-    // Ostream Operator
+    // I-O
 
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream&, const pointZone&);
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
new file mode 100644
index 0000000000..20195888c5
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
@@ -0,0 +1,239 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "zone.H"
+#include "IOstream.H"
+#include "demandDrivenData.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(zone, 0);
+}
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+const Foam::Map<Foam::label>& Foam::zone::lookupMap() const
+{
+    if (!lookupMapPtr_)
+    {
+        calcLookupMap();
+    }
+
+    return *lookupMapPtr_;
+}
+
+
+void Foam::zone::calcLookupMap() const
+{
+    if (debug)
+    {
+        Info<< "void zone::calcLookupMap() const: "
+            << "Calculating lookup map"
+            << endl;
+    }
+
+    if (lookupMapPtr_)
+    {
+        FatalErrorIn("void zone::calcLookupMap() const")
+            << "Lookup map already calculated" << nl
+            << abort(FatalError);
+    }
+
+    const labelList& addr = *this;
+
+    lookupMapPtr_ = new Map<label>(2*addr.size());
+    Map<label>& lm = *lookupMapPtr_;
+
+    forAll(addr, i)
+    {
+        lm.insert(addr[i], i);
+    }
+
+    if (debug)
+    {
+        Info<< "void zone::calcLookupMap() const: "
+            << "Finished calculating lookup map"
+            << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::zone::zone
+(
+    const word& name,
+    const labelList& addr,
+    const label index
+)
+:
+    labelList(addr),
+    name_(name),
+    index_(index),
+    lookupMapPtr_(NULL)
+{}
+
+
+Foam::zone::zone
+(
+    const word& name,
+    const Xfer<labelList>& addr,
+    const label index
+)
+:
+    labelList(addr),
+    name_(name),
+    index_(index),
+    lookupMapPtr_(NULL)
+{}
+
+
+Foam::zone::zone
+(
+    const word& zoneType,
+    const word& name,
+    const dictionary& dict,
+    const label index
+)
+:
+    labelList(dict.lookup(zoneType + "Labels")),
+    name_(name),
+    index_(index),
+    lookupMapPtr_(NULL)
+{}
+
+
+Foam::zone::zone
+(
+    const zone& z,
+    const labelList& addr,
+    const label index
+)
+:
+    labelList(addr),
+    name_(z.name()),
+    index_(index),
+    lookupMapPtr_(NULL)
+{}
+
+
+Foam::zone::zone
+(
+    const zone& z,
+    const Xfer<labelList>& addr,
+    const label index
+)
+:
+    labelList(addr),
+    name_(z.name()),
+    index_(index),
+    lookupMapPtr_(NULL)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::zone::~zone()
+{
+    clearAddressing();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::zone::localID(const label globalCellID) const
+{
+    const Map<label>& lm = lookupMap();
+
+    Map<label>::const_iterator lmIter = lm.find(globalCellID);
+
+    if (lmIter == lm.end())
+    {
+        return -1;
+    }
+    else
+    {
+        return lmIter();
+    }
+}
+
+
+void Foam::zone::clearAddressing()
+{
+    deleteDemandDrivenData(lookupMapPtr_);
+}
+
+
+bool Foam::zone::checkDefinition(const label maxSize, const bool report) const
+{
+    const labelList& addr = *this;
+
+    bool boundaryError = false;
+
+    forAll(addr, i)
+    {
+        if (addr[i] < 0 || addr[i] >= maxSize)
+        {
+            boundaryError = true;
+
+            if (report)
+            {
+                SeriousErrorIn
+                (
+                    "bool zone::checkDefinition("
+                    "const label maxSize, const bool report) const"
+                )   << "Zone " << name_
+                    << " contains invalid index label " << addr[i] << nl
+                    << "Valid index labels are 0.."
+                    << maxSize-1 << endl;
+            }
+        }
+    }
+
+    return boundaryError;
+}
+
+
+void Foam::zone::write(Ostream& os) const
+{
+    os  << nl << name_
+        << nl << static_cast<const labelList&>(*this);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const zone& z)
+{
+    z.write(os);
+    os.check("Ostream& operator<<(Ostream& f, const zone& z");
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
new file mode 100644
index 0000000000..fb5d2453e6
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::cellZone
+
+Description
+    Base class for zones
+
+SourceFiles
+    zone.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef zone_H
+#define zone_H
+
+#include "labelList.H"
+#include "typeInfo.H"
+#include "dictionary.H"
+#include "Map.H"
+#include "pointFieldFwd.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+
+class zone;
+Ostream& operator<<(Ostream&, const zone&);
+
+/*---------------------------------------------------------------------------*\
+                           Class zone Declaration
+\*---------------------------------------------------------------------------*/
+
+class zone
+:
+    public labelList
+{
+
+protected:
+
+    // Protected data
+
+        //- Name of zone
+        word name_;
+
+        //- Index of zone
+        label index_;
+
+
+        // Demand-driven private data
+
+            //- Map of labels in zone for fast location lookup
+            mutable Map<label>* lookupMapPtr_;
+
+
+    // Protected Member Functions
+
+        //- Return a reference to the look-up map
+        const Map<label>& lookupMap() const;
+
+        //- Construct the look-up map
+        void calcLookupMap() const;
+
+        //- Disallow default bitwise copy construct
+        zone(const zone&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("zone");
+
+
+    // Constructors
+
+        //- Construct from components
+        zone
+        (
+            const word& name,
+            const labelList& addr,
+            const label index
+        );
+
+        //- Construct from components, transferring contents
+        zone
+        (
+            const word& name,
+            const Xfer<labelList>& addr,
+            const label index
+        );
+
+        //- Construct from dictionary
+        zone
+        (
+            const word& zoneType,
+            const word& name,
+            const dictionary&,
+            const label index
+        );
+
+        //- Construct given the original zone and resetting the
+        //  cell list and zone mesh information
+        zone
+        (
+            const zone&,
+            const labelList& addr,
+            const label index
+        );
+
+        //- Construct given the original zone, resetting the
+        //  cell list and zone mesh information
+        zone
+        (
+            const zone&,
+            const Xfer<labelList>& addr,
+            const label index
+        );
+
+
+    //- Destructor
+    virtual ~zone();
+
+
+    // Member Functions
+
+        //- Return name
+        const word& name() const
+        {
+            return name_;
+        }
+
+        //- Map storing the local index for every global index.  Used to find
+        //  the index of the item in the zone from the known global index. If
+        //  the item is not in the zone, returns -1
+        label localID(const label globalID) const;
+
+        //- Return the index of this zone in zone list
+        label index() const
+        {
+            return index_;
+        }
+
+        //- Clear addressing
+        virtual void clearAddressing();
+
+        //- Check zone definition. Return true if in error.
+        virtual bool checkDefinition(const bool report = false) const = 0;
+
+        //- Check zone definition with max size given. Return true if in error.
+        virtual bool checkDefinition
+        (
+            const label maxSize,
+            const bool report = false
+        ) const;
+
+        //- Correct patch after moving points
+        virtual void movePoints(const pointField&)
+        {}
+
+        //- Write
+        virtual void write(Ostream&) const;
+
+        //- Write dictionary
+        virtual void writeDict(Ostream&) const = 0;
+
+
+    // I-O
+
+        //- Ostream Operator
+        friend Ostream& operator<<(Ostream&, const zone&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index 3534519ca7..29841d3ec8 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -626,7 +626,8 @@ bool Foam::primitiveMesh::checkFaceSkewness
         vector d = cellCtrs[nei[faceI]] - cellCtrs[own[faceI]];
 
         // Skewness vector
-        vector sv = Cpf - ((fAreas[faceI] & Cpf)/(fAreas[faceI] & d))*d;
+        vector sv =
+            Cpf - ((fAreas[faceI] & Cpf)/((fAreas[faceI] & d) + SMALL))*d;
         vector svHat = sv/(mag(sv) + VSMALL);
 
         // Normalisation distance calculated as the approximate distance
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
index e43d4b9d29..a21461bc62 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
@@ -376,16 +376,29 @@ inline pointHit triangle<Point, PointRef>::ray
         return ray(p, q1 - n, alg, intersection::VECTOR);
     }
 
+    // Intersection point with triangle plane
     point pInter;
+    // Is intersection point inside triangle
     bool hit;
     {
         // Reuse the fast ray intersection routine below in FULL_RAY
         // mode since the original intersection routine has rounding problems.
         pointHit fastInter = intersection(p, q1, intersection::FULL_RAY);
-        pInter = fastInter.rawPoint();
         hit = fastInter.hit();
+
+        if (hit)
+        {
+            pInter = fastInter.rawPoint();
+        }
+        else
+        {
+            // Calculate intersection of ray with triangle plane
+            vector v = a_ - p;
+            pInter = p + (q1&v)*q1;
+        }
     }
 
+    // Distance to intersection point
     scalar dist = q1 & (pInter - p);
 
     const scalar planarPointTol =
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.C b/src/OpenFOAM/primitives/Scalar/Scalar.C
index cdd94c7b15..4445a52767 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.C
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.C
@@ -84,7 +84,7 @@ Istream& operator>>(Istream& is, Scalar& s)
     {
         is.setBad();
         FatalIOErrorIn("operator>>(Istream&, Scalar&)", is)
-            << "wrong token type - expected Scalar found " << t.info()
+            << "wrong token type - expected Scalar, found " << t.info()
             << exit(FatalIOError);
 
         return is;
diff --git a/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C b/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
index d1c43ee858..81757e8952 100644
--- a/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
+++ b/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
@@ -74,7 +74,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Switch& s)
     {
         is.setBad();
         FatalIOErrorIn("operator>>(Istream&, bool/Switch&)", is)
-            << "wrong token type - expected bool found " << t
+            << "wrong token type - expected bool, found " << t
             << exit(FatalIOError);
 
         return is;
diff --git a/src/OpenFOAM/primitives/ints/int/intIO.C b/src/OpenFOAM/primitives/ints/int/intIO.C
index b7a70228c0..17f4d1a1f6 100644
--- a/src/OpenFOAM/primitives/ints/int/intIO.C
+++ b/src/OpenFOAM/primitives/ints/int/intIO.C
@@ -67,7 +67,7 @@ Foam::Istream& Foam::operator>>(Istream& is, int& i)
     {
         is.setBad();
         FatalIOErrorIn("operator>>(Istream&, int&)", is)
-            << "wrong token type - expected int found " << t.info()
+            << "wrong token type - expected int, found " << t.info()
             << exit(FatalIOError);
 
         return is;
diff --git a/src/OpenFOAM/primitives/ints/long/longIO.C b/src/OpenFOAM/primitives/ints/long/longIO.C
index 2b7320164d..7ea56d0e2e 100644
--- a/src/OpenFOAM/primitives/ints/long/longIO.C
+++ b/src/OpenFOAM/primitives/ints/long/longIO.C
@@ -65,7 +65,7 @@ Foam::Istream& Foam::operator>>(Istream& is, long& l)
     {
         is.setBad();
         FatalIOErrorIn("operator>>(Istream&, long&)", is)
-            << "wrong token type - expected long found " << t.info()
+            << "wrong token type - expected long, found " << t.info()
             << exit(FatalIOError);
 
         return is;
diff --git a/src/OpenFOAM/primitives/ints/uint/uintIO.C b/src/OpenFOAM/primitives/ints/uint/uintIO.C
index 1d24188c91..7388266f4f 100644
--- a/src/OpenFOAM/primitives/ints/uint/uintIO.C
+++ b/src/OpenFOAM/primitives/ints/uint/uintIO.C
@@ -66,7 +66,7 @@ Foam::Istream& Foam::operator>>(Istream& is, unsigned int& i)
     {
         is.setBad();
         FatalIOErrorIn("operator>>(Istream&, unsigned int&)", is)
-            << "wrong token type - expected unsigned int found " << t.info()
+            << "wrong token type - expected unsigned int, found " << t.info()
             << exit(FatalIOError);
 
         return is;
diff --git a/src/OpenFOAM/primitives/ints/ulong/ulongIO.C b/src/OpenFOAM/primitives/ints/ulong/ulongIO.C
index 58d6900e11..63db00c1a1 100644
--- a/src/OpenFOAM/primitives/ints/ulong/ulongIO.C
+++ b/src/OpenFOAM/primitives/ints/ulong/ulongIO.C
@@ -63,7 +63,7 @@ Foam::Istream& Foam::operator>>(Istream& is, unsigned long& val)
     {
         is.setBad();
         FatalIOErrorIn("operator>>(Istream&, unsigned long&)", is)
-            << "wrong token type - expected unsigned long found " << t.info()
+            << "wrong token type - expected unsigned long, found " << t.info()
             << exit(FatalIOError);
 
         return is;
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.H b/src/OpenFOAM/primitives/strings/fileName/fileName.H
index 709e70920b..e69502d742 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.H
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.H
@@ -28,6 +28,7 @@ Class
 Description
     A class for handling file names.
 
+    A fileName is a string of characters without whitespace or quotes.
     A fileName can be
       - constructed from a char*, a string or a word
       - concatenated by adding a '/' separator
diff --git a/src/OpenFOAM/primitives/strings/keyType/keyTypeIO.C b/src/OpenFOAM/primitives/strings/keyType/keyTypeIO.C
index 72859abfc8..0e2f1d1133 100644
--- a/src/OpenFOAM/primitives/strings/keyType/keyTypeIO.C
+++ b/src/OpenFOAM/primitives/strings/keyType/keyTypeIO.C
@@ -58,12 +58,22 @@ Foam::Istream& Foam::operator>>(Istream& is, keyType& w)
     {
         // Assign from string. Sets regular expression.
         w = t.stringToken();
+
+        // flag empty strings as an error
+        if (w.empty())
+        {
+            is.setBad();
+            FatalIOErrorIn("operator>>(Istream&, keyType&)", is)
+                << "empty word/expression "
+                << exit(FatalIOError);
+            return is;
+        }
     }
     else
     {
         is.setBad();
         FatalIOErrorIn("operator>>(Istream&, keyType&)", is)
-            << "wrong token type - expected word or string found "
+            << "wrong token type - expected word or string, found "
             << t.info()
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/primitives/strings/string/stringIO.C b/src/OpenFOAM/primitives/strings/string/stringIO.C
index 89694173ae..6cb4791b4a 100644
--- a/src/OpenFOAM/primitives/strings/string/stringIO.C
+++ b/src/OpenFOAM/primitives/strings/string/stringIO.C
@@ -55,7 +55,7 @@ Foam::Istream& Foam::operator>>(Istream& is, string& s)
     {
         is.setBad();
         FatalIOErrorIn("operator>>(Istream&, string&)", is)
-            << "wrong token type - expected string found " << t.info()
+            << "wrong token type - expected string, found " << t.info()
             << exit(FatalIOError);
 
         return is;
diff --git a/src/OpenFOAM/primitives/strings/word/word.H b/src/OpenFOAM/primitives/strings/word/word.H
index 5c910b7891..2b067ad51f 100644
--- a/src/OpenFOAM/primitives/strings/word/word.H
+++ b/src/OpenFOAM/primitives/strings/word/word.H
@@ -28,9 +28,8 @@ Class
 Description
     A class for handling words, derived from string.
 
-    A word is a string of characters containing no whitespace and may be
-    constructed from a string by removing whitespace. Words are delimited
-    by whitespace.
+    A word is a string of characters without whitespace, quotes, slashes,
+    semicolons or brace brackets. Words are delimited by whitespace.
 
 SourceFiles
     word.C
diff --git a/src/OpenFOAM/primitives/strings/word/wordIO.C b/src/OpenFOAM/primitives/strings/word/wordIO.C
index 093a282846..20a2a216d1 100644
--- a/src/OpenFOAM/primitives/strings/word/wordIO.C
+++ b/src/OpenFOAM/primitives/strings/word/wordIO.C
@@ -65,7 +65,8 @@ Foam::Istream& Foam::operator>>(Istream& is, word& w)
         {
             is.setBad();
             FatalIOErrorIn("operator>>(Istream&, word&)", is)
-                << "wrong token type - expected word found non-word characters "
+                << "wrong token type - expected word, found "
+                "non-word characters "
                 << t.info()
                 << exit(FatalIOError);
             return is;
@@ -75,7 +76,7 @@ Foam::Istream& Foam::operator>>(Istream& is, word& w)
     {
         is.setBad();
         FatalIOErrorIn("operator>>(Istream&, word&)", is)
-            << "wrong token type - expected word found "
+            << "wrong token type - expected word, found "
             << t.info()
             << exit(FatalIOError);
 
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
index 741d76e553..d499998145 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
@@ -29,7 +29,7 @@ Description
     A wordRe is a word, but can also have a regular expression for matching
     words.
 
-    By default the constructors will generally preserve the argument as
+    By default the constructors will generally preserve the argument as a
     string literal and the assignment operators will use the wordRe::DETECT
     compOption to scan the string for regular expression meta characters
     and/or invalid word characters and react accordingly.
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordReIO.C b/src/OpenFOAM/primitives/strings/wordRe/wordReIO.C
index dab1542b27..c849b4237d 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordReIO.C
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordReIO.C
@@ -57,12 +57,22 @@ Foam::Istream& Foam::operator>>(Istream& is, wordRe& w)
     {
         // Auto-tests for regular expression
         w = t.stringToken();
+
+        // flag empty strings as an error
+        if (w.empty())
+        {
+            is.setBad();
+            FatalIOErrorIn("operator>>(Istream&, wordRe&)", is)
+                << "empty word/expression "
+                << exit(FatalIOError);
+            return is;
+        }
     }
     else
     {
         is.setBad();
         FatalIOErrorIn("operator>>(Istream&, wordRe&)", is)
-            << "wrong token type - expected word or string found "
+            << "wrong token type - expected word or string, found "
             << t.info()
             << exit(FatalIOError);
 
diff --git a/src/Pstream/mpi/IPread.C b/src/Pstream/mpi/IPread.C
index 2b6953765a..c08c6b56ab 100644
--- a/src/Pstream/mpi/IPread.C
+++ b/src/Pstream/mpi/IPread.C
@@ -61,24 +61,38 @@ Foam::IPstream::IPstream
 
     MPI_Status status;
 
+    // Cannot use buf_.size() since appends a few bytes extra
+    label realBufSize = bufSize;
+
     // If the buffer size is not specified, probe the incomming message
     // and set it
     if (!bufSize)
     {
+        if (commsType == nonBlocking)
+        {
+            FatalErrorIn
+            (
+                "IPstream::IPstream(const commsTypes, const int, "
+                "const label, streamFormat, versionNumber)"
+            )   << "Can use nonBlocking mode only with pre-allocated buffers"
+                << Foam::abort(FatalError);
+        }
+
         MPI_Probe(procID(fromProcNo_), msgType(), MPI_COMM_WORLD, &status);
         MPI_Get_count(&status, MPI_BYTE, &messageSize_);
 
         buf_.setSize(messageSize_);
+        realBufSize = buf_.size();
     }
 
-    messageSize_ = read(commsType, fromProcNo_, buf_.begin(), buf_.size());
+    messageSize_ = read(commsType, fromProcNo_, buf_.begin(), realBufSize);
 
     if (!messageSize_)
     {
         FatalErrorIn
         (
-            "IPstream::IPstream(const int fromProcNo, "
-            "const label bufSize, streamFormat format, versionNumber version)"
+            "IPstream::IPstream(const commsTypes, const int, "
+            "const label, streamFormat, versionNumber)"
         )   << "read failed"
             << Foam::abort(FatalError);
     }
@@ -173,7 +187,8 @@ Foam::label Foam::IPstream::read
 
         IPstream_outstandingRequests_.append(request);
 
-        return 1;
+        // Assume the message is completely received.
+        return bufSize;
     }
     else
     {
diff --git a/src/Pstream/mpi/OPwrite.C b/src/Pstream/mpi/OPwrite.C
index 230a366ebd..4836b92c8b 100644
--- a/src/Pstream/mpi/OPwrite.C
+++ b/src/Pstream/mpi/OPwrite.C
@@ -42,20 +42,35 @@ Foam::DynamicList<MPI_Request> OPstream_outstandingRequests_;
 
 Foam::OPstream::~OPstream()
 {
-    if
-    (
-       !write
-        (
-            commsType_,
-            toProcNo_,
-            buf_.begin(),
-            bufPosition_
-        )
-    )
+    if (commsType_ == nonBlocking)
     {
-        FatalErrorIn("OPstream::~OPstream()")
-            << "MPI_Bsend cannot send outgoing message"
-            << Foam::abort(FatalError);
+        // alloc nonBlocking only if empty buffer. This denotes the buffer
+        // having been transfered out.
+        if (bufPosition_ > 0)
+        {
+            FatalErrorIn("OPstream::~OPstream()")
+                << "OPstream contains buffer so cannot be used with nonBlocking"
+                << " since destructor would destroy buffer whilst possibly"
+                << " still sending." << Foam::abort(FatalError);
+        }
+    }
+    else
+    {
+        if
+        (
+           !write
+            (
+                commsType_,
+                toProcNo_,
+                buf_.begin(),
+                bufPosition_
+            )
+        )
+        {
+            FatalErrorIn("OPstream::~OPstream()")
+                << "MPI cannot send outgoing message"
+                << Foam::abort(FatalError);
+        }
     }
 }
 
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
index 3c2221f8d0..cc110c1d40 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
@@ -28,12 +28,9 @@ License
 #include "fvMesh.H"
 #include "Time.H"
 #include "boundBox.H"
-#include "globalIndex.H"
 #include "wallPolyPatch.H"
-#include "mapDistributePolyMesh.H"
 #include "cellSet.H"
 #include "syncTools.H"
-#include "motionSmoother.H"
 #include "refinementParameters.H"
 #include "snapParameters.H"
 #include "layerParameters.H"
@@ -225,7 +222,9 @@ Foam::autoHexMeshDriver::autoHexMeshDriver
                 IOobject
                 (
                     "abc",                                      // dummy name
-                    mesh_.time().findInstance("triSurface", word::null),// inst
+                    //mesh_.time().findInstance("triSurface", word::null),
+                                                                // instance
+                    mesh_.time().constant(),                    // instance
                     "triSurface",                               // local
                     mesh_.time(),                               // registry
                     IOobject::MUST_READ,
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
index 0ac24a5574..1ba66fffe9 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
@@ -28,14 +28,13 @@ License
 #include "meshRefinement.H"
 #include "fvMesh.H"
 #include "Time.H"
-#include "boundBox.H"
-#include "mapDistributePolyMesh.H"
 #include "cellSet.H"
 #include "syncTools.H"
 #include "refinementParameters.H"
 #include "featureEdgeMesh.H"
 #include "refinementSurfaces.H"
 #include "shellSurfaces.H"
+#include "mapDistributePolyMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -78,8 +77,9 @@ Foam::label Foam::autoRefineDriver::readFeatureEdges
                 IOobject
                 (
                     featFileName,                       // name
-                    mesh.time().findInstance("triSurface", featFileName),
-                                                        // instance
+                    //mesh.time().findInstance("triSurface", featFileName),
+                    //                                    // instance
+                    mesh.time().constant(),             // instance
                     "triSurface",                       // local
                     mesh.time(),                        // registry
                     IOobject::MUST_READ,
diff --git a/src/conversion/ensight/part/ensightPart.C b/src/conversion/ensight/part/ensightPart.C
index c02f6c9896..a8b4e50308 100644
--- a/src/conversion/ensight/part/ensightPart.C
+++ b/src/conversion/ensight/part/ensightPart.C
@@ -142,7 +142,7 @@ Foam::autoPtr<Foam::ensightPart> Foam::ensightPart::New(Istream& is)
             is
         )   << "unknown ensightPart type " << partType << endl << endl
             << "Valid ensightPart types are :" << endl
-            << istreamConstructorTablePtr_->toc()
+            << istreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
index b526f391ef..c38e0494ae 100644
--- a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -25,8 +25,6 @@ License
 InClass
     decompositionMethod
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "decompositionMethod.H"
@@ -64,7 +62,7 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
         )   << "Unknown decompositionMethod "
             << decompositionMethodTypeName << endl << endl
             << "Valid decompositionMethods are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -96,7 +94,7 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
         )   << "Unknown decompositionMethod "
             << decompositionMethodTypeName << endl << endl
             << "Valid decompositionMethods are : " << endl
-            << dictionaryMeshConstructorTablePtr_->toc()
+            << dictionaryMeshConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -104,14 +102,26 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
 }
 
 
+Foam::labelList Foam::decompositionMethod::decompose
+(
+    const pointField& points
+)
+{
+    scalarField weights(0);
+
+    return decompose(points, weights);
+}
+
+
 Foam::labelList Foam::decompositionMethod::decompose
 (
     const labelList& fineToCoarse,
-    const pointField& coarsePoints
+    const pointField& coarsePoints,
+    const scalarField& coarseWeights
 )
 {
     // Decompose based on agglomerated points
-    labelList coarseDistribution(decompose(coarsePoints));
+    labelList coarseDistribution(decompose(coarsePoints, coarseWeights));
 
     // Rework back into decomposition for original mesh_
     labelList fineDistribution(fineToCoarse.size());
@@ -125,6 +135,18 @@ Foam::labelList Foam::decompositionMethod::decompose
 }
 
 
+Foam::labelList Foam::decompositionMethod::decompose
+(
+    const labelList& fineToCoarse,
+    const pointField& coarsePoints
+)
+{
+    scalarField coarseWeights(0);
+
+    return decompose(fineToCoarse, coarsePoints, coarseWeights);
+}
+
+
 void Foam::decompositionMethod::calcCellCells
 (
     const polyMesh& mesh,
@@ -170,4 +192,16 @@ void Foam::decompositionMethod::calcCellCells
 }
 
 
+Foam::labelList Foam::decompositionMethod::decompose
+(
+    const labelListList& globalCellCells,
+    const pointField& cc
+)
+{
+    scalarField cWeights(0);
+
+    return decompose(globalCellCells, cc, cWeights);
+}
+
+
 // ************************************************************************* //
diff --git a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.H b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.H
index 7055f24d7b..7f66e9f50d 100644
--- a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.H
+++ b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.H
@@ -150,20 +150,37 @@ public:
 
         //- Return for every coordinate the wanted processor number. Use the
         //  mesh connectivity (if needed)
-        virtual labelList decompose(const pointField&) = 0;
+        virtual labelList decompose
+        (
+            const pointField& points,
+            const scalarField& pointWeights
+        ) = 0;
+
+        //- Like decompose but with uniform weights on the points
+        virtual labelList decompose(const pointField&);
+
 
         //- Return for every coordinate the wanted processor number. Gets
         //  passed agglomeration map (from fine to coarse cells) and coarse cell
         //  location. Can be overridden by decomposers that provide this
         //  functionality natively. Coarse cells are local to the processor
         //  (if in parallel). If you want to have coarse cells spanning
-        //  processors use the next function below instead.
+        //  processors use the globalCellCells instead.
+        virtual labelList decompose
+        (
+            const labelList& cellToRegion,
+            const pointField& regionPoints,
+            const scalarField& regionWeights
+        );
+
+        //- Like decompose but with uniform weights on the regions
         virtual labelList decompose
         (
             const labelList& cellToRegion,
             const pointField& regionPoints
         );
 
+
         //- Return for every coordinate the wanted processor number. Explicitly
         //  provided connectivity - does not use mesh_.
         //  The connectivity is equal to mesh.cellCells() except for
@@ -174,9 +191,17 @@ public:
         virtual labelList decompose
         (
             const labelListList& globalCellCells,
-            const pointField& cc
+            const pointField& cc,
+            const scalarField& cWeights
         ) = 0;
 
+        //- Like decompose but with uniform weights on the cells
+        virtual labelList decompose
+        (
+            const labelListList& globalCellCells,
+            const pointField& cc
+        );
+
 };
 
 
diff --git a/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
index 72d39d215c..bde1181c09 100644
--- a/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
+++ b/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
@@ -142,6 +142,38 @@ Foam::label Foam::hierarchGeomDecomp::findLower
 }
 
 
+// Create a mapping between the index and the weighted size.
+// For convenience, sortedWeightedSize is one size bigger than current. This
+// avoids extra tests.
+void Foam::hierarchGeomDecomp::calculateSortedWeightedSizes
+(
+    const labelList& current,
+    const labelList& indices,
+    const scalarField& weights,
+    const label globalCurrentSize,
+
+    scalarField& sortedWeightedSizes
+)
+{
+    // Evaluate cumulative weights.
+    sortedWeightedSizes[0] = 0;
+    forAll(current, i)
+    {
+        label pointI = current[indices[i]];
+        sortedWeightedSizes[i + 1] = sortedWeightedSizes[i] + weights[pointI];
+    }
+    // Non-dimensionalise and multiply by size.
+    scalar globalCurrentLength = returnReduce
+    (
+        sortedWeightedSizes[current.size()], 
+        sumOp<scalar>()
+    );
+    // Normalise weights by global sum of weights and multiply through
+    // by global size.
+    sortedWeightedSizes *= (globalCurrentSize/globalCurrentLength);
+}
+
+
 // Find position in values so between minIndex and this position there
 // are wantedSize elements.
 void Foam::hierarchGeomDecomp::findBinary
@@ -170,7 +202,6 @@ void Foam::hierarchGeomDecomp::findBinary
     label midPrev = -1;
     label highPrev = -1;
 
-    //while (low <= high)
     while (true)
     {
         label size = returnReduce(mid-minIndex, sumOp<label>());
@@ -204,7 +235,98 @@ void Foam::hierarchGeomDecomp::findBinary
         mid = findLower(values, midValue, low, high);
 
         // Safeguard if same as previous.
-        bool hasNotChanged = (mid == midPrev) && (low == lowPrev) && (high == highPrev);
+        bool hasNotChanged =
+            (mid == midPrev)
+         && (low == lowPrev)
+         && (high == highPrev);
+
+        if (returnReduce(hasNotChanged, andOp<bool>()))
+        {
+            WarningIn("hierarchGeomDecomp::findBinary(..)")
+                << "unable to find desired deomposition split, making do!" 
+                << endl;
+            break;
+        }
+
+        midPrev = mid;
+        lowPrev = low;
+        highPrev = high;
+    }
+}
+
+
+// Find position in values so between minIndex and this position there
+// are wantedSize elements.
+void Foam::hierarchGeomDecomp::findBinary
+(
+    const label sizeTol,
+    const List<scalar>& sortedWeightedSizes,
+    const List<scalar>& values,
+    const label minIndex,       // index of previous value
+    const scalar minValue,      // value at minIndex
+    const scalar maxValue,      // global max of values
+    const scalar wantedSize,    // wanted size
+
+    label& mid,                 // index where size of bin is
+                                // wantedSize (to within sizeTol)
+    scalar& midValue            // value at mid
+)
+{
+    label low = minIndex;
+    scalar lowValue = minValue;
+
+    scalar highValue = maxValue;
+    // (one beyond) index of highValue
+    label high = values.size();
+
+    // Safeguards to avoid infinite loop.
+    label lowPrev = -1;
+    label midPrev = -1;
+    label highPrev = -1;
+
+    while (true)
+    {
+        label weightedSize = returnReduce
+        (
+            sortedWeightedSizes[mid] - sortedWeightedSizes[minIndex],
+            sumOp<label>()
+        );
+
+        if (debug)
+        {
+            Pout<< "low:" << low << " lowValue:" << lowValue
+                << " high:" << high << " highValue:" << highValue
+                << " mid:" << mid << " midValue:" << midValue << nl
+                << "globalSize:" << weightedSize 
+                << " wantedSize:" << wantedSize
+                << " sizeTol:" << sizeTol << endl;
+        }
+
+        if (wantedSize < weightedSize - sizeTol)
+        {
+            high = mid;
+            highValue = midValue;
+        }
+        else if (wantedSize > weightedSize + sizeTol)
+        {
+            low = mid;
+            lowValue = midValue;
+        }
+        else
+        {
+            break;
+        }
+
+        // Update mid, midValue
+        midValue = 0.5*(lowValue+highValue);
+        mid = findLower(values, midValue, low, high);
+
+        // Safeguard if same as previous.
+        bool hasNotChanged =
+            (mid == midPrev)
+         && (low == lowPrev)
+         && (high == highPrev);
+
         if (returnReduce(hasNotChanged, andOp<bool>()))
         {
             WarningIn("hierarchGeomDecomp::findBinary(..)")
@@ -394,6 +516,190 @@ void Foam::hierarchGeomDecomp::sortComponent
 }
 
 
+// Sort points into bins according to one component. Recurses to next component.
+void Foam::hierarchGeomDecomp::sortComponent
+(
+    const label sizeTol,
+    const scalarField& weights,
+    const pointField& points,
+    const labelList& current,       // slice of points to decompose
+    const direction componentIndex, // index in decompOrder_
+    const label mult,               // multiplication factor for finalDecomp
+    labelList& finalDecomp
+)
+{
+    // Current component
+    label compI = decompOrder_[componentIndex];
+
+    if (debug)
+    {
+        Pout<< "sortComponent : Sorting slice of size " << current.size()
+            << " in component " << compI << endl;
+    }
+
+    // Storage for sorted component compI
+    SortableList<scalar> sortedCoord(current.size());
+
+    forAll(current, i)
+    {
+        label pointI = current[i];
+
+        sortedCoord[i] = points[pointI][compI];
+    }
+    sortedCoord.sort();
+
+    label globalCurrentSize = returnReduce(current.size(), sumOp<label>());
+
+    // Now evaluate local cumulative weights, based on the sorting.
+    // Make one bigger than the nodes.
+    scalarField sortedWeightedSizes(current.size()+1, 0);
+    calculateSortedWeightedSizes
+    (
+        current,
+        sortedCoord.indices(),
+        weights,
+        globalCurrentSize,
+        sortedWeightedSizes
+    );
+
+    scalar minCoord = returnReduce
+    (
+        (
+            sortedCoord.size()
+          ? sortedCoord[0]
+          : GREAT
+        ),
+        minOp<scalar>()
+    );
+
+    scalar maxCoord = returnReduce
+    (
+        (
+            sortedCoord.size()
+          ? sortedCoord[sortedCoord.size()-1]
+          : -GREAT
+        ),
+        maxOp<scalar>()
+    );
+
+    if (debug)
+    {   
+        Pout<< "sortComponent : minCoord:" << minCoord
+            << " maxCoord:" << maxCoord << endl;
+    }
+
+    // starting index (in sortedCoord) of bin (= local)
+    label leftIndex = 0;
+    // starting value of bin (= global since coordinate)
+    scalar leftCoord = minCoord;
+
+    // Sort bins of size n
+    for (label bin = 0; bin < n_[compI]; bin++)
+    {
+        // Now we need to determine the size of the bin (dx). This is
+        // determined by the 'pivot' values - everything to the left of this
+        // value goes in the current bin, everything to the right into the next
+        // bins.
+
+        // Local number of elements
+        label localSize = -1;     // offset from leftOffset
+
+        // Value at right of bin (leftIndex+localSize-1)
+        scalar rightCoord = -GREAT;
+        
+        if (bin == n_[compI]-1)
+        {
+            // Last bin. Copy all.
+            localSize = current.size()-leftIndex;
+            rightCoord = maxCoord;                  // note: not used anymore
+        }
+        else
+        {
+            // For the current bin (starting at leftCoord) we want a rightCoord
+            // such that the sum of all weighted sizes are 
+            // globalCurrentLength/n_[compI].
+            // We have to iterate to obtain this.
+
+            label rightIndex = current.size();
+            rightCoord = maxCoord;
+
+            // Calculate rightIndex/rightCoord to have wanted size
+            findBinary
+            (
+                sizeTol,
+                sortedWeightedSizes,
+                sortedCoord,
+                leftIndex,
+                leftCoord,
+                maxCoord,
+                globalCurrentSize/n_[compI],  // wanted size
+
+                rightIndex,
+                rightCoord
+            );
+            localSize = rightIndex - leftIndex;
+        }
+
+        if (debug)
+        {
+            Pout<< "For component " << compI << ", bin " << bin
+                << " copying" << nl
+                << "from " << leftCoord << " at local index "
+                << leftIndex << nl
+                << "to " << rightCoord << " localSize:"
+                << localSize << nl
+                << endl;
+        }
+
+
+        // Copy localSize elements starting from leftIndex.
+        labelList slice(localSize);
+
+        forAll(slice, i)
+        {
+            label pointI = current[sortedCoord.indices()[leftIndex+i]];
+
+            // Mark point into correct bin
+            finalDecomp[pointI] += bin*mult;
+
+            // And collect for next sorting action
+            slice[i] = pointI;
+        }
+
+        // Sort slice in next component
+        if (componentIndex < 2)
+        {
+            string oldPrefix;
+            if (debug)
+            {
+                oldPrefix = Pout.prefix();
+                Pout.prefix() = "  " + oldPrefix;
+            }
+
+            sortComponent
+            (
+                sizeTol,
+                weights,
+                points,
+                slice,
+                componentIndex+1,
+                mult*n_[compI],     // Multiplier to apply to decomposition.
+                finalDecomp
+            );
+
+            if (debug)
+            {
+                Pout.prefix() = oldPrefix;
+            }
+        }
+
+        // Step to next bin.
+        leftIndex += localSize;
+        leftCoord = rightCoord;
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::hierarchGeomDecomp::hierarchGeomDecomp
@@ -464,4 +770,47 @@ Foam::labelList Foam::hierarchGeomDecomp::decompose
 }
 
 
+Foam::labelList Foam::hierarchGeomDecomp::decompose
+(
+    const pointField& points,
+    const scalarField& weights
+)
+{
+    // construct a list for the final result
+    labelList finalDecomp(points.size(), 0);
+
+    // Start off with every point sorted onto itself.
+    labelList slice(points.size());
+    forAll(slice, i)
+    {
+        slice[i] = i;
+    }
+
+    pointField rotatedPoints = rotDelta_ & points;
+
+
+    // Calculate tolerance of cell distribution. For large cases finding
+    // distibution to the cell exact would cause too many iterations so allow
+    // some slack.
+    label allSize = points.size();
+    reduce(allSize, sumOp<label>());
+
+    const label sizeTol = max(1, label(1E-3*allSize/nProcessors_));
+
+    // Sort recursive
+    sortComponent
+    (
+        sizeTol,
+        weights,
+        rotatedPoints,
+        slice,
+        0,              // Sort first component in decompOrder.
+        1,              // Offset for different x bins.
+        finalDecomp
+    );
+
+    return finalDecomp;
+}
+
+
 // ************************************************************************* //
diff --git a/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H b/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
index c2ed565211..932ca5dcaa 100644
--- a/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
+++ b/src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
@@ -80,6 +80,17 @@ class hierarchGeomDecomp
         //- Convert ordering string ("xyz") into list of components.
         void setDecompOrder();
 
+        //- Evaluates the weighted sizes for each sorted point.
+        static void calculateSortedWeightedSizes
+        (
+            const labelList& current,
+            const labelList& indices,
+            const scalarField& weights,
+            const label globalCurrentSize,
+
+            scalarField& sortedWeightedSizes
+        );
+
         //- Find index of t in list inbetween indices left and right
         static label findLower
         (
@@ -104,6 +115,22 @@ class hierarchGeomDecomp
             scalar& midValue            // value at mid
         );
 
+        //- Find midValue (at local index mid) such that the number of
+        //  elements between mid and leftIndex are (globally summed) the
+        //  wantedSize. Binary search.
+        static void findBinary
+        (
+            const label sizeTol,        // size difference considered acceptible
+            const List<scalar>& sortedWeightedSizes,
+            const List<scalar>&,
+            const label leftIndex,      // index of previous value
+            const scalar leftValue,     // value at leftIndex
+            const scalar maxValue,      // global max of values
+            const scalar wantedSize,    // wanted size
+            label& mid,                 // index where size of bin is wantedSize
+            scalar& midValue            // value at mid
+        );
+
         //- Recursively sort in x,y,z (or rather acc. to decompOrder_)
         void sortComponent
         (
@@ -115,6 +142,19 @@ class hierarchGeomDecomp
             labelList& finalDecomp          // overall decomposition
         );
 
+        //- Recursively sort in x,y,z (or rather acc. to decompOrder_)
+        //- using weighted points.
+        void sortComponent
+        (
+            const label sizeTol,
+            const scalarField& weights,
+            const pointField&,
+            const labelList& slice,         // slice of points to decompose
+            const direction componentIndex, // index in decompOrder_
+            const label prevMult,           // multiplication factor
+            labelList& finalDecomp          // overall decomposition
+        );
+
 
         //- Disallow default bitwise copy construct and assignment
         void operator=(const hierarchGeomDecomp&);
@@ -156,6 +196,14 @@ public:
 
         //- Return for every coordinate the wanted processor number. Use the
         //  mesh connectivity (if needed)
+        virtual labelList decompose
+        (
+            const pointField&,
+            const scalarField& weights
+        );
+
+        //- Without weights. Code for weighted decomposition is a bit complex
+        //  so kept separate for now.
         virtual labelList decompose(const pointField&);
 
         //- Return for every coordinate the wanted processor number. Explicitly
@@ -165,6 +213,16 @@ public:
         //    from 0 at processor0 and then incrementing all through the
         //    processors)
         //  - the connections are across coupled patches
+        virtual labelList decompose
+        (
+            const labelListList& globalCellCells,
+            const pointField& cc,
+            const scalarField& cWeights
+        )
+        {
+            return decompose(cc, cWeights);
+        }
+
         virtual labelList decompose
         (
             const labelListList& globalCellCells,
diff --git a/src/decompositionMethods/decompositionMethods/manualDecomp/manualDecomp.C b/src/decompositionMethods/decompositionMethods/manualDecomp/manualDecomp.C
index fd2ff9562d..b852e1cf8d 100644
--- a/src/decompositionMethods/decompositionMethods/manualDecomp/manualDecomp.C
+++ b/src/decompositionMethods/decompositionMethods/manualDecomp/manualDecomp.C
@@ -82,7 +82,11 @@ Foam::manualDecomp::manualDecomp
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::labelList Foam::manualDecomp::decompose(const pointField& points)
+Foam::labelList Foam::manualDecomp::decompose
+(
+    const pointField& points,
+    const scalarField& pointWeights
+)
 {
     const polyMesh& mesh = *meshPtr_;
 
@@ -103,8 +107,10 @@ Foam::labelList Foam::manualDecomp::decompose(const pointField& points)
 
     if (finalDecomp.size() != points.size())
     {
-        FatalErrorIn("manualDecomp::decompose(const pointField&)")
-            << "Size of decomposition list does not correspond "
+        FatalErrorIn
+        (
+            "manualDecomp::decompose(const pointField&, const scalarField&)"
+        )   << "Size of decomposition list does not correspond "
             << "to the number of points.  Size: "
             << finalDecomp.size() << " Number of points: "
             << points.size()
@@ -115,8 +121,10 @@ Foam::labelList Foam::manualDecomp::decompose(const pointField& points)
 
     if (min(finalDecomp) < 0 || max(finalDecomp) > nProcessors_ - 1)
     {
-        FatalErrorIn("labelList manualDecomp::decompose(const pointField&)")
-            << "According to the decomposition, cells assigned to "
+        FatalErrorIn
+        (
+            "manualDecomp::decompose(const pointField&, const scalarField&)"
+        )   << "According to the decomposition, cells assigned to "
             << "impossible processor numbers.  Min processor = "
             << min(finalDecomp) << " Max processor = " << max(finalDecomp)
             << ".\n" << "Manual decomposition data read from file "
diff --git a/src/decompositionMethods/decompositionMethods/manualDecomp/manualDecomp.H b/src/decompositionMethods/decompositionMethods/manualDecomp/manualDecomp.H
index ed5ad4e8c0..0829f3e023 100644
--- a/src/decompositionMethods/decompositionMethods/manualDecomp/manualDecomp.H
+++ b/src/decompositionMethods/decompositionMethods/manualDecomp/manualDecomp.H
@@ -99,7 +99,11 @@ public:
 
         //- Return for every coordinate the wanted processor number. Use the
         //  mesh connectivity (if needed)
-        virtual labelList decompose(const pointField&);
+        virtual labelList decompose
+        (
+            const pointField& points,
+            const scalarField& pointWeights
+        );
 
         //- Return for every coordinate the wanted processor number. Explicitly
         //  provided connectivity - does not use mesh_.
@@ -111,10 +115,11 @@ public:
         virtual labelList decompose
         (
             const labelListList& globalCellCells,
-            const pointField& cc
+            const pointField& cc,
+            const scalarField& cWeights
         )
         {
-            return decompose(cc);
+            return decompose(cc, cWeights);
         }
 };
 
diff --git a/src/decompositionMethods/decompositionMethods/metisDecomp/metisDecomp.C b/src/decompositionMethods/decompositionMethods/metisDecomp/metisDecomp.C
index b4a643562f..3b2c5fb58c 100644
--- a/src/decompositionMethods/decompositionMethods/metisDecomp/metisDecomp.C
+++ b/src/decompositionMethods/decompositionMethods/metisDecomp/metisDecomp.C
@@ -60,6 +60,7 @@ Foam::label Foam::metisDecomp::decompose
 (
     const List<int>& adjncy,
     const List<int>& xadj,
+    const scalarField& cWeights,
 
     List<int>& finalDecomp
 )
@@ -72,6 +73,8 @@ Foam::label Foam::metisDecomp::decompose
     // k-way: multi-level k-way
     word method("k-way");
 
+    int numCells = xadj.size()-1;
+
     // decomposition options. 0 = use defaults
     List<int> options(5, 0);
 
@@ -85,6 +88,30 @@ Foam::label Foam::metisDecomp::decompose
     // face weights (so on the edges of the dual)
     List<int> faceWeights;
 
+
+    // Check for externally provided cellweights and if so initialise weights
+    scalar maxWeights = gMax(cWeights);
+    if (cWeights.size() > 0)
+    {
+        if (cWeights.size() != numCells)
+        {
+            FatalErrorIn
+            (
+                "metisDecomp::decompose"
+                "(const pointField&, const scalarField&)"
+            )   << "Number of cell weights " << cWeights.size()
+                << " does not equal number of cells " << numCells
+                << exit(FatalError);
+        }
+        // Convert to integers.
+        cellWeights.setSize(cWeights.size());
+        forAll(cellWeights, i)
+        {
+            cellWeights[i] = int(1000000*cWeights[i]/maxWeights);
+        }
+    }
+
+
     // Check for user supplied weights and decomp options
     if (decompositionDict_.found("metisCoeffs"))
     {
@@ -161,52 +188,8 @@ Foam::label Foam::metisDecomp::decompose
                     << exit(FatalError);
             }
         }
-
-        //- faceWeights disabled. Only makes sense for cellCells from mesh.
-        //if (metisCoeffs.readIfPresent("faceWeightsFile", weightsFile))
-        //{
-        //    Info<< "metisDecomp : Using face-based weights." << endl;
-        //
-        //    IOList<int> weights
-        //    (
-        //        IOobject
-        //        (
-        //            weightsFile,
-        //            mesh_.time().timeName(),
-        //            mesh_,
-        //            IOobject::MUST_READ,
-        //            IOobject::AUTO_WRITE
-        //        )
-        //    );
-        //
-        //    if (weights.size() != adjncy.size()/2)
-        //    {
-        //        FatalErrorIn("metisDecomp::decompose(const pointField&)")
-        //            << "Number of face weights " << weights.size()
-        //            << " does not equal number of internal faces "
-        //            << adjncy.size()/2
-        //            << exit(FatalError);
-        //    }
-        //
-        //    // Assume symmetric weights. Keep same ordering as adjncy.
-        //    faceWeights.setSize(adjncy.size());
-        //
-        //    labelList nFacesPerCell(mesh_.nCells(), 0);
-        //
-        //    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
-        //    {
-        //        label w = weights[faceI];
-        //
-        //        label own = mesh_.faceOwner()[faceI];
-        //        label nei = mesh_.faceNeighbour()[faceI];
-        //
-        //        faceWeights[xadj[own] + nFacesPerCell[own]++] = w;
-        //        faceWeights[xadj[nei] + nFacesPerCell[nei]++] = w;
-        //    }
-        //}
     }
 
-    int numCells = xadj.size()-1;
     int nProcs = nProcessors_;
 
     // output: cell -> processor addressing
@@ -327,12 +310,18 @@ Foam::metisDecomp::metisDecomp
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::labelList Foam::metisDecomp::decompose(const pointField& points)
+Foam::labelList Foam::metisDecomp::decompose
+(
+    const pointField& points,
+    const scalarField& pointWeights
+)
 {
     if (points.size() != mesh_.nCells())
     {
-        FatalErrorIn("metisDecomp::decompose(const pointField&)")
-            << "Can use this decomposition method only for the whole mesh"
+        FatalErrorIn
+        (
+            "metisDecomp::decompose(const pointField&,const scalarField&)"
+        )   << "Can use this decomposition method only for the whole mesh"
             << endl
             << "and supply one coordinate (cellCentre) for every cell." << endl
             << "The number of coordinates " << points.size() << endl
@@ -340,19 +329,49 @@ Foam::labelList Foam::metisDecomp::decompose(const pointField& points)
             << exit(FatalError);
     }
 
+    List<int> adjncy;
+    List<int> xadj;
+    calcMetisCSR
+    (
+        mesh_,
+        adjncy,
+        xadj
+    );
+
+    // Decompose using default weights
+    List<int> finalDecomp;
+    decompose(adjncy, xadj, pointWeights, finalDecomp);
+
+    // Copy back to labelList
+    labelList decomp(finalDecomp.size());
+    forAll(decomp, i)
+    {
+        decomp[i] = finalDecomp[i];
+    }
+    return decomp;
+}
+
+
+void Foam::metisDecomp::calcMetisCSR
+(
+    const polyMesh& mesh,
+    List<int>& adjncy,
+    List<int>& xadj
+)
+{
     // Make Metis CSR (Compressed Storage Format) storage
     //   adjncy      : contains neighbours (= edges in graph)
     //   xadj(celli) : start of information in adjncy for celli
 
-    List<int> xadj(mesh_.nCells()+1);
+    xadj.setSize(mesh.nCells()+1);
 
     // Initialise the number of internal faces of the cells to twice the
     // number of internal faces
-    label nInternalFaces = 2*mesh_.nInternalFaces();
+    label nInternalFaces = 2*mesh.nInternalFaces();
 
     // Check the boundary for coupled patches and add to the number of
     // internal faces
-    const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
 
     forAll(pbm, patchi)
     {
@@ -364,17 +383,17 @@ Foam::labelList Foam::metisDecomp::decompose(const pointField& points)
 
     // Create the adjncy array the size of the total number of internal and
     // coupled faces
-    List<int> adjncy(nInternalFaces);
+    adjncy.setSize(nInternalFaces);
 
     // Fill in xadj
     // ~~~~~~~~~~~~
     label freeAdj = 0;
 
-    for (label cellI = 0; cellI < mesh_.nCells(); cellI++)
+    for (label cellI = 0; cellI < mesh.nCells(); cellI++)
     {
         xadj[cellI] = freeAdj;
 
-        const labelList& cFaces = mesh_.cells()[cellI];
+        const labelList& cFaces = mesh.cells()[cellI];
 
         forAll(cFaces, i)
         {
@@ -382,7 +401,7 @@ Foam::labelList Foam::metisDecomp::decompose(const pointField& points)
 
             if
             (
-                mesh_.isInternalFace(faceI)
+                mesh.isInternalFace(faceI)
              || isA<cyclicPolyPatch>(pbm[pbm.whichPatch(faceI)])
             )
             {
@@ -390,19 +409,19 @@ Foam::labelList Foam::metisDecomp::decompose(const pointField& points)
             }
         }
     }
-    xadj[mesh_.nCells()] = freeAdj;
+    xadj[mesh.nCells()] = freeAdj;
 
 
     // Fill in adjncy
     // ~~~~~~~~~~~~~~
 
-    labelList nFacesPerCell(mesh_.nCells(), 0);
+    labelList nFacesPerCell(mesh.nCells(), 0);
 
     // Internal faces
-    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+    for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
     {
-        label own = mesh_.faceOwner()[faceI];
-        label nei = mesh_.faceNeighbour()[faceI];
+        label own = mesh.faceOwner()[faceI];
+        label nei = mesh.faceNeighbour()[faceI];
 
         adjncy[xadj[own] + nFacesPerCell[own]++] = nei;
         adjncy[xadj[nei] + nFacesPerCell[nei]++] = own;
@@ -427,18 +446,6 @@ Foam::labelList Foam::metisDecomp::decompose(const pointField& points)
             }
         }
     }
-
-    // Decompose using default weights
-    List<int> finalDecomp;
-    decompose(adjncy, xadj, finalDecomp);
-
-    // Copy back to labelList
-    labelList decomp(finalDecomp.size());
-    forAll(decomp, i)
-    {
-        decomp[i] = finalDecomp[i];
-    }
-    return decomp;
 }
 
 
@@ -487,14 +494,16 @@ void Foam::metisDecomp::calcMetisCSR
 Foam::labelList Foam::metisDecomp::decompose
 (
     const labelList& agglom,
-    const pointField& agglomPoints
+    const pointField& agglomPoints,
+    const scalarField& agglomWeights
 )
 {
     if (agglom.size() != mesh_.nCells())
     {
         FatalErrorIn
         (
-            "parMetisDecomp::decompose(const labelList&, const pointField&)"
+            "metisDecomp::decompose"
+            "(const labelList&, const pointField&, const scalarField&)"
         )   << "Size of cell-to-coarse map " << agglom.size()
             << " differs from number of cells in mesh " << mesh_.nCells()
             << exit(FatalError);
@@ -521,7 +530,7 @@ Foam::labelList Foam::metisDecomp::decompose
 
     // Decompose using default weights
     List<int> finalDecomp;
-    decompose(adjncy, xadj, finalDecomp);
+    decompose(adjncy, xadj, agglomWeights, finalDecomp);
 
 
     // Rework back into decomposition for original mesh_
@@ -539,14 +548,16 @@ Foam::labelList Foam::metisDecomp::decompose
 Foam::labelList Foam::metisDecomp::decompose
 (
     const labelListList& globalCellCells,
-    const pointField& cellCentres
+    const pointField& cellCentres,
+    const scalarField& cellWeights
 )
 {
     if (cellCentres.size() != globalCellCells.size())
     {
         FatalErrorIn
         (
-            "metisDecomp::decompose(const pointField&, const labelListList&)"
+            "metisDecomp::decompose"
+            "(const pointField&, const labelListList&, const scalarField&)"
         )   << "Inconsistent number of cells (" << globalCellCells.size()
             << ") and number of cell centres (" << cellCentres.size()
             << ")." << exit(FatalError);
@@ -564,7 +575,7 @@ Foam::labelList Foam::metisDecomp::decompose
 
     // Decompose using default weights
     List<int> finalDecomp;
-    decompose(adjncy, xadj, finalDecomp);
+    decompose(adjncy, xadj, cellWeights, finalDecomp);
 
     // Copy back to labelList
     labelList decomp(finalDecomp.size());
diff --git a/src/decompositionMethods/decompositionMethods/metisDecomp/metisDecomp.H b/src/decompositionMethods/decompositionMethods/metisDecomp/metisDecomp.H
index a91427a8e9..6a38e25c8a 100644
--- a/src/decompositionMethods/decompositionMethods/metisDecomp/metisDecomp.H
+++ b/src/decompositionMethods/decompositionMethods/metisDecomp/metisDecomp.H
@@ -60,6 +60,7 @@ class metisDecomp
         (
             const List<int>& adjncy,
             const List<int>& xadj,
+            const scalarField& cellWeights,
             List<int>& finalDecomp
         );
 
@@ -100,7 +101,11 @@ public:
 
         //- Return for every coordinate the wanted processor number. Use the
         //  mesh connectivity (if needed)
-        virtual labelList decompose(const pointField&);
+        virtual labelList decompose
+        (
+            const pointField& points,
+            const scalarField& pointWeights
+        );
 
         //- Return for every coordinate the wanted processor number. Gets
         //  passed agglomeration map (from fine to coarse cells) and coarse cell
@@ -109,7 +114,8 @@ public:
         virtual labelList decompose
         (
             const labelList& agglom,
-            const pointField&
+            const pointField& regionPoints,
+            const scalarField& regionWeights
         );
 
         //- Return for every coordinate the wanted processor number. Explicitly
@@ -122,10 +128,21 @@ public:
         virtual labelList decompose
         (
             const labelListList& globalCellCells,
-            const pointField& cc
+            const pointField& cc,
+            const scalarField& cWeights
         );
 
-        //- Helper to convert cellcells into Metis storage
+        //- Helper to convert connectivity (supplied as owner,neighbour) into
+        //  Metis storage
+        static void calcMetisCSR
+        (
+            const polyMesh& mesh,
+            List<int>& adjncy,
+            List<int>& xadj
+        );
+
+        //- Helper to convert connectivity (supplied as cellcells) into
+        //  Metis storage
         static void calcMetisCSR
         (
             const labelListList& globalCellCells,
diff --git a/src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.C b/src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.C
index 994a824192..61a9483837 100644
--- a/src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.C
+++ b/src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.C
@@ -65,6 +65,7 @@ License
 #include "Time.H"
 #include "cyclicPolyPatch.H"
 #include "OFstream.H"
+#include "metisDecomp.H"
 
 extern "C"
 {
@@ -125,6 +126,7 @@ Foam::label Foam::scotchDecomp::decompose
 (
     const List<int>& adjncy,
     const List<int>& xadj,
+    const scalarField& cWeights,
 
     List<int>& finalDecomp
 )
@@ -160,6 +162,33 @@ Foam::label Foam::scotchDecomp::decompose
     // Graph
     // ~~~~~
 
+    List<int> velotab;
+
+
+    // Check for externally provided cellweights and if so initialise weights
+    scalar maxWeights = gMax(cWeights);
+    if (cWeights.size() > 0)
+    {
+        if (cWeights.size() != xadj.size()-1)
+        {
+            FatalErrorIn
+            (
+                "parMetisDecomp::decompose"
+                "(const pointField&, const scalarField&)"
+            )   << "Number of cell weights " << cWeights.size()
+                << " does not equal number of cells " << xadj.size()-1
+                << exit(FatalError);
+        }
+        // Convert to integers.
+        velotab.setSize(cWeights.size());
+        forAll(velotab, i)
+        {
+            velotab[i] = int(1000000*cWeights[i]/maxWeights);
+        }
+    }
+
+
+
     SCOTCH_Graph grafdat;
     check(SCOTCH_graphInit(&grafdat), "SCOTCH_graphInit");
     check
@@ -171,7 +200,7 @@ Foam::label Foam::scotchDecomp::decompose
             xadj.size()-1,          // vertnbr, nCells
             xadj.begin(),           // verttab, start index per cell into adjncy
             &xadj[1],               // vendtab, end index  ,,
-            NULL,                   // velotab, vertex weights
+            velotab.begin(),        // velotab, vertex weights
             NULL,                   // vlbltab
             adjncy.size(),          // edgenbr, number of arcs
             adjncy.begin(),         // edgetab
@@ -340,7 +369,11 @@ Foam::scotchDecomp::scotchDecomp
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::labelList Foam::scotchDecomp::decompose(const pointField& points)
+Foam::labelList Foam::scotchDecomp::decompose
+(
+    const pointField& points,
+    const scalarField& pointWeights
+)
 {
     if (points.size() != mesh_.nCells())
     {
@@ -356,94 +389,18 @@ Foam::labelList Foam::scotchDecomp::decompose(const pointField& points)
     // Make Metis CSR (Compressed Storage Format) storage
     //   adjncy      : contains neighbours (= edges in graph)
     //   xadj(celli) : start of information in adjncy for celli
-
-    List<int> xadj(mesh_.nCells()+1);
-
-    // Initialise the number of internal faces of the cells to twice the
-    // number of internal faces
-    label nInternalFaces = 2*mesh_.nInternalFaces();
-
-    // Check the boundary for coupled patches and add to the number of
-    // internal faces
-    const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
-
-    forAll(pbm, patchi)
-    {
-        if (isA<cyclicPolyPatch>(pbm[patchi]))
-        {
-            nInternalFaces += pbm[patchi].size();
-        }
-    }
-
-    // Create the adjncy array the size of the total number of internal and
-    // coupled faces
-    List<int> adjncy(nInternalFaces);
-
-    // Fill in xadj
-    // ~~~~~~~~~~~~
-    label freeAdj = 0;
-
-    for (label cellI = 0; cellI < mesh_.nCells(); cellI++)
-    {
-        xadj[cellI] = freeAdj;
-
-        const labelList& cFaces = mesh_.cells()[cellI];
-
-        forAll(cFaces, i)
-        {
-            label faceI = cFaces[i];
-
-            if
-            (
-                mesh_.isInternalFace(faceI)
-             || isA<cyclicPolyPatch>(pbm[pbm.whichPatch(faceI)])
-            )
-            {
-                freeAdj++;
-            }
-        }
-    }
-    xadj[mesh_.nCells()] = freeAdj;
-
-
-    // Fill in adjncy
-    // ~~~~~~~~~~~~~~
-
-    labelList nFacesPerCell(mesh_.nCells(), 0);
-
-    // Internal faces
-    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
-    {
-        label own = mesh_.faceOwner()[faceI];
-        label nei = mesh_.faceNeighbour()[faceI];
-
-        adjncy[xadj[own] + nFacesPerCell[own]++] = nei;
-        adjncy[xadj[nei] + nFacesPerCell[nei]++] = own;
-    }
-
-    // Coupled faces. Only cyclics done.
-    forAll(pbm, patchi)
-    {
-        if (isA<cyclicPolyPatch>(pbm[patchi]))
-        {
-            const unallocLabelList& faceCells = pbm[patchi].faceCells();
-
-            label sizeby2 = faceCells.size()/2;
-
-            for (label facei=0; facei<sizeby2; facei++)
-            {
-                label own = faceCells[facei];
-                label nei = faceCells[facei + sizeby2];
-
-                adjncy[xadj[own] + nFacesPerCell[own]++] = nei;
-                adjncy[xadj[nei] + nFacesPerCell[nei]++] = own;
-            }
-        }
-    }
+    List<int> adjncy;
+    List<int> xadj;
+    metisDecomp::calcMetisCSR
+    (
+        mesh_,
+        adjncy,
+        xadj
+    );
 
     // Decompose using default weights
     List<int> finalDecomp;
-    decompose(adjncy, xadj, finalDecomp);
+    decompose(adjncy, xadj, pointWeights, finalDecomp);
 
     // Copy back to labelList
     labelList decomp(finalDecomp.size());
@@ -455,52 +412,11 @@ Foam::labelList Foam::scotchDecomp::decompose(const pointField& points)
 }
 
 
-// From cell-cell connections to Metis format (like CompactListList)
-void Foam::scotchDecomp::calcMetisCSR
-(
-    const labelListList& cellCells,
-    List<int>& adjncy,
-    List<int>& xadj
-)
-{
-    // Count number of internal faces
-    label nConnections = 0;
-
-    forAll(cellCells, coarseI)
-    {
-        nConnections += cellCells[coarseI].size();
-    }
-
-    // Create the adjncy array as twice the size of the total number of
-    // internal faces
-    adjncy.setSize(nConnections);
-
-    xadj.setSize(cellCells.size()+1);
-
-
-    // Fill in xadj
-    // ~~~~~~~~~~~~
-    label freeAdj = 0;
-
-    forAll(cellCells, coarseI)
-    {
-        xadj[coarseI] = freeAdj;
-
-        const labelList& cCells = cellCells[coarseI];
-
-        forAll(cCells, i)
-        {
-            adjncy[freeAdj++] = cCells[i];
-        }
-    }
-    xadj[cellCells.size()] = freeAdj;
-}
-
-
 Foam::labelList Foam::scotchDecomp::decompose
 (
     const labelList& agglom,
-    const pointField& agglomPoints
+    const pointField& agglomPoints,
+    const scalarField& pointWeights
 )
 {
     if (agglom.size() != mesh_.nCells())
@@ -529,13 +445,12 @@ Foam::labelList Foam::scotchDecomp::decompose
             cellCells
         );
 
-        calcMetisCSR(cellCells, adjncy, xadj);
+        metisDecomp::calcMetisCSR(cellCells, adjncy, xadj);
     }
 
-    // Decompose using default weights
+    // Decompose using weights
     List<int> finalDecomp;
-    decompose(adjncy, xadj, finalDecomp);
-
+    decompose(adjncy, xadj, pointWeights, finalDecomp);
 
     // Rework back into decomposition for original mesh_
     labelList fineDistribution(agglom.size());
@@ -552,7 +467,8 @@ Foam::labelList Foam::scotchDecomp::decompose
 Foam::labelList Foam::scotchDecomp::decompose
 (
     const labelListList& globalCellCells,
-    const pointField& cellCentres
+    const pointField& cellCentres,
+    const scalarField& cWeights
 )
 {
     if (cellCentres.size() != globalCellCells.size())
@@ -572,12 +488,11 @@ Foam::labelList Foam::scotchDecomp::decompose
 
     List<int> adjncy;
     List<int> xadj;
-    calcMetisCSR(globalCellCells, adjncy, xadj);
+    metisDecomp::calcMetisCSR(globalCellCells, adjncy, xadj);
 
-
-    // Decompose using default weights
+    // Decompose using weights
     List<int> finalDecomp;
-    decompose(adjncy, xadj, finalDecomp);
+    decompose(adjncy, xadj, cWeights, finalDecomp);
 
     // Copy back to labelList
     labelList decomp(finalDecomp.size());
diff --git a/src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.H b/src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.H
index e470f84f98..54efb1bafa 100644
--- a/src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.H
+++ b/src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.H
@@ -63,6 +63,7 @@ class scotchDecomp
         (
             const List<int>& adjncy,
             const List<int>& xadj,
+            const scalarField& cWeights,
             List<int>& finalDecomp
         );
 
@@ -103,7 +104,11 @@ public:
 
         //- Return for every coordinate the wanted processor number. Use the
         //  mesh connectivity (if needed)
-        virtual labelList decompose(const pointField&);
+        virtual labelList decompose
+        (
+            const pointField& points,
+            const scalarField& pointWeights
+        );
 
         //- Return for every coordinate the wanted processor number. Gets
         //  passed agglomeration map (from fine to coarse cells) and coarse cell
@@ -112,7 +117,8 @@ public:
         virtual labelList decompose
         (
             const labelList& agglom,
-            const pointField&
+            const pointField& regionPoints,
+            const scalarField& regionWeights
         );
 
         //- Return for every coordinate the wanted processor number. Explicitly
@@ -125,15 +131,8 @@ public:
         virtual labelList decompose
         (
             const labelListList& globalCellCells,
-            const pointField& cc
-        );
-
-        //- Helper to convert cellcells into compact row storage
-        static void calcMetisCSR
-        (
-            const labelListList& globalCellCells,
-            List<int>& adjncy,
-            List<int>& xadj
+            const pointField& cc,
+            const scalarField& cWeights
         );
 
 };
diff --git a/src/decompositionMethods/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C b/src/decompositionMethods/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
index 57cf17e55f..50d5842fb8 100644
--- a/src/decompositionMethods/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
+++ b/src/decompositionMethods/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "simpleGeomDecomp.H"
@@ -93,6 +91,49 @@ void Foam::simpleGeomDecomp::assignToProcessorGroup
 }
 
 
+void Foam::simpleGeomDecomp::assignToProcessorGroup
+(
+    labelList& processorGroup,
+    const label nProcGroup,
+    const labelList& indices,
+    const scalarField& weights,
+    const scalar summedWeights
+)
+{
+    // This routine gets the sorted points.
+    // Easiest to explain with an example.
+    // E.g. 400 points, sum of weights : 513.
+    // Now with number of divisions in this direction (nProcGroup) : 4
+    // gives the split at 513/4 = 128
+    // So summed weight from 0..128 goes into bin 0,
+    //     ,,              128..256 goes into bin 1
+    //   etc.
+    // Finally any remaining ones go into the last bin (3).
+
+    const scalar jump = summedWeights/nProcGroup;
+    const label nProcGroupM1 = nProcGroup - 1;
+    scalar sumWeights = 0;
+    label ind = 0;
+    label j = 0;
+
+    // assign cells to all except last group.
+    for (j=0; j<nProcGroupM1; j++)
+    {
+        const scalar limit = jump*scalar(j + 1);
+        while (sumWeights < limit)
+        {
+            sumWeights += weights[indices[ind]];
+            processorGroup[ind++] = j;
+        }
+    }
+    // Ensure last included.
+    while (ind < processorGroup.size())
+    {
+       processorGroup[ind++] = nProcGroupM1;
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::simpleGeomDecomp::simpleGeomDecomp(const dictionary& decompositionDict)
@@ -121,7 +162,10 @@ Foam::labelList Foam::simpleGeomDecomp::decompose(const pointField& points)
     labelList processorGroups(points.size());
 
     labelList pointIndices(points.size());
-    forAll(pointIndices, i) {pointIndices[i] = i;}
+    forAll(pointIndices, i)
+    {
+        pointIndices[i] = i;
+    }
 
     pointField rotatedPoints = rotDelta_ & points;
 
@@ -175,9 +219,101 @@ Foam::labelList Foam::simpleGeomDecomp::decompose(const pointField& points)
         finalDecomp[pointIndices[i]] += n_.x()*n_.y()*processorGroups[i];
     }
 
-
     return finalDecomp;
 }
 
 
+Foam::labelList Foam::simpleGeomDecomp::decompose
+(
+    const pointField& points,
+    const scalarField& weights
+)
+{
+    // construct a list for the final result
+    labelList finalDecomp(points.size());
+
+    labelList processorGroups(points.size());
+
+    labelList pointIndices(points.size());
+    forAll(pointIndices, i)
+    {
+        pointIndices[i] = i;
+    }
+
+    pointField rotatedPoints = rotDelta_ & points;
+
+    // and one to take the processor group id's. For each direction.
+    // we assign the processors to groups of processors labelled
+    // 0..nX to give a banded structure on the mesh. Then we
+    // construct the actual processor number by treating this as
+    // the units part of the processor number.
+    sort
+    (
+        pointIndices,
+        UList<scalar>::less(rotatedPoints.component(vector::X))
+    );
+    
+    const scalar summedWeights = sum(weights);
+    assignToProcessorGroup
+    (
+        processorGroups, 
+        n_.x(), 
+        pointIndices, 
+        weights, 
+        summedWeights
+    );
+
+    forAll(points, i)
+    {
+        finalDecomp[pointIndices[i]] = processorGroups[i];
+    }
+
+
+    // now do the same thing in the Y direction. These processor group
+    // numbers add multiples of nX to the proc. number (columns)
+    sort
+    (
+        pointIndices,
+        UList<scalar>::less(rotatedPoints.component(vector::Y))
+    );
+
+    assignToProcessorGroup
+    (
+        processorGroups,
+        n_.y(), 
+        pointIndices, 
+        weights, 
+        summedWeights
+    );
+
+    forAll(points, i)
+    {
+        finalDecomp[pointIndices[i]] += n_.x()*processorGroups[i];
+    }
+
+
+    // finally in the Z direction. Now we add multiples of nX*nY to give
+    // layers
+    sort
+    (
+        pointIndices,
+        UList<scalar>::less(rotatedPoints.component(vector::Z))
+    );
+
+    assignToProcessorGroup
+    (
+        processorGroups, 
+        n_.z(), 
+        pointIndices, 
+        weights, 
+        summedWeights
+    );
+
+    forAll(points, i)
+    {
+        finalDecomp[pointIndices[i]] += n_.x()*n_.y()*processorGroups[i];
+    }
+
+    return finalDecomp;
+} 
 // ************************************************************************* //
diff --git a/src/decompositionMethods/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H b/src/decompositionMethods/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
index e1f312b5f3..595db50c2c 100644
--- a/src/decompositionMethods/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
+++ b/src/decompositionMethods/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
@@ -52,6 +52,15 @@ class simpleGeomDecomp
 
         void assignToProcessorGroup(labelList& processorGroup, const label);
 
+        void assignToProcessorGroup
+        (
+            labelList& processorGroup, 
+            const label nProcGroup,
+            const labelList& indices,
+            const scalarField& weights,
+            const scalar summedWeights
+        );
+
         //- Disallow default bitwise copy construct and assignment
         void operator=(const simpleGeomDecomp&);
         simpleGeomDecomp(const simpleGeomDecomp&);
@@ -86,21 +95,31 @@ public:
 
         virtual bool parallelAware() const
         {
-            // simple decomp does not attempt to do anything across proc
+            // simpleDecomp does not attempt to do anything across proc
             // boundaries
             return false;
         }
 
-        virtual labelList decompose(const pointField&);
+        virtual labelList decompose
+        (
+            const pointField& points
+        );
+
+        virtual labelList decompose
+        (
+            const pointField& points,
+            const scalarField& pointWeights
+        );
 
         //- Explicitly provided connectivity
         virtual labelList decompose
         (
             const labelListList& globalCellCells,
-            const pointField& cc
+            const pointField& cc,
+            const scalarField& cWeights
         )
         {
-            return decompose(cc);
+            return decompose(cc, cWeights);
         }
 };
 
diff --git a/src/decompositionMethods/parMetisDecomp/parMetisDecomp.C b/src/decompositionMethods/parMetisDecomp/parMetisDecomp.C
index c6c6e061e9..c4dde21d65 100644
--- a/src/decompositionMethods/parMetisDecomp/parMetisDecomp.C
+++ b/src/decompositionMethods/parMetisDecomp/parMetisDecomp.C
@@ -24,9 +24,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "syncTools.H"
 #include "parMetisDecomp.H"
 #include "metisDecomp.H"
+#include "syncTools.H"
 #include "addToRunTimeSelectionTable.H"
 #include "floatScalar.H"
 #include "polyMesh.H"
@@ -370,15 +370,22 @@ Foam::parMetisDecomp::parMetisDecomp
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::labelList Foam::parMetisDecomp::decompose(const pointField& points)
+Foam::labelList Foam::parMetisDecomp::decompose
+(
+    const pointField& cc,
+    const scalarField& cWeights
+)
 {
-    if (points.size() != mesh_.nCells())
+    if (cc.size() != mesh_.nCells())
     {
-        FatalErrorIn("parMetisDecomp::decompose(const pointField&)")
-            << "Can use this decomposition method only for the whole mesh"
+        FatalErrorIn
+        (
+            "parMetisDecomp::decompose"
+            "(const pointField&, const scalarField&)"
+        )   << "Can use this decomposition method only for the whole mesh"
             << endl
             << "and supply one coordinate (cellCentre) for every cell." << endl
-            << "The number of coordinates " << points.size() << endl
+            << "The number of coordinates " << cc.size() << endl
             << "The number of cells in the mesh " << mesh_.nCells()
             << exit(FatalError);
     }
@@ -386,156 +393,24 @@ Foam::labelList Foam::parMetisDecomp::decompose(const pointField& points)
     // For running sequential ...
     if (Pstream::nProcs() <= 1)
     {
-        return metisDecomp(decompositionDict_, mesh_).decompose(points);
-    }
-
-    // Create global cell numbers
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Get number of cells on all processors
-    List<int> nLocalCells(Pstream::nProcs());
-    nLocalCells[Pstream::myProcNo()] = mesh_.nCells();
-    Pstream::gatherList(nLocalCells);
-    Pstream::scatterList(nLocalCells);
-
-    // Get cell offsets.
-    List<int> cellOffsets(Pstream::nProcs()+1);
-    int nGlobalCells = 0;
-    forAll(nLocalCells, procI)
-    {
-        cellOffsets[procI] = nGlobalCells;
-        nGlobalCells += nLocalCells[procI];
-    }
-    cellOffsets[Pstream::nProcs()] = nGlobalCells;
-
-    int myOffset = cellOffsets[Pstream::myProcNo()];
-
-
-    //
-    // Make Metis Distributed CSR (Compressed Storage Format) storage
-    //   adjncy      : contains cellCells (= edges in graph)
-    //   xadj(celli) : start of information in adjncy for celli
-    //
-
-
-
-    const labelList& faceOwner = mesh_.faceOwner();
-    const labelList& faceNeighbour = mesh_.faceNeighbour();
-    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
-
-
-    // Get renumbered owner on other side of coupled faces
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    List<int> globalNeighbour(mesh_.nFaces()-mesh_.nInternalFaces());
-
-    forAll(patches, patchI)
-    {
-        const polyPatch& pp = patches[patchI];
-
-        if (pp.coupled())
-        {
-            label faceI = pp.start();
-            label bFaceI = pp.start() - mesh_.nInternalFaces();
-
-            forAll(pp, i)
-            {
-                globalNeighbour[bFaceI++] = faceOwner[faceI++] + myOffset;
-            }
-        }
-    }
-
-    // Get the cell on the other side of coupled patches
-    syncTools::swapBoundaryFaceList(mesh_, globalNeighbour, false);
-
-
-    // Count number of faces (internal + coupled)
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Number of faces per cell
-    List<int> nFacesPerCell(mesh_.nCells(), 0);
-
-    // Number of coupled faces
-    label nCoupledFaces = 0;
-
-    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
-    {
-        nFacesPerCell[faceOwner[faceI]]++;
-        nFacesPerCell[faceNeighbour[faceI]]++;
-    }
-    // Handle coupled faces
-    forAll(patches, patchI)
-    {
-        const polyPatch& pp = patches[patchI];
-
-        if (pp.coupled())
-        {
-            label faceI = pp.start();
-
-            forAll(pp, i)
-            {
-                nCoupledFaces++;
-                nFacesPerCell[faceOwner[faceI++]]++;
-            }
-        }
+        return metisDecomp(decompositionDict_, mesh_).decompose
+        (
+            cc,
+            cWeights
+        );
     }
 
 
-    // Fill in xadj
-    // ~~~~~~~~~~~~
-
-    Field<int> xadj(mesh_.nCells()+1, -1);
-
-    int freeAdj = 0;
-
-    for (label cellI = 0; cellI < mesh_.nCells(); cellI++)
-    {
-        xadj[cellI] = freeAdj;
-
-        freeAdj += nFacesPerCell[cellI];
-    }
-    xadj[mesh_.nCells()] = freeAdj;
-
-
-
-    // Fill in adjncy
-    // ~~~~~~~~~~~~~~
-
-    Field<int> adjncy(2*mesh_.nInternalFaces() + nCoupledFaces, -1);
-
-    nFacesPerCell = 0;
-
-    // For internal faces is just offsetted owner and neighbour
-    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
-    {
-        label own = faceOwner[faceI];
-        label nei = faceNeighbour[faceI];
-
-        adjncy[xadj[own] + nFacesPerCell[own]++] = nei + myOffset;
-        adjncy[xadj[nei] + nFacesPerCell[nei]++] = own + myOffset;
-    }
-    // For boundary faces is offsetted coupled neighbour
-    forAll(patches, patchI)
-    {
-        const polyPatch& pp = patches[patchI];
-
-        if (pp.coupled())
-        {
-            label faceI = pp.start();
-            label bFaceI = pp.start()-mesh_.nInternalFaces();
-
-            forAll(pp, i)
-            {
-                label own = faceOwner[faceI];
-                adjncy[xadj[own] + nFacesPerCell[own]++] =
-                    globalNeighbour[bFaceI];
-
-                faceI++;
-                bFaceI++;
-            }
-        }
-    }
-
+    // Connections
+    Field<int> adjncy;
+    // Offsets into adjncy
+    Field<int> xadj;
+    calcMetisDistributedCSR
+    (
+        mesh_,
+        adjncy,
+        xadj
+    );
 
 
     // decomposition options. 0 = use defaults
@@ -550,6 +425,30 @@ Foam::labelList Foam::parMetisDecomp::decompose(const pointField& points)
     // face weights (so on the edges of the dual)
     Field<int> faceWeights;
 
+
+    // Check for externally provided cellweights and if so initialise weights
+    scalar maxWeights = gMax(cWeights);
+    if (cWeights.size() > 0)
+    {
+        if (cWeights.size() != mesh_.nCells())
+        {
+            FatalErrorIn
+            (
+                "metisDecomp::decompose"
+                "(const pointField&, const scalarField&)"
+            )   << "Number of cell weights " << cWeights.size()
+                << " does not equal number of cells " << mesh_.nCells()
+                << exit(FatalError);
+        }
+        // Convert to integers.
+        cellWeights.setSize(cWeights.size());
+        forAll(cellWeights, i)
+        {
+            cellWeights[i] = int(1000000*cWeights[i]/maxWeights);
+        }
+    }
+
+
     // Check for user supplied weights and decomp options
     if (decompositionDict_.found("metisCoeffs"))
     {
@@ -577,8 +476,11 @@ Foam::labelList Foam::parMetisDecomp::decompose(const pointField& points)
 
             if (cellWeights.size() != mesh_.nCells())
             {
-                FatalErrorIn("parMetisDecomp::decompose(const pointField&)")
-                    << "Number of cell weights " << cellWeights.size()
+                FatalErrorIn
+                (
+                    "parMetisDecomp::decompose"
+                    "(const pointField&, const scalarField&)"
+                )   << "Number of cell weights " << cellWeights.size()
                     << " read from " << cellIOWeights.objectPath()
                     << " does not equal number of cells " << mesh_.nCells()
                     << exit(FatalError);
@@ -604,30 +506,35 @@ Foam::labelList Foam::parMetisDecomp::decompose(const pointField& points)
 
             if (weights.size() != mesh_.nFaces())
             {
-                FatalErrorIn("parMetisDecomp::decompose(const pointField&)")
-                    << "Number of face weights " << weights.size()
+                FatalErrorIn
+                (
+                    "parMetisDecomp::decompose"
+                    "(const pointField&, const scalarField&)"
+                )   << "Number of face weights " << weights.size()
                     << " does not equal number of internal and boundary faces "
                     << mesh_.nFaces()
                     << exit(FatalError);
             }
 
-            faceWeights.setSize(2*mesh_.nInternalFaces()+nCoupledFaces);
+            faceWeights.setSize(adjncy.size());
 
             // Assume symmetric weights. Keep same ordering as adjncy.
-            nFacesPerCell = 0;
+            List<int> nFacesPerCell(mesh_.nCells(), 0);
 
             // Handle internal faces
             for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
             {
                 label w = weights[faceI];
 
-                label own = faceOwner[faceI];
-                label nei = faceNeighbour[faceI];
+                label own = mesh_.faceOwner()[faceI];
+                label nei = mesh_.faceNeighbour()[faceI];
 
                 faceWeights[xadj[own] + nFacesPerCell[own]++] = w;
                 faceWeights[xadj[nei] + nFacesPerCell[nei]++] = w;
             }
             // Coupled boundary faces
+            const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
             forAll(patches, patchI)
             {
                 const polyPatch& pp = patches[patchI];
@@ -639,8 +546,8 @@ Foam::labelList Foam::parMetisDecomp::decompose(const pointField& points)
                     forAll(pp, i)
                     {
                         label w = weights[faceI];
-                        label own = faceOwner[faceI];
-                        adjncy[xadj[own] + nFacesPerCell[own]++] = w;
+                        label own = mesh_.faceOwner()[faceI];
+                        faceWeights[xadj[own] + nFacesPerCell[own]++] = w;
                         faceI++;
                     }
                 }
@@ -654,8 +561,11 @@ Foam::labelList Foam::parMetisDecomp::decompose(const pointField& points)
 
             if (options.size() != 3)
             {
-                FatalErrorIn("parMetisDecomp::decompose(const pointField&)")
-                    << "Number of options " << options.size()
+                FatalErrorIn
+                (
+                    "parMetisDecomp::decompose"
+                    "(const pointField&, const scalarField&)"
+                )   << "Number of options " << options.size()
                     << " should be three." << exit(FatalError);
             }
         }
@@ -668,7 +578,7 @@ Foam::labelList Foam::parMetisDecomp::decompose(const pointField& points)
     (
         xadj,
         adjncy,
-        points,
+        cc,
         cellWeights,
         faceWeights,
         options,
@@ -689,7 +599,8 @@ Foam::labelList Foam::parMetisDecomp::decompose(const pointField& points)
 Foam::labelList Foam::parMetisDecomp::decompose
 (
     const labelList& cellToRegion,
-    const pointField& regionPoints
+    const pointField& regionPoints,
+    const scalarField& regionWeights
 )
 {
     const labelList& faceOwner = mesh_.faceOwner();
@@ -798,7 +709,15 @@ Foam::labelList Foam::parMetisDecomp::decompose
         }
     }
 
-    labelList regionDecomp(decompose(globalRegionRegions, regionPoints));
+    labelList regionDecomp
+    (
+        decompose
+        (
+            globalRegionRegions,
+            regionPoints,
+            regionWeights
+        )
+    );
 
     // Rework back into decomposition for original mesh_
     labelList cellDistribution(cellToRegion.size());
@@ -814,24 +733,26 @@ Foam::labelList Foam::parMetisDecomp::decompose
 Foam::labelList Foam::parMetisDecomp::decompose
 (
     const labelListList& globalCellCells,
-    const pointField& cellCentres
+    const pointField& cellCentres,
+    const scalarField& cWeights
 )
 {
     if (cellCentres.size() != globalCellCells.size())
     {
         FatalErrorIn
         (
-            "parMetisDecomp::decompose(const labelListList&, const pointField&)"
+            "parMetisDecomp::decompose(const labelListList&"
+            ", const pointField&, const scalarField&)"
         )   << "Inconsistent number of cells (" << globalCellCells.size()
             << ") and number of cell centres (" << cellCentres.size()
-            << ")." << exit(FatalError);
+            << ") or weights (" << cWeights.size() << ")." << exit(FatalError);
     }
 
     // For running sequential ...
     if (Pstream::nProcs() <= 1)
     {
         return metisDecomp(decompositionDict_, mesh_)
-            .decompose(globalCellCells, cellCentres);
+            .decompose(globalCellCells, cellCentres, cWeights);
     }
 
 
@@ -855,106 +776,35 @@ Foam::labelList Foam::parMetisDecomp::decompose
     // face weights (so on the edges of the dual)
     Field<int> faceWeights;
 
+
+    // Check for externally provided cellweights and if so initialise weights
+    scalar maxWeights = gMax(cWeights);
+    if (cWeights.size() > 0)
+    {
+        if (cWeights.size() != globalCellCells.size())
+        {
+            FatalErrorIn
+            (
+                "parMetisDecomp::decompose(const labelListList&"
+                ", const pointField&, const scalarField&)"
+            )   << "Number of cell weights " << cWeights.size()
+                << " does not equal number of cells " << globalCellCells.size()
+                << exit(FatalError);
+        }
+        // Convert to integers.
+        cellWeights.setSize(cWeights.size());
+        forAll(cellWeights, i)
+        {
+            cellWeights[i] = int(1000000*cWeights[i]/maxWeights);
+        }
+    }
+
+
     // Check for user supplied weights and decomp options
     if (decompositionDict_.found("metisCoeffs"))
     {
         const dictionary& metisCoeffs =
             decompositionDict_.subDict("metisCoeffs");
-        word weightsFile;
-
-        if (metisCoeffs.readIfPresent("cellWeightsFile", weightsFile))
-        {
-            Info<< "parMetisDecomp : Using cell-based weights read from "
-                << weightsFile << endl;
-
-            labelIOField cellIOWeights
-            (
-                IOobject
-                (
-                    weightsFile,
-                    mesh_.time().timeName(),
-                    mesh_,
-                    IOobject::MUST_READ,
-                    IOobject::AUTO_WRITE
-                )
-            );
-            cellWeights.transfer(cellIOWeights);
-
-            if (cellWeights.size() != cellCentres.size())
-            {
-                FatalErrorIn
-                (
-                    "parMetisDecomp::decompose"
-                    "(const labelListList&, const pointField&)"
-                )   << "Number of cell weights " << cellWeights.size()
-                    << " read from " << cellIOWeights.objectPath()
-                    << " does not equal number of cells " << cellCentres.size()
-                    << exit(FatalError);
-            }
-        }
-
-        //- faceWeights disabled. Only makes sense for cellCells from mesh.
-        //if (metisCoeffs.readIfPresent("faceWeightsFile", weightsFile))
-        //{
-        //    Info<< "parMetisDecomp : Using face-based weights read from "
-        //        << weightsFile << endl;
-        //
-        //    labelIOField weights
-        //    (
-        //        IOobject
-        //        (
-        //            weightsFile,
-        //            mesh_.time().timeName(),
-        //            mesh_,
-        //            IOobject::MUST_READ,
-        //            IOobject::AUTO_WRITE
-        //        )
-        //    );
-        //
-        //    if (weights.size() != mesh_.nFaces())
-        //    {
-        //        FatalErrorIn("parMetisDecomp::decompose(const pointField&)")
-        //            << "Number of face weights " << weights.size()
-        //            << " does not equal number of internal and boundary faces "
-        //            << mesh_.nFaces()
-        //            << exit(FatalError);
-        //    }
-        //
-        //    faceWeights.setSize(2*mesh_.nInternalFaces()+nCoupledFaces);
-        //
-        //    // Assume symmetric weights. Keep same ordering as adjncy.
-        //    nFacesPerCell = 0;
-        //
-        //    // Handle internal faces
-        //    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
-        //    {
-        //        label w = weights[faceI];
-        //
-        //        label own = faceOwner[faceI];
-        //        label nei = faceNeighbour[faceI];
-        //
-        //        faceWeights[xadj[own] + nFacesPerCell[own]++] = w;
-        //        faceWeights[xadj[nei] + nFacesPerCell[nei]++] = w;
-        //    }
-        //    // Coupled boundary faces
-        //    forAll(patches, patchI)
-        //    {
-        //        const polyPatch& pp = patches[patchI];
-        //
-        //        if (pp.coupled())
-        //        {
-        //            label faceI = pp.start();
-        //
-        //            forAll(pp, i)
-        //            {
-        //                label w = weights[faceI];
-        //                label own = faceOwner[faceI];
-        //                adjncy[xadj[own] + nFacesPerCell[own]++] = w;
-        //                faceI++;
-        //            }
-        //        }
-        //    }
-        //}
 
         if (metisCoeffs.readIfPresent("options", options))
         {
@@ -965,8 +815,8 @@ Foam::labelList Foam::parMetisDecomp::decompose
             {
                 FatalErrorIn
                 (
-                    "parMetisDecomp::decompose"
-                    "(const labelListList&, const pointField&)"
+                    "parMetisDecomp::decompose(const labelListList&"
+                    ", const pointField&, const scalarField&)"
                 )   << "Number of options " << options.size()
                     << " should be three." << exit(FatalError);
             }
@@ -998,4 +848,146 @@ Foam::labelList Foam::parMetisDecomp::decompose
 }
 
 
+void Foam::parMetisDecomp::calcMetisDistributedCSR
+(
+    const polyMesh& mesh,
+    List<int>& adjncy,
+    List<int>& xadj
+)
+{
+    // Create global cell numbers
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    globalIndex globalCells(mesh.nCells());
+
+
+    //
+    // Make Metis Distributed CSR (Compressed Storage Format) storage
+    //   adjncy      : contains cellCells (= edges in graph)
+    //   xadj(celli) : start of information in adjncy for celli
+    //
+
+
+    const labelList& faceOwner = mesh.faceOwner();
+    const labelList& faceNeighbour = mesh.faceNeighbour();
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+
+    // Get renumbered owner on other side of coupled faces
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    List<int> globalNeighbour(mesh.nFaces()-mesh.nInternalFaces());
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled())
+        {
+            label faceI = pp.start();
+            label bFaceI = pp.start() - mesh.nInternalFaces();
+
+            forAll(pp, i)
+            {
+                globalNeighbour[bFaceI++] = globalCells.toGlobal
+                (
+                    faceOwner[faceI++]
+                );
+            }
+        }
+    }
+
+    // Get the cell on the other side of coupled patches
+    syncTools::swapBoundaryFaceList(mesh, globalNeighbour, false);
+
+
+    // Count number of faces (internal + coupled)
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Number of faces per cell
+    List<int> nFacesPerCell(mesh.nCells(), 0);
+
+    // Number of coupled faces
+    label nCoupledFaces = 0;
+
+    for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+    {
+        nFacesPerCell[faceOwner[faceI]]++;
+        nFacesPerCell[faceNeighbour[faceI]]++;
+    }
+    // Handle coupled faces
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled())
+        {
+            label faceI = pp.start();
+
+            forAll(pp, i)
+            {
+                nCoupledFaces++;
+                nFacesPerCell[faceOwner[faceI++]]++;
+            }
+        }
+    }
+
+
+    // Fill in xadj
+    // ~~~~~~~~~~~~
+
+    xadj.setSize(mesh.nCells()+1);
+
+    int freeAdj = 0;
+
+    for (label cellI = 0; cellI < mesh.nCells(); cellI++)
+    {
+        xadj[cellI] = freeAdj;
+
+        freeAdj += nFacesPerCell[cellI];
+    }
+    xadj[mesh.nCells()] = freeAdj;
+
+
+
+    // Fill in adjncy
+    // ~~~~~~~~~~~~~~
+
+    adjncy.setSize(2*mesh.nInternalFaces() + nCoupledFaces);
+
+    nFacesPerCell = 0;
+
+    // For internal faces is just offsetted owner and neighbour
+    for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+    {
+        label own = faceOwner[faceI];
+        label nei = faceNeighbour[faceI];
+
+        adjncy[xadj[own] + nFacesPerCell[own]++] = globalCells.toGlobal(nei);
+        adjncy[xadj[nei] + nFacesPerCell[nei]++] = globalCells.toGlobal(own);
+    }
+    // For boundary faces is offsetted coupled neighbour
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (pp.coupled())
+        {
+            label faceI = pp.start();
+            label bFaceI = pp.start()-mesh.nInternalFaces();
+
+            forAll(pp, i)
+            {
+                label own = faceOwner[faceI];
+                adjncy[xadj[own] + nFacesPerCell[own]++] =
+                    globalNeighbour[bFaceI];
+
+                faceI++;
+                bFaceI++;
+            }
+        }
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/decompositionMethods/parMetisDecomp/parMetisDecomp.H b/src/decompositionMethods/parMetisDecomp/parMetisDecomp.H
index 13aa57277c..dda8173557 100644
--- a/src/decompositionMethods/parMetisDecomp/parMetisDecomp.H
+++ b/src/decompositionMethods/parMetisDecomp/parMetisDecomp.H
@@ -112,7 +112,11 @@ public:
 
         //- Return for every coordinate the wanted processor number. Use the
         //  mesh connectivity (if needed)
-        virtual labelList decompose(const pointField&);
+        virtual labelList decompose
+        (
+            const pointField& points,
+            const scalarField& pointWeights
+        );
 
         //- Return for every coordinate the wanted processor number. Gets
         //  passed agglomeration map (from fine to coarse cells) and coarse cell
@@ -120,8 +124,9 @@ public:
         //  functionality natively.
         virtual labelList decompose
         (
-            const labelList& agglom,
-            const pointField&
+            const labelList& cellToRegion,
+            const pointField& regionPoints,
+            const scalarField& regionWeights
         );
 
         //- Return for every coordinate the wanted processor number. Explicitly
@@ -134,7 +139,16 @@ public:
         virtual labelList decompose
         (
             const labelListList& globalCellCells,
-            const pointField& cc
+            const pointField& cc,
+            const scalarField& cWeights
+        );
+
+        //- Helper to convert mesh connectivity into distributed CSR
+        static void calcMetisDistributedCSR
+        (
+            const polyMesh&,
+            List<int>& adjncy,
+            List<int>& xadj
         );
 };
 
diff --git a/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C b/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C
index ca300e4d36..5dfe589ec3 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C
+++ b/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C
@@ -79,7 +79,7 @@ Foam::autoPtr<Foam::dynamicFvMesh> Foam::dynamicFvMesh::New(const IOobject& io)
         )   << "Unknown dynamicFvMesh type " << dynamicFvMeshTypeName
             << endl << endl
             << "Valid dynamicFvMesh types are :" << endl
-            << IOobjectConstructorTablePtr_->toc()
+            << IOobjectConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C
index 11e6e656b3..8c9fcbc522 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C
@@ -55,7 +55,7 @@ Foam::autoPtr<Foam::solidBodyMotionFunction> Foam::solidBodyMotionFunction::New
         )   << "Unknown solidBodyMotionFunction type "
             << solidBodyMotionFunctionTypeName << endl << endl
             << "Valid  solidBodyMotionFunctions are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/dynamicMesh/Make/files b/src/dynamicMesh/Make/files
index 2343124597..e59bbe3800 100644
--- a/src/dynamicMesh/Make/files
+++ b/src/dynamicMesh/Make/files
@@ -16,16 +16,13 @@ $(enrichedPatch)/enrichedPatchPointPoints.C
 $(enrichedPatch)/enrichedPatchCutFaces.C
 $(enrichedPatch)/enrichedPatchMasterPoints.C
 
-/* polyTopoChange/polyTopoChange/polyTopoChange.C */
-polyTopoChange/polyTopoChange/topoAction/topoActions.C
 
 polyMeshModifier = polyTopoChange/polyMeshModifier
 $(polyMeshModifier)/polyMeshModifier.C
 $(polyMeshModifier)/newPolyMeshModifier.C
 
+polyTopoChange/polyTopoChange/topoAction/topoActions.C
 polyTopoChange/polyTopoChanger/polyTopoChanger.C
-/* polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C */
-
 polyTopoChange/polyTopoChange/polyTopoChange.C
 polyTopoChange/polyTopoChange/addPatchCellLayer.C
 polyTopoChange/polyTopoChange/edgeCollapser.C
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 633c39f478..f815b46d71 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -1418,18 +1418,18 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
                 nOldPoints,
                 nOldFaces,
                 nOldCells,
-                oldPatchStarts,
-                oldPatchNMeshPoints,
+                oldPatchStarts.xfer(),
+                oldPatchNMeshPoints.xfer(),
 
-                labelListList(1, identity(mesh_.nPoints())),//subPointMap
-                labelListList(1, identity(mesh_.nFaces())), //subFaceMap
-                labelListList(1, identity(mesh_.nCells())), //subCellMap
-                labelListList(1, identity(patches.size())), //subPatchMap
+                labelListList(1, identity(mesh_.nPoints())).xfer(),//subPointMap
+                labelListList(1, identity(mesh_.nFaces())).xfer(), //subFaceMap
+                labelListList(1, identity(mesh_.nCells())).xfer(), //subCellMap
+                labelListList(1, identity(patches.size())).xfer(), //subPatchMap
 
-                labelListList(1, identity(mesh_.nPoints())),//constructPointMap
-                labelListList(1, identity(mesh_.nFaces())), //constructFaceMap
-                labelListList(1, identity(mesh_.nCells())), //constructCellMap
-                labelListList(1, identity(patches.size()))  //constructPatchMap
+                labelListList(1, identity(mesh_.nPoints())).xfer(),//pointMap
+                labelListList(1, identity(mesh_.nFaces())).xfer(), //faceMap
+                labelListList(1, identity(mesh_.nCells())).xfer(), //cellMap
+                labelListList(1, identity(patches.size())).xfer()  //patchMap
             )
         );
     }
@@ -2207,19 +2207,18 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
             nOldPoints,
             nOldFaces,
             nOldCells,
-            oldPatchStarts,
-            oldPatchNMeshPoints,
+            oldPatchStarts.xfer(),
+            oldPatchNMeshPoints.xfer(),
 
-            subPointMap,
-            subFaceMap,
-            subCellMap,
-            subPatchMap,
+            subPointMap.xfer(),
+            subFaceMap.xfer(),
+            subCellMap.xfer(),
+            subPatchMap.xfer(),
 
-            constructPointMap,
-            constructFaceMap,
-            constructCellMap,
-            constructPatchMap,
-            true                // reuse storage
+            constructPointMap.xfer(),
+            constructFaceMap.xfer(),
+            constructCellMap.xfer(),
+            constructPatchMap.xfer()
         )
     );
 }
diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
index d7cd195837..83fb08bc5c 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
@@ -62,7 +62,7 @@ autoPtr<cellLooper> cellLooper::New
         )   << "Unknown set type " << type
             << endl << endl
             << "Valid cellLooper types : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/dynamicMesh/meshCut/directions/directions.H b/src/dynamicMesh/meshCut/directions/directions.H
index 11b06f1f44..9debd4b210 100644
--- a/src/dynamicMesh/meshCut/directions/directions.H
+++ b/src/dynamicMesh/meshCut/directions/directions.H
@@ -74,7 +74,7 @@ public:
         {
             TAN1,
             TAN2,
-            NORMAL,
+            NORMAL
         };
 
 private:
diff --git a/src/dynamicMesh/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolver/motionSolver.C
index a7a8883371..5966679feb 100644
--- a/src/dynamicMesh/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolver/motionSolver.C
@@ -107,7 +107,7 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New(const polyMesh& mesh)
         )   << "Unknown solver type " << solverTypeName
             << endl << endl
             << "Valid solver types are: " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C
index 00547da73b..ca2d7b6826 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C
@@ -64,7 +64,7 @@ autoPtr<polyMeshModifier> polyMeshModifier::New
             dict
         )   << "Unknown polyMeshModifier type " << patchType << endl << endl
             << "Valid polyMeshModifier types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index af4a37bead..926f2f4913 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -350,6 +350,18 @@ void Foam::hexRef8::modFace
 // Bit complex way to determine the unrefined edge length.
 Foam::scalar Foam::hexRef8::getLevel0EdgeLength() const
 {
+    if (cellLevel_.size() != mesh_.nCells())
+    {
+        FatalErrorIn
+        (
+            "hexRef8::getLevel0EdgeLength() const"
+        )   << "Number of cells in mesh:" << mesh_.nCells()
+            << " does not equal size of cellLevel:" << cellLevel_.size()
+            << endl
+            << "This might be because of a restart with inconsistent cellLevel."
+            << abort(FatalError);
+    }
+
     // Determine minimum edge length per refinement level
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
index 18d1170c00..f90e9a036b 100644
--- a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
@@ -43,7 +43,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const Foam::scalar Foam::slidingInterface::edgeCoPlanarTol_ = 0.8;
+const Foam::scalar Foam::slidingInterface::edgeCoPlanarTolDefault_ = 0.8;
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 80d68749e8..316dd389b6 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -27,10 +27,8 @@ License
 #include "slidingInterface.H"
 #include "polyTopoChanger.H"
 #include "polyMesh.H"
-#include "primitiveMesh.H"
 #include "polyTopoChange.H"
 #include "addToRunTimeSelectionTable.H"
-#include "triPointRef.H"
 #include "plane.H"
 
 // Index of debug signs:
@@ -173,6 +171,14 @@ Foam::slidingInterface::slidingInterface
     attached_(false),
     projectionAlgo_(algo),
     trigger_(false),
+    pointMergeTol_(pointMergeTolDefault_),
+    edgeMergeTol_(edgeMergeTolDefault_),
+    nFacesPerSlaveEdge_(nFacesPerSlaveEdgeDefault_),
+    edgeFaceEscapeLimit_(edgeFaceEscapeLimitDefault_),
+    integralAdjTol_(integralAdjTolDefault_),
+    edgeMasterCatchFraction_(edgeMasterCatchFractionDefault_),
+    edgeCoPlanarTol_(edgeCoPlanarTolDefault_),
+    edgeEndCutoffTol_(edgeEndCutoffTolDefault_),
     cutFaceMasterPtr_(NULL),
     cutFaceSlavePtr_(NULL),
     masterFaceCellsPtr_(NULL),
@@ -280,6 +286,9 @@ Foam::slidingInterface::slidingInterface
     masterPointEdgeHitsPtr_(NULL),
     projectedSlavePointsPtr_(NULL)
 {
+    // Optionally default tolerances from dictionary
+    setTolerances(dict);
+
     checkDefinition();
 
     // If the interface is attached, the master and slave face zone addressing
@@ -686,6 +695,63 @@ const Foam::pointField& Foam::slidingInterface::pointProjection() const
     return *projectedSlavePointsPtr_;
 }
 
+void Foam::slidingInterface::setTolerances(const dictionary&dict, bool report)
+{
+    pointMergeTol_ = dict.lookupOrDefault<scalar>
+    (
+        "pointMergeTol",
+        pointMergeTol_
+    );
+    edgeMergeTol_ = dict.lookupOrDefault<scalar>
+    (
+        "edgeMergeTol",
+        edgeMergeTol_
+    );
+    nFacesPerSlaveEdge_ = dict.lookupOrDefault<scalar>
+    (
+        "nFacesPerSlaveEdge",
+        nFacesPerSlaveEdge_
+    );
+    edgeFaceEscapeLimit_ = dict.lookupOrDefault<scalar>
+    (
+        "edgeFaceEscapeLimit",
+        edgeFaceEscapeLimit_
+    );
+    integralAdjTol_ = dict.lookupOrDefault<scalar>
+    (
+        "integralAdjTol",
+        integralAdjTol_
+    );
+    edgeMasterCatchFraction_ = dict.lookupOrDefault<scalar>
+    (
+        "edgeMasterCatchFraction",
+        edgeMasterCatchFraction_
+    );
+    edgeCoPlanarTol_ = dict.lookupOrDefault<scalar>
+    (
+        "edgeCoPlanarTol",
+        edgeCoPlanarTol_
+    );
+    edgeEndCutoffTol_ = dict.lookupOrDefault<scalar>
+    (
+        "edgeEndCutoffTol",
+        edgeEndCutoffTol_
+    );
+
+    if (report)
+    {
+        Info<< "Sliding interface parameters:" << nl
+            << "pointMergeTol            : " << pointMergeTol_ << nl
+            << "edgeMergeTol             : " << edgeMergeTol_ << nl
+            << "nFacesPerSlaveEdge       : " << nFacesPerSlaveEdge_ << nl
+            << "edgeFaceEscapeLimit      : " << edgeFaceEscapeLimit_ << nl
+            << "integralAdjTol           : " << integralAdjTol_ << nl
+            << "edgeMasterCatchFraction  : " << edgeMasterCatchFraction_ << nl
+            << "edgeCoPlanarTol          : " << edgeCoPlanarTol_ << nl
+            << "edgeEndCutoffTol         : " << edgeEndCutoffTol_ << endl;
+    }
+}
+
 
 void Foam::slidingInterface::write(Ostream& os) const
 {
@@ -703,6 +769,14 @@ void Foam::slidingInterface::write(Ostream& os) const
 }
 
 
+// To write out all those tolerances
+#define WRITE_NON_DEFAULT(name) \
+    if( name ## _ != name ## Default_ )\
+    { \
+        os << "    " #name " " <<  name ## _ << token::END_STATEMENT << nl; \
+    }
+
+
 void Foam::slidingInterface::writeDict(Ostream& os) const
 {
     os  << nl << name() << nl << token::BEGIN_BLOCK << nl
@@ -743,6 +817,15 @@ void Foam::slidingInterface::writeDict(Ostream& os) const
             << token::END_STATEMENT << nl;
     }
 
+    WRITE_NON_DEFAULT(pointMergeTol)
+    WRITE_NON_DEFAULT(edgeMergeTol)
+    WRITE_NON_DEFAULT(nFacesPerSlaveEdge)
+    WRITE_NON_DEFAULT(edgeFaceEscapeLimit)
+    WRITE_NON_DEFAULT(integralAdjTol)
+    WRITE_NON_DEFAULT(edgeMasterCatchFraction)
+    WRITE_NON_DEFAULT(edgeCoPlanarTol)
+    WRITE_NON_DEFAULT(edgeEndCutoffTol)
+
     os  << token::END_BLOCK << endl;
 }
 
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.H b/src/dynamicMesh/slidingInterface/slidingInterface.H
index 376c969e38..f86e423c65 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.H
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.H
@@ -129,6 +129,32 @@ private:
         //- Trigger topological change
         mutable bool trigger_;
 
+        // Tolerances. Initialised to static ones below.
+
+            //- Point merge tolerance
+            scalar pointMergeTol_;
+
+            //- Edge merge tolerance
+            scalar edgeMergeTol_;
+
+            //- Estimated number of faces an edge goes through
+            label nFacesPerSlaveEdge_;
+
+            //- Edge-face interaction escape limit
+            label edgeFaceEscapeLimit_;
+
+            //- Integral match point adjustment tolerance
+            scalar integralAdjTol_;
+
+            //- Edge intersection master catch fraction
+            scalar edgeMasterCatchFraction_;
+
+            //- Edge intersection co-planar tolerance
+            scalar edgeCoPlanarTol_;
+
+            //- Edge end cut-off tolerance
+            scalar edgeEndCutoffTol_;
+
 
         // Private addressing data.
 
@@ -256,28 +282,28 @@ private:
     // Static data members
 
         //- Point merge tolerance
-        static const scalar pointMergeTol_;
+        static const scalar pointMergeTolDefault_;
 
         //- Edge merge tolerance
-        static const scalar edgeMergeTol_;
+        static const scalar edgeMergeTolDefault_;
 
         //- Estimated number of faces an edge goes through
-        static const label nFacesPerSlaveEdge_;
+        static const label nFacesPerSlaveEdgeDefault_;
 
         //- Edge-face interaction escape limit
-        static const label edgeFaceEscapeLimit_;
+        static const label edgeFaceEscapeLimitDefault_;
 
         //- Integral match point adjustment tolerance
-        static const scalar integralAdjTol_;
+        static const scalar integralAdjTolDefault_;
 
         //- Edge intersection master catch fraction
-        static const scalar edgeMasterCatchFraction_;
+        static const scalar edgeMasterCatchFractionDefault_;
 
         //- Edge intersection co-planar tolerance
-        static const scalar edgeCoPlanarTol_;
+        static const scalar edgeCoPlanarTolDefault_;
 
         //- Edge end cut-off tolerance
-        static const scalar edgeEndCutoffTol_;
+        static const scalar edgeEndCutoffTolDefault_;
 
 
 public:
@@ -350,6 +376,8 @@ public:
         //- Return projected points for a slave patch
         const pointField& pointProjection() const;
 
+        //- Set the tolerances from the values in a dictionary
+        void setTolerances(const dictionary&, bool report=false);
 
         //- Write
         virtual void write(Ostream&) const;
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index a34fd0f7b9..cc4643bcde 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -26,22 +26,19 @@ License
 
 #include "slidingInterface.H"
 #include "polyMesh.H"
-#include "primitiveMesh.H"
 #include "line.H"
-#include "triPointRef.H"
-#include "plane.H"
 #include "polyTopoChanger.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const Foam::scalar Foam::slidingInterface::pointMergeTol_ = 0.05;
-const Foam::scalar Foam::slidingInterface::edgeMergeTol_ = 0.01;
-const Foam::label Foam::slidingInterface::nFacesPerSlaveEdge_ = 5;
-const Foam::label Foam::slidingInterface::edgeFaceEscapeLimit_ = 10;
+const Foam::scalar Foam::slidingInterface::pointMergeTolDefault_ = 0.05;
+const Foam::scalar Foam::slidingInterface::edgeMergeTolDefault_ = 0.01;
+const Foam::label Foam::slidingInterface::nFacesPerSlaveEdgeDefault_ = 5;
+const Foam::label Foam::slidingInterface::edgeFaceEscapeLimitDefault_ = 10;
 
-const Foam::scalar Foam::slidingInterface::integralAdjTol_ = 0.05;
-const Foam::scalar Foam::slidingInterface::edgeMasterCatchFraction_ = 0.4;
-const Foam::scalar Foam::slidingInterface::edgeEndCutoffTol_ = 0.0001;
+const Foam::scalar Foam::slidingInterface::integralAdjTolDefault_ = 0.05;
+const Foam::scalar Foam::slidingInterface::edgeMasterCatchFractionDefault_ = 0.4;
+const Foam::scalar Foam::slidingInterface::edgeEndCutoffTolDefault_ = 0.0001;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/engine/engineMesh/engineMesh/newEngineMesh.C b/src/engine/engineMesh/engineMesh/newEngineMesh.C
index bf2a6033df..158db3073e 100644
--- a/src/engine/engineMesh/engineMesh/newEngineMesh.C
+++ b/src/engine/engineMesh/engineMesh/newEngineMesh.C
@@ -69,7 +69,7 @@ Foam::autoPtr<Foam::engineMesh> Foam::engineMesh::New
         )   << "Unknown engineMesh type " << engineMeshTypeName
             << endl << endl
             << "Valid engineMesh types are :" << endl
-            << IOobjectConstructorTablePtr_->toc()
+            << IOobjectConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 6be4b7f3f4..7ecbf878a6 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -86,7 +86,6 @@ $(basicFvPatchFields)/coupled/coupledFvPatchFields.C
 $(basicFvPatchFields)/directionMixed/directionMixedFvPatchFields.C
 $(basicFvPatchFields)/fixedGradient/fixedGradientFvPatchFields.C
 $(basicFvPatchFields)/fixedValue/fixedValueFvPatchFields.C
-$(basicFvPatchFields)/generic/genericFvPatchFields.C
 $(basicFvPatchFields)/mixed/mixedFvPatchFields.C
 $(basicFvPatchFields)/sliced/slicedFvPatchFields.C
 $(basicFvPatchFields)/transform/transformFvPatchFields.C
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C
index ff94172db0..cc4400daba 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C
@@ -76,7 +76,7 @@ autoPtr<SRFModel> SRFModel::New
         )   << "Unknown SRFModel type " << SRFModelTypeName
             << nl << nl
             << "Valid SRFModel types are :" << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
index 34e85c2e27..3251e2541e 100644
--- a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
+++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
@@ -81,7 +81,10 @@ Foam::porousZone::porousZone
 {
     Info<< "Creating porous zone: " << name_ << endl;
 
-    if (cellZoneID_ == -1 && !Pstream::parRun())
+    bool foundZone = (cellZoneID_ != -1);
+    reduce(foundZone, orOp<bool>());
+
+    if (!foundZone && Pstream::master())
     {
         FatalErrorIn
         (
@@ -91,6 +94,7 @@ Foam::porousZone::porousZone
             << exit(FatalError);
     }
 
+
     // porosity
     if (dict_.readIfPresent("porosity", porosity_))
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
index 12544a105f..a6ae6f1ee6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
@@ -136,7 +136,7 @@ void buoyantPressureFvPatchScalarField::updateCoeffs()
 void buoyantPressureFvPatchScalarField::write(Ostream& os) const
 {
     fixedGradientFvPatchScalarField::write(os);
-    os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
     writeEntry("value", os);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.C
index d85e393fd8..e62987148d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedValue/directMappedFixedValueFvPatchField.C
@@ -114,12 +114,12 @@ directMappedFixedValueFvPatchField<Type>::directMappedFixedValueFvPatchField
             << exit(FatalError);
     }
 
-    // Force calculation of schedule (uses parallel comms)
-    const directMappedPatchBase& mpp = refCast<const directMappedPatchBase>
-    (
-        this->patch().patch()
-    );
-    (void)mpp.map().schedule();
+    //// Force calculation of schedule (uses parallel comms)
+    //const directMappedPatchBase& mpp = refCast<const directMappedPatchBase>
+    //(
+    //    this->patch().patch()
+    //);
+    //(void)mpp.map().schedule();
 }
 
 
@@ -166,6 +166,10 @@ void directMappedFixedValueFvPatchField<Type>::updateCoeffs()
         directMappedFixedValueFvPatchField<Type>::patch().patch()
     );
     const mapDistribute& distMap = mpp.map();
+
+    // Force recalculation of schedule
+    (void)distMap.schedule();
+
     const fvMesh& nbrMesh = refCast<const fvMesh>(mpp.sampleMesh());
     const word& fldName = this->dimensionedInternalField().name();
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index 5cc373e78d..2da4d21c66 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -159,14 +159,8 @@ void Foam::flowRateInletVelocityFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchField<vector>::write(os);
     os.writeKeyword("flowRate") << flowRate_ << token::END_STATEMENT << nl;
-    if (phiName_ != "phi")
-    {
-        os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
-    }
-    if (rhoName_ != "rho")
-    {
-        os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
-    }
+    writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
     writeEntry("value", os);
 }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
index e1b4016818..bb74cddcd2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
@@ -70,7 +70,7 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchField<Type>(p, iF),
+    fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
     refValue_(ptf.refValue_, mapper),
     amplitude_(ptf.amplitude_),
     frequency_(ptf.frequency_),
@@ -188,13 +188,12 @@ void oscillatingFixedValueFvPatchField<Type>::updateCoeffs()
 template<class Type>
 void oscillatingFixedValueFvPatchField<Type>::write(Ostream& os) const
 {
-    fvPatchField<Type>::write(os);
+    fixedValueFvPatchField<Type>::write(os);
     refValue_.writeEntry("refValue", os);
     os.writeKeyword("amplitude")
         << amplitude_ << token::END_STATEMENT << nl;
     os.writeKeyword("frequency")
         << frequency_ << token::END_STATEMENT << nl;
-    this->writeEntry("value", os);
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C
index 59fc3b3633..3ef0d0e427 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C
@@ -54,7 +54,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
         )   << "Unknown patchTypefield type " << patchFieldType
             << endl << endl
             << "Valid patchField types are :" << endl
-            << patchConstructorTablePtr_->toc()
+            << patchConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -111,7 +111,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
             )   << "Unknown patchField type " << patchFieldType
                 << " for patch type " << p.type() << endl << endl
                 << "Valid patchField types are :" << endl
-                << dictionaryConstructorTablePtr_->toc()
+                << dictionaryConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
     }
@@ -178,7 +178,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
             "const fvPatchFieldMapper&)"
         )   << "unknown patchTypefield type " << ptf.type() << endl << endl
             << "Valid patchField types are :" << endl
-            << patchMapperConstructorTablePtr_->toc()
+            << patchMapperConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index a98785aedc..d0a664ddd4 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -96,8 +96,8 @@ public:
     //- Runtime type information
     TypeName("fvsPatchField");
 
-    //- Debug switch to disallow the use of
-    static int disallowDefaultFvsPatchField;
+    //- Debug switch to disallow the use of genericFvsPatchField
+    static int disallowGenericFvsPatchField;
 
 
     // Declare run-time constructor selection tables
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
index 88ebe16059..12091f6699 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
@@ -37,9 +37,9 @@ namespace Foam
                                                                               \
 defineNamedTemplateTypeNameAndDebug(fvsPatchTypeField, 0);                    \
 template<>                                                                    \
-int fvsPatchTypeField::disallowDefaultFvsPatchField                           \
+int fvsPatchTypeField::disallowGenericFvsPatchField                           \
 (                                                                             \
-    debug::debugSwitch("disallowDefaultFvsPatchField", 0)                     \
+    debug::debugSwitch("disallowGenericFvsPatchField", 0)                     \
 );                                                                            \
 defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patch);                \
 defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patchMapper);          \
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C
index f74f3ed87a..d8427a3445 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C
@@ -59,7 +59,7 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
         )   << "Unknown patchTypefield type " << patchFieldType
             << endl << endl
             << "Valid patchField types are :" << endl
-            << patchConstructorTablePtr_->toc()
+            << patchConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -100,9 +100,9 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        if (!disallowDefaultFvsPatchField)
+        if (!disallowGenericFvsPatchField)
         {
-            cstrIter = dictionaryConstructorTablePtr_->find("default");
+            cstrIter = dictionaryConstructorTablePtr_->find("generic");
         }
 
         if (cstrIter == dictionaryConstructorTablePtr_->end())
@@ -115,12 +115,12 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
             )   << "Unknown patchField type " << patchFieldType
                 << " for patch type " << p.type() << endl << endl
                 << "Valid patchField types are :" << endl
-                << dictionaryConstructorTablePtr_->toc()
+                << dictionaryConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
     }
 
-    if 
+    if
     (
         !dict.found("patchType")
      || word(dict.lookup("patchType")) != p.type()
@@ -183,7 +183,7 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
             "const fvPatchFieldMapper&)"
         )   << "unknown patchTypefield type " << ptf.type() << endl << endl
             << "Valid patchField types are :" << endl
-            << patchMapperConstructorTablePtr_->toc()
+            << patchMapperConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
index 1a8947cd8c..ce5c19d791 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
@@ -79,7 +79,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             schemeData
         )   << "Convection scheme not specified" << endl << endl
             << "Valid convection schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -97,7 +97,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             schemeData
         )   << "unknown convection scheme " << schemeName << endl << endl
             << "Valid convection schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -136,7 +136,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             schemeData
         )   << "Convection scheme not specified" << endl << endl
             << "Valid convection schemes are :" << endl
-            << MultivariateConstructorTablePtr_->toc()
+            << MultivariateConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -156,7 +156,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             schemeData
         )   << "unknown convection scheme " << schemeName << endl << endl
             << "Valid convection schemes are :" << endl
-            << MultivariateConstructorTablePtr_->toc()
+            << MultivariateConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
index 9783d2694d..0018817c68 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
@@ -64,7 +64,7 @@ tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
             schemeData
         )   << "D2dt2 scheme not specified" << endl << endl
             << "Valid d2dt2 schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -81,7 +81,7 @@ tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
             schemeData
         )   << "unknown d2dt2 scheme " << schemeName << endl << endl
             << "Valid d2dt2 schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 854060453f..80d47fe830 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -62,7 +62,7 @@ tmp<ddtScheme<Type> > ddtScheme<Type>::New
             schemeData
         )   << "Ddt scheme not specified" << endl << endl
             << "Valid ddt schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -79,7 +79,7 @@ tmp<ddtScheme<Type> > ddtScheme<Type>::New
             schemeData
         )   << "unknown ddt scheme " << schemeName << endl << endl
             << "Valid ddt schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
index e40cece4d4..8d283b9fc8 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
@@ -65,7 +65,7 @@ tmp<divScheme<Type> > divScheme<Type>::New
             schemeData
         )   << "Div scheme not specified" << endl << endl
             << "Valid div schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -82,7 +82,7 @@ tmp<divScheme<Type> > divScheme<Type>::New
             schemeData
         )   << "unknown div scheme " << schemeName << endl << endl
             << "Valid div schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index ae5c3afce1..6d7cc56560 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -64,7 +64,7 @@ tmp<gradScheme<Type> > gradScheme<Type>::New
             schemeData
         )   << "Grad scheme not specified" << endl << endl
             << "Valid grad schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -81,7 +81,7 @@ tmp<gradScheme<Type> > gradScheme<Type>::New
             schemeData
         )   << "unknown grad scheme " << schemeName << endl << endl
             << "Valid grad schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
index a0b04008e2..eb14f253ad 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
@@ -63,7 +63,7 @@ tmp<laplacianScheme<Type, GType> > laplacianScheme<Type, GType>::New
             schemeData
         )   << "Laplacian scheme not specified" << endl << endl
             << "Valid laplacian schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -80,7 +80,7 @@ tmp<laplacianScheme<Type, GType> > laplacianScheme<Type, GType>::New
             schemeData
         )   << "unknown laplacian scheme " << schemeName << endl << endl
             << "Valid laplacian schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index 54f5ff5460..5fee351987 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -65,7 +65,7 @@ tmp<snGradScheme<Type> > snGradScheme<Type>::New
         )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -83,7 +83,7 @@ tmp<snGradScheme<Type> > snGradScheme<Type>::New
         )   << "Unknown discretisation scheme " << schemeName
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
index 5b1cb12e34..8a7224288c 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
@@ -280,9 +280,8 @@ Foam::extendedCellToFaceStencil::calcDistributeMap
         new mapDistribute
         (
             nCompact,
-            sendCompact,
-            recvCompact,
-            true            // reuse send/recv maps.
+            sendCompact.xfer(),
+            recvCompact.xfer()
         )
     );
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C
index 8ae0c3b0d9..62c55633de 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C
@@ -50,7 +50,7 @@ Foam::autoPtr<Foam::fvPatch> Foam::fvPatch::New
         FatalErrorIn("fvPatch::New(const polyPatch&, const fvBoundaryMesh&)")
             << "Unknown fvPatch type " << patch.type() << ".\n"
             << "Valid fvPatch types are :"
-            << polyPatchConstructorTablePtr_->toc()
+            << polyPatchConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C b/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C
index 377815ea9a..cf6827a10f 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C
@@ -50,7 +50,7 @@ Foam::interpolation<Type>::New
         )   << "Unknown interpolation type " << interpolationType
             << " for field " << psi.name() << nl << nl
             << "Valid interpolation types : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
index 77b18ab806..2d5b9dfcb9 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
@@ -62,7 +62,7 @@ limitedSurfaceInterpolationScheme<Type>::New
         )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -81,7 +81,7 @@ limitedSurfaceInterpolationScheme<Type>::New
         )   << "Unknown discretisation scheme " << schemeName
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -117,7 +117,7 @@ limitedSurfaceInterpolationScheme<Type>::New
         )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -136,7 +136,7 @@ limitedSurfaceInterpolationScheme<Type>::New
         )   << "Unknown discretisation scheme " << schemeName
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshFluxConstructorTablePtr_->toc()
+            << MeshFluxConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
index 5efc36af2f..a920dcb204 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
@@ -92,7 +92,7 @@ multivariateSurfaceInterpolationScheme<Type>::New
             schemeData
         )   << "unknown discretisation scheme " << schemeName << endl << endl
             << "Valid schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 4702ccb5aa..9c43eeb48d 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -56,7 +56,7 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
         )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -83,7 +83,7 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
         )   << "Unknown discretisation scheme " << schemeName
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -110,7 +110,7 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
         )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -138,7 +138,7 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
         )   << "Unknown discretisation scheme " << schemeName
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshFluxConstructorTablePtr_->toc()
+            << MeshFluxConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
index b794db4a43..50936f456a 100644
--- a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
@@ -68,7 +68,7 @@ Foam::autoPtr<Foam::motionDiffusivity> Foam::motionDiffusivity::New
         )   << "Unknown diffusion type " << diffTypeName
             << endl << endl
             << "Valid diffusion types are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/genericPatchFields/Make/files b/src/genericPatchFields/Make/files
new file mode 100644
index 0000000000..333d154a6d
--- /dev/null
+++ b/src/genericPatchFields/Make/files
@@ -0,0 +1,4 @@
+genericFvPatchField/genericFvPatchFields.C
+genericPointPatchField/genericPointPatchFields.C
+
+LIB = $(FOAM_LIBBIN)/libgenericPatchFields
diff --git a/src/genericPatchFields/Make/options b/src/genericPatchFields/Make/options
new file mode 100644
index 0000000000..71b7873964
--- /dev/null
+++ b/src/genericPatchFields/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
similarity index 99%
rename from src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchField.C
rename to src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index 058021f612..ec4c323a91 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -79,7 +79,6 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
             << "    (Actual type " << actualTypeName_ << ")" << nl
             << "\n    Please add the 'value' entry to the write function "
                "of the user-defined boundary-condition\n"
-               "    or link the boundary-condition into libfoamUtil.so"
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchField.H b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
similarity index 98%
rename from src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchField.H
rename to src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
index 1144b11010..694bc92b52 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchField.H
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
@@ -26,7 +26,8 @@ Class
     Foam::genericFvPatchField
 
 Description
-    Foam::genericFvPatchField
+    A generic version of calculatedFvPatchField, useful as a fallback for
+    handling unknown patch types.
 
 SourceFiles
     genericFvPatchField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchFields.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.C
similarity index 100%
rename from src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchFields.C
rename to src/genericPatchFields/genericFvPatchField/genericFvPatchFields.C
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchFields.H b/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.H
similarity index 100%
rename from src/finiteVolume/fields/fvPatchFields/basic/generic/genericFvPatchFields.H
rename to src/genericPatchFields/genericFvPatchField/genericFvPatchFields.H
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/generic/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
similarity index 100%
rename from src/OpenFOAM/fields/pointPatchFields/basic/generic/genericPointPatchField.C
rename to src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/generic/genericPointPatchField.H b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
similarity index 97%
rename from src/OpenFOAM/fields/pointPatchFields/basic/generic/genericPointPatchField.H
rename to src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
index bedd11b4ec..8ce85fded1 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/generic/genericPointPatchField.H
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
@@ -26,7 +26,8 @@ Class
     Foam::genericPointPatchField
 
 Description
-    Foam::genericPointPatchField
+    A generic version of calculatedPointPatchField, useful as a fallback for
+    handling unknown patch types.
 
 SourceFiles
     genericPointPatchField.C
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/generic/genericPointPatchFields.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.C
similarity index 100%
rename from src/OpenFOAM/fields/pointPatchFields/basic/generic/genericPointPatchFields.C
rename to src/genericPatchFields/genericPointPatchField/genericPointPatchFields.C
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/generic/genericPointPatchFields.H b/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.H
similarity index 100%
rename from src/OpenFOAM/fields/pointPatchFields/basic/generic/genericPointPatchFields.H
rename to src/genericPatchFields/genericPointPatchField/genericPointPatchFields.H
diff --git a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
index 511679af37..8607b8eab1 100644
--- a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
+++ b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
@@ -74,7 +74,7 @@ Foam::autoPtr<Foam::injectorType> Foam::injectorType::New
             << injectorTypeName
             << ", constructor not in hash table" << endl << endl
             << "    Valid injector types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<injectorType>(cstrIter()(t, dict));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C
index 7a5cfdffe1..8d2d8ca99f 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C
@@ -61,7 +61,7 @@ autoPtr<atomizationModel> atomizationModel::New
             << atomizationModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid atomizationModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<atomizationModel>(cstrIter()(dict, sm));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C
index 69f3c5fcf4..d0889443eb 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C
@@ -62,7 +62,7 @@ autoPtr<breakupModel> breakupModel::New
             << breakupModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid breakupModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<breakupModel>(cstrIter()(dict, sm));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C
index 8f60f6dc4d..942ebafe8d 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C
@@ -67,7 +67,7 @@ autoPtr<collisionModel> collisionModel::New
             << ", constructor not in hash table" << endl << endl
             << "    Valid collisionModel types are :"
             << endl;
-        Info<< dictionaryConstructorTablePtr_->toc()
+        Info<< dictionaryConstructorTablePtr_->sortedToc()
             << abort(FatalError);
     }
 
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C
index cf03049155..50d6cbce8a 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C
@@ -62,7 +62,7 @@ autoPtr<dispersionModel> dispersionModel::New
             << dispersionModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid dispersionModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<dispersionModel>(cstrIter()(dict, sm));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C
index 7424851d62..6fed754f95 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C
@@ -60,7 +60,7 @@ autoPtr<dragModel> dragModel::New
             << dragModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid dragModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<dragModel>(cstrIter()(dict));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C
index ff94baf830..2d400a09d4 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C
@@ -62,7 +62,7 @@ autoPtr<evaporationModel> evaporationModel::New
             << evaporationModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid evaporationModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<evaporationModel>(cstrIter()(dict));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C
index 4be6465c6d..308fbfa697 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C
@@ -60,7 +60,7 @@ autoPtr<heatTransferModel> heatTransferModel::New
             << heatTransferModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid heatTransferModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<heatTransferModel>(cstrIter()(dict));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C
index 59940886c7..41758a8259 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C
@@ -61,7 +61,7 @@ autoPtr<injectorModel> injectorModel::New
             << injectorModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid injectorModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<injectorModel>(cstrIter()(dict, sm));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C
index c4648bc90a..3274533b1d 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C
@@ -61,7 +61,7 @@ autoPtr<wallModel> wallModel::New
             << wallModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid wallModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<wallModel>(cstrIter()(dict, U, sm));
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C
index 12c74f6697..e122b66eaa 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C
@@ -56,7 +56,7 @@ Foam::BinaryCollisionModel<CloudType>::New
             << BinaryCollisionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid BinaryCollisionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<BinaryCollisionModel<CloudType> >
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C
index bc1005bdaf..b94f08898b 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C
@@ -53,7 +53,7 @@ Foam::InflowBoundaryModel<CloudType>::New
             << InflowBoundaryModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid InflowBoundaryModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<InflowBoundaryModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
index 97197cd669..6320812427 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
@@ -55,7 +55,7 @@ Foam::WallInteractionModel<CloudType>::New
             << WallInteractionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid WallInteractionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<WallInteractionModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C
index db73158615..83cbd33d8a 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C
@@ -55,7 +55,7 @@ Foam::IntegrationScheme<Type>::New
         )   << "Unknown IntegrationScheme type "
             << IntegrationSchemeTypeName << nl << nl
             << "Valid IntegrationScheme types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
index 3bed47c540..f55fcb1190 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
             << "Unknown DataEntry type " << DataEntryType << " for DataEntry "
             << entryName << ". Constructor not in hash table" << nl << nl
             << "    Valid DataEntry types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
index 09717b8e86..9347146b01 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "DispersionModel.H"
@@ -58,7 +56,7 @@ Foam::DispersionModel<CloudType>::New
             << DispersionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid DispersionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<DispersionModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
index 6e1e80d3cd..2202079b8c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
@@ -55,7 +55,7 @@ Foam::autoPtr<Foam::DragModel<CloudType> > Foam::DragModel<CloudType>::New
             << DragModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid DragModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
index c0926272c6..3f6464ac0f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
@@ -56,7 +56,7 @@ Foam::InjectionModel<CloudType>::New
             << InjectionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid InjectionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<InjectionModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C
index 83740bb684..20887aa230 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C
@@ -57,7 +57,7 @@ Foam::PatchInteractionModel<CloudType>::New
             << PatchInteractionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid PatchInteractionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<PatchInteractionModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C
index 29c096b677..563ceebec2 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C
@@ -56,7 +56,7 @@ Foam::PostProcessingModel<CloudType>::New
             << PostProcessingModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid PostProcessingModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<PostProcessingModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
index 81d338176c..1c9b9a11db 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
@@ -56,7 +56,7 @@ Foam::CompositionModel<CloudType>::New
             << CompositionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid CompositionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
index 3b317c5b05..264b4b1226 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
@@ -56,7 +56,7 @@ Foam::PhaseChangeModel<CloudType>::New
             << PhaseChangeModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid PhaseChangeModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<PhaseChangeModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
index cac0375b28..471fee8aab 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
@@ -57,7 +57,7 @@ Foam::DevolatilisationModel<CloudType>::New
             << DevolatilisationModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid DevolatilisationModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<DevolatilisationModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
index 348bfa8a8c..807891d08e 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
@@ -57,7 +57,7 @@ Foam::SurfaceReactionModel<CloudType>::New
             << SurfaceReactionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid SurfaceReactionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<SurfaceReactionModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
index d5d4748c4d..235c9ae18c 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
@@ -56,7 +56,7 @@ Foam::HeatTransferModel<CloudType>::New
             << HeatTransferModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid HeatTransferModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<HeatTransferModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
index fae1d15e6b..e9cf99d723 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cloudAbsorptionEmission.H"
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
index 6fc8c65acf..533adf4f05 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cloudScatter.H"
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C
index ccbdb8c92e..a7cb8455db 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C
@@ -60,7 +60,7 @@ autoPtr<energyScalingFunction> energyScalingFunction::New
         )   << "Unknown energyScalingFunction type "
             << energyScalingFunctionTypeName << nl << nl
             << "Valid  energyScalingFunctions are: " << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C
index 2986a0e539..6123079583 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C
@@ -56,7 +56,7 @@ autoPtr<pairPotential> pairPotential::New
         )   << "Unknown pairPotential type "
             << pairPotentialTypeName << nl << nl
             << "Valid  pairPotentials are: " << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C
index 85c8a70359..a5b3ad6092 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C
@@ -60,7 +60,7 @@ autoPtr<tetherPotential> tetherPotential::New
         )   << "Unknown tetherPotential type "
             << tetherPotentialTypeName << nl << nl
             << "Valid  tetherPotentials are: " << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWave.H b/src/meshTools/PointEdgeWave/PointEdgeWave.H
index c7c79e96b3..ee684801a6 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/PointEdgeWave/PointEdgeWave.H
@@ -244,6 +244,7 @@ class PointEdgeWave
         //- Disallow default bitwise assignment
         void operator=(const PointEdgeWave&);
 
+
 public:
 
     // Static Functions
@@ -261,7 +262,6 @@ public:
         }
 
 
-
     // Constructors
 
         //- Construct from mesh, list of changed points with the Type
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWaveName.C b/src/meshTools/PointEdgeWave/PointEdgeWaveName.C
index 5a834dac45..8c6a37e11f 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWaveName.C
+++ b/src/meshTools/PointEdgeWave/PointEdgeWaveName.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "PointEdgeWave.H"
diff --git a/src/meshTools/PointEdgeWave/pointEdgePoint.C b/src/meshTools/PointEdgeWave/pointEdgePoint.C
index e994774059..ad0fc3869c 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePoint.C
+++ b/src/meshTools/PointEdgeWave/pointEdgePoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointEdgePoint.H"
@@ -32,8 +30,6 @@ Description
 
 Foam::point Foam::pointEdgePoint::greatPoint(GREAT, GREAT, GREAT);
 
-
-
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 Foam::Ostream& Foam::operator<<
@@ -45,9 +41,11 @@ Foam::Ostream& Foam::operator<<
     return os << wDist.origin() << wDist.distSqr();
 }
 
+
 Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::pointEdgePoint& wDist)
 {
     return is >> wDist.origin_ >> wDist.distSqr_;
 }
 
+
 // ************************************************************************* //
diff --git a/src/meshTools/PointEdgeWave/pointEdgePoint.H b/src/meshTools/PointEdgeWave/pointEdgePoint.H
index 23a2eeb2c3..1e83edd1d9 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePoint.H
+++ b/src/meshTools/PointEdgeWave/pointEdgePoint.H
@@ -45,7 +45,6 @@ SourceFiles
 #include "tensor.H"
 #include "pTraits.H"
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -69,6 +68,7 @@ class pointEdgePoint
         //- normal distance (squared) from point to origin
         scalar distSqr_;
 
+
     // Private Member Functions
 
         //- Evaluate distance to point. Update distSqr, origin from whomever
@@ -89,6 +89,7 @@ class pointEdgePoint
             const scalar tol
         );
 
+
 public:
 
     // Static data members
@@ -96,6 +97,7 @@ public:
         //- initial point far away.
         static point greatPoint;
 
+
     // Constructors
 
         //- Construct null
diff --git a/src/meshTools/PointEdgeWave/pointEdgePointI.H b/src/meshTools/PointEdgeWave/pointEdgePointI.H
index 0e46d2b1a5..72842946e2 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePointI.H
+++ b/src/meshTools/PointEdgeWave/pointEdgePointI.H
@@ -46,7 +46,7 @@ inline bool Foam::pointEdgePoint::update
         origin_ = w2.origin();
 
         return true;
-    }        
+    }
 
     scalar diff = distSqr_ - dist2;
 
@@ -71,7 +71,7 @@ inline bool Foam::pointEdgePoint::update
     }
 }
 
-    
+
 // Update this with w2 (information on same point)
 inline bool Foam::pointEdgePoint::update
 (
@@ -86,7 +86,7 @@ inline bool Foam::pointEdgePoint::update
         origin_ = w2.origin();
 
         return true;
-    }        
+    }
 
     scalar diff = distSqr_ - w2.distSqr();
 
@@ -111,6 +111,7 @@ inline bool Foam::pointEdgePoint::update
     }
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Null constructor
@@ -124,7 +125,7 @@ inline Foam::pointEdgePoint::pointEdgePoint()
 // Construct from origin, distance
 inline Foam::pointEdgePoint::pointEdgePoint
 (
-    const point& origin, 
+    const point& origin,
     const scalar distSqr
 )
 :
@@ -229,14 +230,14 @@ inline bool Foam::pointEdgePoint::updatePoint
     const scalar tol
 )
 {
-    return 
+    return
         update
         (
             mesh.points()[pointI],
             edgeInfo,
             tol
         );
-    }    
+}
 
 
 // Update this with new information on same point
@@ -255,7 +256,7 @@ inline bool Foam::pointEdgePoint::updatePoint
             newPointInfo,
             tol
         );
-}    
+}
 
 
 // Update this with new information on same point. No extra information.
@@ -266,7 +267,7 @@ inline bool Foam::pointEdgePoint::updatePoint
 )
 {
     return update(newPointInfo, tol);
-}    
+}
 
 
 // Update this with information from connected point
@@ -292,7 +293,7 @@ inline bool Foam::pointEdgePoint::updateEdge
             pointInfo,
             tol
         );
-}    
+}
 
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index f54876c9c5..518fd5ae4a 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellClassification.H"
diff --git a/src/meshTools/cellClassification/cellInfo.C b/src/meshTools/cellClassification/cellInfo.C
index f7828fc292..92aff0b76d 100644
--- a/src/meshTools/cellClassification/cellInfo.C
+++ b/src/meshTools/cellClassification/cellInfo.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellInfo.H"
diff --git a/src/meshTools/cellDist/cellDistFuncs.C b/src/meshTools/cellDist/cellDistFuncs.C
index 8bc65470bc..d1d3a5638c 100644
--- a/src/meshTools/cellDist/cellDistFuncs.C
+++ b/src/meshTools/cellDist/cellDistFuncs.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellDistFuncs.H"
diff --git a/src/meshTools/cellDist/wallPoint/wallPoint.C b/src/meshTools/cellDist/wallPoint/wallPoint.C
index b25b64ba86..168a401f30 100644
--- a/src/meshTools/cellDist/wallPoint/wallPoint.C
+++ b/src/meshTools/cellDist/wallPoint/wallPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "wallPoint.H"
diff --git a/src/meshTools/cellDist/wallPoint/wallPointData.C b/src/meshTools/cellDist/wallPoint/wallPointData.C
index 3d4f343132..7143872d8b 100644
--- a/src/meshTools/cellDist/wallPoint/wallPointData.C
+++ b/src/meshTools/cellDist/wallPoint/wallPointData.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "wallPointData.H"
diff --git a/src/meshTools/cellFeatures/cellFeatures.C b/src/meshTools/cellFeatures/cellFeatures.C
index 8d3170dca3..d023d66eb8 100644
--- a/src/meshTools/cellFeatures/cellFeatures.C
+++ b/src/meshTools/cellFeatures/cellFeatures.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellFeatures.H"
diff --git a/src/meshTools/cellQuality/cellQuality.C b/src/meshTools/cellQuality/cellQuality.C
index 57e450dfe8..b1c47e8f10 100644
--- a/src/meshTools/cellQuality/cellQuality.C
+++ b/src/meshTools/cellQuality/cellQuality.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Class calculates cell quality measures.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C
index f3c95afc91..c0138e86e8 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C
@@ -163,7 +163,7 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
         )   << "Unknown coordinateRotation type " << rotType << nl << nl
             << "Valid coordinateRotation types are :" <<  nl
             << "[default: axes " << typeName_() << "]"
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystem.C
index 80232ffd8d..1c2dd701e8 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.C
+++ b/src/meshTools/coordinateSystems/coordinateSystem.C
@@ -111,10 +111,7 @@ Foam::coordinateSystem::coordinateSystem
 }
 
 
-Foam::coordinateSystem::coordinateSystem
-(
-    const dictionary& dict
-)
+Foam::coordinateSystem::coordinateSystem(const dictionary& dict)
 :
     name_(type()),
     note_(),
@@ -322,16 +319,17 @@ void Foam::coordinateSystem::writeDict(Ostream& os, bool subDict) const
         os.writeKeyword("note") << note_ << token::END_STATEMENT << nl;
     }
 
-    os.writeKeyword("origin") << origin_  << token::END_STATEMENT << nl;
-    os.writeKeyword("e1")     << e1()     << token::END_STATEMENT << nl;
-    os.writeKeyword("e3")     << e3()     << token::END_STATEMENT << nl;
+    os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
+    os.writeKeyword("e1") << e1() << token::END_STATEMENT << nl;
+    os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl;
 
     if (subDict)
     {
-        os << decrIndent << indent << token::END_BLOCK << endl;
+        os  << decrIndent << indent << token::END_BLOCK << endl;
     }
 }
 
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 void Foam::coordinateSystem::operator=(const dictionary& rhs)
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.H b/src/meshTools/coordinateSystems/coordinateSystem.H
index 5bff54e523..cfdecfd398 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.H
+++ b/src/meshTools/coordinateSystems/coordinateSystem.H
@@ -166,6 +166,7 @@ class coordinateSystem
         //- Global-to-Local transformation tensor
         tensor Rtr_;
 
+
 protected:
 
     // Protected Member Functions
@@ -194,6 +195,7 @@ protected:
             bool translate
         ) const;
 
+
 public:
 
     //- Runtime type information
@@ -249,6 +251,7 @@ public:
             return autoPtr<coordinateSystem>(new coordinateSystem(*this));
         }
 
+
     // Declare run-time constructor selection table
 
         declareRunTimeSelectionTable
@@ -276,6 +279,7 @@ public:
             (name, origin, cr)
         );
 
+
     // Selectors
 
         //- Select constructed from dictionary
@@ -297,160 +301,170 @@ public:
         //- Select constructed from Istream
         static autoPtr<coordinateSystem> New(Istream& is);
 
-    // Destructor
 
-        virtual ~coordinateSystem();
+    //- Destructor
+    virtual ~coordinateSystem();
 
 
     // Member Functions
 
-      // Access
+        // Access
 
-        //- Return name
-        const word& name() const
-        {
-            return name_;
-        }
+            //- Return name
+            const word& name() const
+            {
+                return name_;
+            }
 
-        //- Return non-constant access to the optional note
-        string& note()
-        {
-            return note_;
-        }
+            //- Return non-constant access to the optional note
+            string& note()
+            {
+                return note_;
+            }
 
-        //- Return the optional note
-        const string& note() const
-        {
-            return note_;
-        }
+            //- Return the optional note
+            const string& note() const
+            {
+                return note_;
+            }
 
-        //- Return origin
-        const point& origin() const
-        {
-            return origin_;
-        }
+            //- Return origin
+            const point& origin() const
+            {
+                return origin_;
+            }
 
-        //- Return coordinate rotation
-        const coordinateRotation& rotation() const
-        {
-            return R_;
-        }
+            //- Return coordinate rotation
+            const coordinateRotation& rotation() const
+            {
+                return R_;
+            }
 
-        //- Return local-to-global transformation tensor
-        const tensor& R() const
-        {
-            return R_;
-        }
+            //- Return local-to-global transformation tensor
+            const tensor& R() const
+            {
+                return R_;
+            }
 
-        //- Return local Cartesian x-axis
-        const vector& e1() const
-        {
-           return Rtr_.x();
-        }
+            //- Return local Cartesian x-axis
+            const vector& e1() const
+            {
+                return Rtr_.x();
+            }
 
-        //- Return local Cartesian y-axis
-        const vector& e2() const
-        {
-           return Rtr_.y();
-        }
+            //- Return local Cartesian y-axis
+            const vector& e2() const
+            {
+                return Rtr_.y();
+            }
 
-        //- Return local Cartesian z-axis
-        const vector& e3() const
-        {
-           return Rtr_.z();
-        }
+            //- Return local Cartesian z-axis
+            const vector& e3() const
+            {
+                return Rtr_.z();
+            }
 
-        //- Return axis (e3: local Cartesian z-axis)
-        // @deprecated method e3 is preferred
-        const vector& axis() const
-        {
-           return Rtr_.z();
-        }
+            //- Return axis (e3: local Cartesian z-axis)
+            // @deprecated method e3 is preferred
+            const vector& axis() const
+            {
+                return Rtr_.z();
+            }
 
-        //- Return direction (e1: local Cartesian x-axis)
-        // @deprecated method e1 is preferred
-        const vector& direction() const
-        {
-            return Rtr_.x();
-        }
+            //- Return direction (e1: local Cartesian x-axis)
+            // @deprecated method e1 is preferred
+            const vector& direction() const
+            {
+                return Rtr_.x();
+            }
 
-        //- Return as dictionary of entries
-        //  @param [in] ignoreType drop type (cartesian, cylindrical, etc)
-        //  when generating the dictionary
-        virtual dictionary dict(bool ignoreType=false) const;
+            //- Return as dictionary of entries
+            //  @param [in] ignoreType drop type (cartesian, cylindrical, etc)
+            //  when generating the dictionary
+            virtual dictionary dict(bool ignoreType=false) const;
 
 
-      // Edit
+        // Edit
 
-        //- Rename
-        virtual void rename(const word& newName)
-        {
-            name_ = newName;
-        }
+            //- Rename
+            virtual void rename(const word& newName)
+            {
+                name_ = newName;
+            }
 
-        //- Edit access to origin
-        point& origin()
-        {
-            return origin_;
-        }
+            //- Edit access to origin
+            point& origin()
+            {
+                return origin_;
+            }
 
-      // Write
 
-        //- Write
-        virtual void write(Ostream&) const;
+        // Write
 
-        //- Write dictionary
-        virtual void writeDict(Ostream&, bool subDict=true) const;
+            //- Write
+            virtual void write(Ostream&) const;
 
-      // Transformations
+            //- Write dictionary
+            virtual void writeDict(Ostream&, bool subDict=true) const;
 
-        //- Convert from position in local coordinate system to global Cartesian position
-        point globalPosition(const point& local) const
-        {
-            return localToGlobal(local, true);
-        }
 
-        //- Convert from position in local coordinate system to global Cartesian position
-        tmp<pointField> globalPosition(const pointField& local) const
-        {
-            return localToGlobal(local, true);
-        }
+        // Transformations
 
-        //- Convert from vector components in local coordinate system to global Cartesian vector
-        vector globalVector(const vector& local) const
-        {
-            return localToGlobal(local, false);
-        }
+            //- Convert from position in local coordinate system to global
+            //  Cartesian position
+            point globalPosition(const point& local) const
+            {
+                return localToGlobal(local, true);
+            }
 
-        //- Convert from vector components in local coordinate system to global Cartesian vector
-        tmp<vectorField> globalVector(const vectorField& local) const
-        {
-            return localToGlobal(local, false);
-        }
+            //- Convert from position in local coordinate system to global
+            //  Cartesian position
+            tmp<pointField> globalPosition(const pointField& local) const
+            {
+                return localToGlobal(local, true);
+            }
 
-        //- Convert from global Cartesian position to position in local coordinate system
-        point localPosition(const point& global) const
-        {
-            return globalToLocal(global, true);
-        }
+            //- Convert from vector components in local coordinate system to
+            //  global Cartesian vector
+            vector globalVector(const vector& local) const
+            {
+                return localToGlobal(local, false);
+            }
 
-        //- Convert from global Cartesian position to position in local coordinate system
-        tmp<pointField> localPosition(const pointField& global) const
-        {
-            return globalToLocal(global, true);
-        }
+            //- Convert from vector components in local coordinate system to
+            //  global Cartesian vector
+            tmp<vectorField> globalVector(const vectorField& local) const
+            {
+                return localToGlobal(local, false);
+            }
 
-        //- Convert from global Cartesian vector to components in local coordinate system
-        vector localVector(const vector& global) const
-        {
-            return globalToLocal(global, false);
-        }
+            //- Convert from global Cartesian position to position in local
+            //  coordinate system
+            point localPosition(const point& global) const
+            {
+                return globalToLocal(global, true);
+            }
 
-        //- Convert from global Cartesian vector to components in local coordinate system
-        tmp<vectorField> localVector(const vectorField& global) const
-        {
-            return globalToLocal(global, false);
-        }
+            //- Convert from global Cartesian position to position in local
+            //  coordinate system
+            tmp<pointField> localPosition(const pointField& global) const
+            {
+                return globalToLocal(global, true);
+            }
+
+            //- Convert from global Cartesian vector to components in local
+            //  coordinate system
+            vector localVector(const vector& global) const
+            {
+                return globalToLocal(global, false);
+            }
+
+            //- Convert from global Cartesian vector to components in local
+            //  coordinate system
+            tmp<vectorField> localVector(const vectorField& global) const
+            {
+                return globalToLocal(global, false);
+            }
 
 
     // Member Operators
@@ -467,6 +481,7 @@ public:
             const coordinateSystem&
         );
 
+
     // IOstream Operators
 
         friend Ostream& operator<<(Ostream&, const coordinateSystem&);
diff --git a/src/meshTools/coordinateSystems/coordinateSystemNew.C b/src/meshTools/coordinateSystems/coordinateSystemNew.C
index 9a6ec2a0b4..25039ce0e1 100644
--- a/src/meshTools/coordinateSystems/coordinateSystemNew.C
+++ b/src/meshTools/coordinateSystems/coordinateSystemNew.C
@@ -66,7 +66,7 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
         )   << "Unknown coordinateSystem type " << coordType << nl << nl
             << "Valid coordinateSystem types are :" << nl
             << "[default: " << typeName_() << "]"
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -102,7 +102,7 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
             "constructing coordinateSystem"
         )   << "Unknown coordinateSystem type " << coordType << nl << nl
             << "Valid coordinateSystem types are :" << nl
-            << origRotationConstructorTablePtr_->toc()
+            << origRotationConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -121,4 +121,5 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
     return New(name, dict);
 }
 
+
 // ************************************************************************* //
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.H b/src/meshTools/coordinateSystems/coordinateSystems.H
index f9fdc012e0..cc1554768e 100644
--- a/src/meshTools/coordinateSystems/coordinateSystems.H
+++ b/src/meshTools/coordinateSystems/coordinateSystems.H
@@ -64,6 +64,7 @@ class coordinateSystems
         //- Disallow default bitwise assignment
         void operator=(const coordinateSystems&);
 
+
 public:
 
     //- Runtime type information
@@ -88,11 +89,13 @@ public:
             const Xfer<PtrList<coordinateSystem> >&
         );
 
+
     // Selectors
 
         //- Return previously registered or read construct from "constant"
         static const coordinateSystems& New(const objectRegistry&);
 
+
     // Member Functions
 
         //- Find and return index for a given keyword, returns -1 if not found
diff --git a/src/meshTools/coordinateSystems/cylindricalCS.H b/src/meshTools/coordinateSystems/cylindricalCS.H
index e41f263a7e..0aa8da5746 100644
--- a/src/meshTools/coordinateSystems/cylindricalCS.H
+++ b/src/meshTools/coordinateSystems/cylindricalCS.H
@@ -86,6 +86,7 @@ protected:
             bool translate
         ) const;
 
+
 public:
 
     //- Runtime type information
@@ -142,7 +143,6 @@ public:
 
         //- Non-const access to inDegrees
         bool& inDegrees();
-
 };
 
 
diff --git a/src/meshTools/coordinateSystems/parabolicCylindricalCS.C b/src/meshTools/coordinateSystems/parabolicCylindricalCS.C
index f2e83108ac..f80b75a724 100644
--- a/src/meshTools/coordinateSystems/parabolicCylindricalCS.C
+++ b/src/meshTools/coordinateSystems/parabolicCylindricalCS.C
@@ -159,6 +159,7 @@ Foam::vector Foam::parabolicCylindricalCS::globalToLocal
     return vector::zero;
 }
 
+
 Foam::tmp<Foam::vectorField> Foam::parabolicCylindricalCS::globalToLocal
 (
     const vectorField& global,
diff --git a/src/meshTools/coordinateSystems/parabolicCylindricalCS.H b/src/meshTools/coordinateSystems/parabolicCylindricalCS.H
index d5fb5ccec3..5b389f070e 100644
--- a/src/meshTools/coordinateSystems/parabolicCylindricalCS.H
+++ b/src/meshTools/coordinateSystems/parabolicCylindricalCS.H
@@ -85,6 +85,7 @@ protected:
             bool translate
         ) const;
 
+
 public:
 
     //- Runtime type information
@@ -106,7 +107,6 @@ public:
 
         //- Construct from dictionary
         parabolicCylindricalCS(const word&, const dictionary&);
-
 };
 
 
diff --git a/src/meshTools/coordinateSystems/sphericalCS.H b/src/meshTools/coordinateSystems/sphericalCS.H
index 31d32bc9e4..d211ec798e 100644
--- a/src/meshTools/coordinateSystems/sphericalCS.H
+++ b/src/meshTools/coordinateSystems/sphericalCS.H
@@ -85,6 +85,7 @@ protected:
             bool translate
         ) const;
 
+
 public:
 
     //- Runtime type information
@@ -141,7 +142,6 @@ public:
 
         //- Non-const access to inDegrees
         bool& inDegrees();
-
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/coordinateSystems/toroidalCS.C b/src/meshTools/coordinateSystems/toroidalCS.C
index f098a0d18f..189e0e4979 100644
--- a/src/meshTools/coordinateSystems/toroidalCS.C
+++ b/src/meshTools/coordinateSystems/toroidalCS.C
@@ -158,8 +158,8 @@ void Foam::toroidalCS::writeDict(Ostream& os, bool subDict) const
 {
     if (subDict)
     {
-	os  << indent << name() << nl
-	    << indent << token::BEGIN_BLOCK << incrIndent << nl;
+        os  << indent << name() << nl
+            << indent << token::BEGIN_BLOCK << incrIndent << nl;
     }
 
     coordinateSystem::writeDict(os, false);
@@ -167,8 +167,9 @@ void Foam::toroidalCS::writeDict(Ostream& os, bool subDict) const
 
     if (subDict)
     {
-	os << decrIndent << indent << token::END_BLOCK << endl;
+        os << decrIndent << indent << token::END_BLOCK << endl;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/src/meshTools/coordinateSystems/toroidalCS.H b/src/meshTools/coordinateSystems/toroidalCS.H
index c04498dda8..7631bd6fee 100644
--- a/src/meshTools/coordinateSystems/toroidalCS.H
+++ b/src/meshTools/coordinateSystems/toroidalCS.H
@@ -46,7 +46,6 @@ SourceFiles
 namespace Foam
 {
 
-
 /*---------------------------------------------------------------------------*\
                         Class toroidalCS Declaration
 \*---------------------------------------------------------------------------*/
@@ -86,6 +85,7 @@ class toroidalCS
             bool translate
         ) const;
 
+
 public:
 
     //- Runtime type information
@@ -103,7 +103,6 @@ public:
             const scalar radius
         );
 
-
         //- Construct from dictionary
         toroidalCS(const word& name, const dictionary&);
 
diff --git a/src/meshTools/indexedOctree/indexedOctreeName.C b/src/meshTools/indexedOctree/indexedOctreeName.C
index bc98c21926..e658d328af 100644
--- a/src/meshTools/indexedOctree/indexedOctreeName.C
+++ b/src/meshTools/indexedOctree/indexedOctreeName.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "indexedOctree.H"
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C
index 5303156518..1115ff13f9 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/meshTools/indexedOctree/treeDataPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "treeDataPoint.H"
diff --git a/src/meshTools/octree/octree.C b/src/meshTools/octree/octree.C
index fa180fd9c1..fe841e93f1 100644
--- a/src/meshTools/octree/octree.C
+++ b/src/meshTools/octree/octree.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "octree.H"
diff --git a/src/meshTools/octree/octreeDataCell.C b/src/meshTools/octree/octreeDataCell.C
index df9bd9ef12..2a3882f16e 100644
--- a/src/meshTools/octree/octreeDataCell.C
+++ b/src/meshTools/octree/octreeDataCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "octreeDataCell.H"
diff --git a/src/meshTools/octree/octreeDataPointTreeLeaf.C b/src/meshTools/octree/octreeDataPointTreeLeaf.C
index 2e5cafc9b7..844bf498a8 100644
--- a/src/meshTools/octree/octreeDataPointTreeLeaf.C
+++ b/src/meshTools/octree/octreeDataPointTreeLeaf.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 //#include "octreeDataPointTreeLeaf.H"
diff --git a/src/meshTools/octree/octreeName.C b/src/meshTools/octree/octreeName.C
index 59b9f85f30..e09b142766 100644
--- a/src/meshTools/octree/octreeName.C
+++ b/src/meshTools/octree/octreeName.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "octree.H"
diff --git a/src/meshTools/octree/pointIndexHitIOList.C b/src/meshTools/octree/pointIndexHitIOList.C
index 79976abdcf..844f3b5eac 100644
--- a/src/meshTools/octree/pointIndexHitIOList.C
+++ b/src/meshTools/octree/pointIndexHitIOList.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    IOList of pointIndexHits
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointIndexHitIOList.H"
diff --git a/src/meshTools/octree/treeLeaf.C b/src/meshTools/octree/treeLeaf.C
index 3cff3dfd60..555edaa2b0 100644
--- a/src/meshTools/octree/treeLeaf.C
+++ b/src/meshTools/octree/treeLeaf.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "treeLeaf.H"
diff --git a/src/meshTools/octree/treeLeafName.C b/src/meshTools/octree/treeLeafName.C
index 414a2eb3a4..af0447bb23 100644
--- a/src/meshTools/octree/treeLeafName.C
+++ b/src/meshTools/octree/treeLeafName.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "treeLeaf.H"
diff --git a/src/meshTools/octree/treeNode.C b/src/meshTools/octree/treeNode.C
index 3e503f13a0..e8e5ece609 100644
--- a/src/meshTools/octree/treeNode.C
+++ b/src/meshTools/octree/treeNode.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "treeNode.H"
diff --git a/src/meshTools/octree/treeNodeName.C b/src/meshTools/octree/treeNodeName.C
index 002c8d3063..3bd8cb58a0 100644
--- a/src/meshTools/octree/treeNodeName.C
+++ b/src/meshTools/octree/treeNodeName.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "treeNode.H"
diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
index 7f86c0f658..33b6b6f1f5 100644
--- a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
@@ -340,9 +340,8 @@ Foam::distributedTriSurfaceMesh::distributeSegments
         new mapDistribute
         (
             segmentI,       // size after construction
-            sendMap,
-            constructMap,
-            true            // reuse storage
+            sendMap.xfer(),
+            constructMap.xfer()
         )
     );
 }
@@ -642,9 +641,8 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
         new mapDistribute
         (
             segmentI,       // size after construction
-            sendMap,
-            constructMap,
-            true            // reuse storage
+            sendMap.xfer(),
+            constructMap.xfer()
         )
     );
     const mapDistribute& map = mapPtr();
@@ -806,9 +804,8 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
         new mapDistribute
         (
             segmentI,       // size after construction
-            sendMap,
-            constructMap,
-            true            // reuse storage
+            sendMap.xfer(),
+            constructMap.xfer()
         )
     );
     return mapPtr;
@@ -2399,9 +2396,8 @@ void Foam::distributedTriSurfaceMesh::distribute
         new mapDistribute
         (
             allTris.size(),
-            faceSendMap,
-            faceConstructMap,
-            true
+            faceSendMap.xfer(),
+            faceConstructMap.xfer()
         )
     );
     pointMap.reset
@@ -2409,9 +2405,8 @@ void Foam::distributedTriSurfaceMesh::distribute
         new mapDistribute
         (
             allPoints.size(),
-            pointSendMap,
-            pointConstructMap,
-            true
+            pointSendMap.xfer(),
+            pointConstructMap.xfer()
         )
     );
 
diff --git a/src/meshTools/searchableSurface/searchableSurface.C b/src/meshTools/searchableSurface/searchableSurface.C
index 5ec2338844..ad687a1134 100644
--- a/src/meshTools/searchableSurface/searchableSurface.C
+++ b/src/meshTools/searchableSurface/searchableSurface.C
@@ -57,7 +57,7 @@ autoPtr<searchableSurface> searchableSurface::New
         )   << "Unknown searchableSurface type " << searchableSurfaceType
             << endl << endl
             << "Valid searchableSurface types : " << endl
-            << dictConstructorTablePtr_->toc()
+            << dictConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C b/src/meshTools/sets/cellSources/boxToCell/boxToCell.C
index c53a881e82..5b454c41d2 100644
--- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C
+++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "boxToCell.H"
diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C b/src/meshTools/sets/cellSources/cellToCell/cellToCell.C
index 760d3541bc..222d14965f 100644
--- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C
+++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellToCell.H"
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
index 270e58f300..233a4cfd96 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "faceToCell.H"
diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
index 1111a9f62b..aad4d776dc 100644
--- a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
+++ b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "fieldToCell.H"
diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
index 66e6734028..8ed5cc4684 100644
--- a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
+++ b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "nearestToCell.H"
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
index c05e527a33..323809ab5b 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointToCell.H"
diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
index 4a63a4d213..0f0421ef81 100644
--- a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
+++ b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "rotatedBoxToCell.H"
diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
index d5ca0772ae..c8f23570d4 100644
--- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
+++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "shapeToCell.H"
diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
index 97352fe606..eec8051b2f 100644
--- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
+++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceToCell.H"
diff --git a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C
index aaf7ebee0c..185b3eca2e 100644
--- a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C
+++ b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "boundaryToFace.H"
diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C b/src/meshTools/sets/faceSources/boxToFace/boxToFace.C
index ba30ce0266..e0683883ab 100644
--- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C
+++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "boxToFace.H"
diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.C b/src/meshTools/sets/faceSources/faceToFace/faceToFace.C
index 7e031664ad..69ee32b780 100644
--- a/src/meshTools/sets/faceSources/faceToFace/faceToFace.C
+++ b/src/meshTools/sets/faceSources/faceToFace/faceToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "faceToFace.H"
diff --git a/src/meshTools/sets/faceSources/labelToFace/labelToFace.C b/src/meshTools/sets/faceSources/labelToFace/labelToFace.C
index d9d922bcf4..c2c378a513 100644
--- a/src/meshTools/sets/faceSources/labelToFace/labelToFace.C
+++ b/src/meshTools/sets/faceSources/labelToFace/labelToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "labelToFace.H"
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
index f0c0925cd7..a310082f8a 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "normalToFace.H"
diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C
index 000db639a9..0d76a37e4b 100644
--- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C
+++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "patchToFace.H"
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
index 6b063bab29..80f7be2838 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointToFace.H"
diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
index 7f68dcfafc..357bf44d29 100644
--- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
+++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "boxToPoint.H"
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
index 4b83fcae80..1753f84848 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cellToPoint.H"
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
index 1ae3fb1f66..242d3bd566 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "faceToPoint.H"
diff --git a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C
index a80ca084d6..48710a9de8 100644
--- a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C
+++ b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "labelToPoint.H"
diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C
index 6ae1220845..bc28d066f4 100644
--- a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C
+++ b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "pointToPoint.H"
diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
index 25601a2134..8bb787f3af 100644
--- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
+++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceToPoint.H"
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/sets/topoSetSource/topoSetSource.C
index 199c47203e..7579ffffad 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.C
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "topoSetSource.H"
@@ -60,7 +58,7 @@ autoPtr<topoSetSource> topoSetSource::New
         )   << "Unknown topoSetSource type " << topoSetSourceType
             << endl << endl
             << "Valid topoSetSource types : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -89,7 +87,7 @@ autoPtr<topoSetSource> topoSetSource::New
         )   << "Unknown topoSetSource type " << topoSetSourceType
             << endl << endl
             << "Valid topoSetSource types : " << endl
-            << istreamConstructorTablePtr_->toc()
+            << istreamConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index 152193313e..32f8d1ff98 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -64,7 +64,7 @@ autoPtr<topoSet> topoSet::New
         )   << "Unknown set type " << setType
             << endl << endl
             << "Valid set types : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -95,7 +95,7 @@ autoPtr<topoSet> topoSet::New
         )   << "Unknown set type " << setType
             << endl << endl
             << "Valid set types : " << endl
-            << sizeConstructorTablePtr_->toc()
+            << sizeConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/meshTools/surfaceSets/surfaceSets.C b/src/meshTools/surfaceSets/surfaceSets.C
index eb82bd44ff..93a8cb1ce5 100644
--- a/src/meshTools/surfaceSets/surfaceSets.C
+++ b/src/meshTools/surfaceSets/surfaceSets.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceSets.H"
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
index 3e007c880e..fdccecf617 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "booleanSurface.H"
@@ -1098,7 +1096,4 @@ Foam::booleanSurface::booleanSurface
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-
 // ************************************************************************* //
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
index f1ce39aa6e..8c28eb36a3 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
@@ -82,6 +82,7 @@ class booleanSurface
             INSIDE
         };
 
+
     // Private data
 
         //- From new to old face + surface:
@@ -90,6 +91,7 @@ class booleanSurface
         //          face2 (e.g. face2I = -faceMap[]-1)
         labelList faceMap_;
 
+
     // Private Member Functions
 
         //- Check whether subset of faces (from markZones) reaches up to
@@ -151,6 +153,7 @@ class booleanSurface
             labelList& side
         );
 
+
 public:
 
     ClassName("booleanSurface");
@@ -175,7 +178,7 @@ public:
         booleanSurface();
 
         //- Construct from surfaces and face labels to keep.
-        //  Walks from provided seed faces without crossing intersection line 
+        //  Walks from provided seed faces without crossing intersection line
         //  to determine faces to keep.
         booleanSurface
         (
@@ -233,8 +236,6 @@ public:
             }
             return -faceMap_[faceI]-1;
         }
-
-
 };
 
 
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
index 8d73f64d51..5caa377e05 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "edgeSurface.H"
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H
index 73fe36815b..c1e8fd0491 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H
@@ -117,7 +117,6 @@ private:
         void calcPointEdges();
 
 
-
 public:
 
     ClassName("edgeSurface");
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index 9450865081..be758c07fd 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -205,7 +205,6 @@ void Foam::intersectedSurface::printVisit
 }
 
 
-
 // Check if the two vertices that f0 and f1 share are in the same order on
 // both faces.
 bool Foam::intersectedSurface::sameEdgeOrder
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index f3ee58ed0b..7ff2327196 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "edgeIntersections.H"
@@ -46,7 +44,7 @@ Description
 defineTypeNameAndDebug(Foam::edgeIntersections, 0);
 
 Foam::scalar Foam::edgeIntersections::alignedCos_ =
-    Foam::cos(89.0 * Foam::mathematicalConstant::pi/180.0);
+    Foam::cos(89.0*Foam::mathematicalConstant::pi/180.0);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -721,13 +719,4 @@ Foam::label Foam::edgeIntersections::removeDegenerates
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-
 // ************************************************************************* //
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
index e1ca17c441..45c54995cc 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
@@ -131,6 +131,7 @@ class edgeIntersections
             boolList& affectedEdges
         ) const;
 
+
 public:
 
     ClassName("edgeIntersections");
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 38ee335d33..33940989b8 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceIntersection.H"
@@ -201,7 +199,6 @@ bool Foam::surfaceIntersection::excludeEdgeHit
 //}
 
 
-
 void Foam::surfaceIntersection::storeIntersection
 (
     const bool isFirstSurf,
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
index 3f23e9e370..2b4304c694 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
@@ -76,7 +76,7 @@ class triSurface;
 class edgeIntersections;
 
 /*---------------------------------------------------------------------------*\
-                           Class surfaceIntersection Declaration
+                    Class surfaceIntersection Declaration
 \*---------------------------------------------------------------------------*/
 
 class surfaceIntersection
@@ -171,7 +171,7 @@ class surfaceIntersection
         //    const point& eStart,
         //    const point& eEnd
         //);
-    
+
 
         //- Debugging: Dump intersected edges to stream
         void writeIntersectedEdges
@@ -233,6 +233,7 @@ class surfaceIntersection
             List<DynamicList<label> >& surfEdgeCuts
         );
 
+
 public:
 
     ClassName("surfaceIntersection");
@@ -284,7 +285,6 @@ public:
         const labelListList& surf1EdgeCuts() const;
 
         const labelListList& surf2EdgeCuts() const;
-
 };
 
 
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
index 711ede3cd2..b2a5eec086 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceIntersection.H"
@@ -37,9 +35,6 @@ Description
 #include "octree.H"
 #include "meshTools.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::surfaceIntersection::writeOBJ(const point& pt, Ostream& os)
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
index aeec3a8daf..03aac83298 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceIntersection.H"
diff --git a/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C b/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C
index ef1cbbae6e..a2d826cb4b 100644
--- a/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C
+++ b/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "octreeDataTriSurface.H"
diff --git a/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C b/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C
index e555cb2487..9582d6118d 100644
--- a/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C
+++ b/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "octreeDataTriSurfaceTreeLeaf.H"
diff --git a/src/meshTools/triSurface/orientedSurface/orientedSurface.C b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
index f4c165d83f..34a2307447 100644
--- a/src/meshTools/triSurface/orientedSurface/orientedSurface.C
+++ b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "orientedSurface.H"
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 0e08c13c27..af3be4840a 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "surfaceFeatures.H"
@@ -1097,8 +1095,8 @@ Foam::Map<Foam::pointIndexHit> Foam::surfaceFeatures::nearestEdges
 
             // Step to next sample point using local distance.
             // Truncate to max 1/minSampleDist samples per feature edge.
-//            s += max(minSampleDist*eMag, sampleDist[e.start()]);
-s += 0.01*eMag;
+            // s += max(minSampleDist*eMag, sampleDist[e.start()]);
+            s += 0.01*eMag;
 
             if (s >= (1-minSampleDist)*eMag)
             {
diff --git a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
index e3d6758cff..3df84cb551 100644
--- a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
+++ b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
@@ -27,15 +27,6 @@ License
 #include "surfaceLocation.H"
 #include "triSurface.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::vector Foam::surfaceLocation::normal(const triSurface& s) const
@@ -72,12 +63,6 @@ Foam::vector Foam::surfaceLocation::normal(const triSurface& s) const
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 void Foam::surfaceLocation::write(Ostream& os, const triSurface& s) const
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index b89afdab63..b406fb0467 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "triSurfaceTools.H"
@@ -158,7 +156,7 @@ void Foam::triSurfaceTools::greenRefine
 }
 
 
-// Refine all triangles marked for refinement. 
+// Refine all triangles marked for refinement.
 Foam::triSurface Foam::triSurfaceTools::doRefine
 (
     const triSurface& surf,
@@ -358,7 +356,7 @@ void Foam::triSurfaceTools::protectNeighbours
         forAll(myFaces, myFaceI)
         {
             label faceI = myFaces[myFaceI];
- 
+
             if ((faceStatus[faceI] == ANYEDGE) || (faceStatus[faceI] >= 0))
             {
                 faceStatus[faceI] = NOEDGE;
@@ -392,10 +390,10 @@ Foam::labelHashSet Foam::triSurfaceTools::getCollapsedFaces
     {
         facesToBeCollapsed.insert(myFaces[myFaceI]);
     }
-    
+
     // From faces using v1 check if they share an edge with faces
     // using v2.
-    //  - share edge: are part of 'splay' tree and will collapse if edge    
+    //  - share edge: are part of 'splay' tree and will collapse if edge
     //    collapses
     const labelList& v1Faces = surf.pointFaces()[v1];
 
@@ -795,7 +793,7 @@ bool Foam::triSurfaceTools::collapseCreatesFold
 //
 //    // Now neighbours contains first layer of triangles outside of
 //    // collapseFaces
-//    // There should be 
+//    // There should be
 //    // -two if edgeI is a boundary edge
 //    // since the outside 'edge' of collapseFaces should
 //    // form a triangle and the face connected to edgeI is not inserted.
@@ -816,7 +814,7 @@ bool Foam::triSurfaceTools::collapseCreatesFold
 //        for (label j = i+1; j < neighbourList.size(); i++)
 //        {
 //            const labelList& faceJEdges = surf.faceEdges()[neighbourList[j]];
-//            
+//
 //            // Check if faceI and faceJ share an edge
 //            forAll(faceIEdges, fI)
 //            {
@@ -1194,7 +1192,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::visitFaces
                 nearest.setHit();
                 nearest.triangle() = triI;
                 break;
-            }            
+            }
             else
             {
                // Which edge is cut.
@@ -1913,7 +1911,7 @@ Foam::triSurface Foam::triSurfaceTools::greenRefine
 
     // Storage for new faces
     DynamicList<labelledTri> newFaces(0);
-    
+
     pointField newPoints(surf.localPoints());
     newPoints.setSize(surf.nPoints() + surf.nEdges());
     label newPointI = surf.nPoints();
@@ -2635,7 +2633,7 @@ Foam::triSurface Foam::triSurfaceTools::delaunay2D(const List<vector2D>& pts)
 //    // ~~~~~~~~~~~~~~~
 //
 //    label vertI = 0;
-//    for 
+//    for
 //    (
 //        Vertex_iterator it = T.vertices_begin();
 //        it != T.vertices_end();
@@ -2849,7 +2847,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::classify
 
     // Nearest point could be on point or edge. Retest.
     label index, elemType;
-    //bool inside = 
+    //bool inside =
     triPointRef(s[triI].tri(s.points())).classify
     (
         trianglePoint,
@@ -2865,7 +2863,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::classify
         nearest.setHit();
         nearest.setIndex(triI);
         nearest.elementType() = triPointRef::NONE;
-    }    
+    }
     else if (elemType == triPointRef::EDGE)
     {
         nearest.setMiss();
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index c5c0e3d4da..f98585b5de 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -22,11 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Class applies a two-dimensional correction to mesh motion point field.
-    The correction guarantees that the mesh does not get twisted during motion
-    and thus introduce a third dimension into a 2-D problem.
-
 \*---------------------------------------------------------------------------*/
 
 #include "twoDPointCorrector.H"
diff --git a/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C b/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C
index 0c58abc5b0..d5d8e4de10 100644
--- a/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C
+++ b/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::calcType> Foam::calcType::New
             << "    unknown calcType type " << calcTypeName
             << ", constructor not in hash table" << nl << nl
             << "    Valid calcType selections are: " << nl
-            << dictionaryConstructorTablePtr_->toc() << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << nl
             << abort(FatalError);
     }
 
diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index 6c642dfe7b..b068fe51cb 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -7,5 +7,6 @@ wmake libso forces
 wmake libso IO
 wmake libso utilities
 wmake libso systemCall
+wmake libso zones
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index 29ac4c2a3b..eef0ce53fc 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
@@ -120,6 +120,7 @@ protected:
         //- Prime-squared average
         static const word EXT_PRIME2MEAN;
 
+
     // Private data
 
         //- Name of this set of field averages.
@@ -144,6 +145,7 @@ protected:
         //  calculated and output
         List<fieldAverageItem> faItems_;
 
+
         // Lists of averages
 
             // Arithmetic mean fields
@@ -220,7 +222,7 @@ protected:
             ) const;
 
 
-        // IO
+        // I-O
 
             //- Write averages
             virtual void writeAverages() const;
@@ -272,8 +274,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~fieldAverage();
+    virtual ~fieldAverage();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
index beffadd573..d2f544eedd 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
@@ -116,9 +116,8 @@ public:
         fieldAverageItem(const fieldAverageItem&);
 
 
-    // Destructor
-
-        ~fieldAverageItem();
+    //- Destructor
+    ~fieldAverageItem();
 
 
     // Member Functions
@@ -166,6 +165,7 @@ public:
 
         void operator=(const fieldAverageItem&);
 
+
     // Friend Operators
 
         friend bool operator==
@@ -190,6 +190,7 @@ public:
             return !(a == b);
         }
 
+
     // IOstream Operators
 
         friend Istream& operator>>(Istream&, fieldAverageItem&);
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
index ec77782df4..31e511377e 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
@@ -197,13 +197,13 @@ void Foam::fieldMinMax::calcMinMaxFields<Foam::scalar>
 {
     if (obr_.foundObject<volScalarField>(fieldName))
     {
+        const volScalarField& field =
+            obr_.lookupObject<volScalarField>(fieldName);
+        scalar minValue = min(field).value();
+        scalar maxValue = max(field).value();
+
         if (Pstream::master())
         {
-            const volScalarField& field =
-                obr_.lookupObject<volScalarField>(fieldName);
-            scalar minValue = min(field).value();
-            scalar maxValue = max(field).value();
-
             fieldMinMaxFilePtr_() << obr_.time().value() << tab
                 << fieldName << tab << minValue << tab << maxValue << endl;
 
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
index 8c8a3aaf47..36b88ecdfa 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -140,9 +140,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~fieldMinMax();
+    //- Destructor
+    virtual ~fieldMinMax();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
index 25daf62dd6..66f212f4c3 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
@@ -38,16 +38,16 @@ void Foam::fieldMinMax::calcMinMaxFields(const word& fieldName)
 
     if (obr_.foundObject<fieldType>(fieldName))
     {
-        if (Pstream::master())
+        const fieldType& field = obr_.lookupObject<fieldType>(fieldName);
+        switch (mode_)
         {
-            const fieldType& field = obr_.lookupObject<fieldType>(fieldName);
-            switch (mode_)
+            case mdMag:
             {
-                case mdMag:
-                {
-                    scalar minValue = min(mag(field)).value();
-                    scalar maxValue = max(mag(field)).value();
+                scalar minValue = min(mag(field)).value();
+                scalar maxValue = max(mag(field)).value();
 
+                if (Pstream::master())
+                {
                     fieldMinMaxFilePtr_() << obr_.time().value() << tab
                         << fieldName << tab << minValue << tab << maxValue
                         << endl;
@@ -61,13 +61,16 @@ void Foam::fieldMinMax::calcMinMaxFields(const word& fieldName)
                             << maxValue << nl
                             << endl;
                     }
-                    break;
                 }
-                case mdCmpt:
-                {
-                    Type minValue = min(field).value();
-                    Type maxValue = max(field).value();
+                break;
+            }
+            case mdCmpt:
+            {
+                Type minValue = min(field).value();
+                Type maxValue = max(field).value();
 
+                if (Pstream::master())
+                {
                     fieldMinMaxFilePtr_() << obr_.time().value() << tab
                         << fieldName << tab << minValue << tab << maxValue
                         << endl;
@@ -81,17 +84,17 @@ void Foam::fieldMinMax::calcMinMaxFields(const word& fieldName)
                             << maxValue << nl
                             << endl;
                     }
-                    break;
-                }
-                default:
-                {
-                    FatalErrorIn
-                    (
-                        "Foam::fieldMinMax::calcMinMaxFields"
-                        "(const word& fieldName)"
-                    )<< "Unknown min/max mode: " << modeTypeNames_[mode_]
-                     << exit(FatalError);
                 }
+                break;
+            }
+            default:
+            {
+                FatalErrorIn
+                (
+                    "Foam::fieldMinMax::calcMinMaxFields"
+                    "(const word& fieldName)"
+                )<< "Unknown min/max mode: " << modeTypeNames_[mode_]
+                 << exit(FatalError);
             }
         }
     }
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
index d9a948db08..beb7cec956 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
@@ -116,9 +116,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~forceCoeffs();
+    //- Destructor
+    virtual ~forceCoeffs();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index 1ffc36cab0..6baace3863 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -61,7 +61,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
         const incompressible::RASModel& ras
             = obr_.lookupObject<incompressible::RASModel>("RASProperties");
 
-        return rhoRef_*ras.devReff();
+        return rho()*ras.devReff();
     }
     else if (obr_.foundObject<compressible::LESModel>("LESProperties"))
     {
@@ -75,7 +75,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
         const incompressible::LESModel& les
             = obr_.lookupObject<incompressible::LESModel>("LESProperties");
 
-        return rhoRef_*les.devBeff();
+        return rho()*les.devBeff();
     }
     else if (obr_.foundObject<basicThermo>("thermophysicalProperties"))
     {
@@ -97,7 +97,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
 
         const volVectorField& U = obr_.lookupObject<volVectorField>(UName_);
 
-        return -rhoRef_*laminarT.nu()*dev(twoSymm(fvc::grad(U)));
+        return -rho()*laminarT.nu()*dev(twoSymm(fvc::grad(U)));
     }
     else if (obr_.foundObject<dictionary>("transportProperties"))
     {
@@ -108,7 +108,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
 
         const volVectorField& U = obr_.lookupObject<volVectorField>(UName_);
 
-        return -rhoRef_*nu*dev(twoSymm(fvc::grad(U)));
+        return -rho()*nu*dev(twoSymm(fvc::grad(U)));
     }
     else
     {
@@ -121,6 +121,34 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
 }
 
 
+Foam::tmp<Foam::volScalarField> Foam::forces::rho() const
+{
+    if (rhoName_ == "rhoInf")
+    {
+        const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+        return tmp<volScalarField>
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    "rho",
+                    mesh.time().timeName(),
+                    mesh
+                ),
+                mesh,
+                dimensionedScalar("rho", dimDensity, rhoRef_)
+            )
+        );
+    }
+    else
+    {
+        return(obr_.lookupObject<volScalarField>(rhoName_));
+    }
+}
+
+
 Foam::scalar Foam::forces::rho(const volScalarField& p) const
 {
     if (p.dimensions() == dimPressure)
@@ -129,6 +157,13 @@ Foam::scalar Foam::forces::rho(const volScalarField& p) const
     }
     else
     {
+        if (rhoName_ != "rhoInf")
+        {
+            FatalErrorIn("forces::rho(const volScalarField& p)")
+                << "Dynamic pressure is expected but kinematic is provided."
+                << exit(FatalError);
+        }
+
         return rhoRef_;
     }
 }
@@ -149,11 +184,12 @@ Foam::forces::forces
     active_(true),
     log_(false),
     patchSet_(),
-    pName_(""),
-    UName_(""),
+    pName_(word::null),
+    UName_(word::null),
+    rhoName_(word::null),
     directForceDensity_(false),
     fDName_(""),
-    rhoRef_(0),
+    rhoRef_(VGREAT),
     CofR_(vector::zero),
     forcesFilePtr_(NULL)
 {
@@ -175,6 +211,12 @@ Foam::forces::forces
     }
 
     read(dict);
+
+    if (active_)
+    {
+        // Create the forces file if not already created
+        makeFile();
+    }
 }
 
 
@@ -222,18 +264,31 @@ void Foam::forces::read(const dictionary& dict)
             // Optional entries U and p
             pName_ = dict.lookupOrDefault<word>("pName", "p");
             UName_ = dict.lookupOrDefault<word>("UName", "U");
+            rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
 
-            // Check whether UName and pName exists, if not deactivate forces
+            // Check whether UName, pName and rhoName exists,
+            // if not deactivate forces
             if
             (
                 !obr_.foundObject<volVectorField>(UName_)
              || !obr_.foundObject<volScalarField>(pName_)
+             || (
+                    rhoName_ != "rhoInf"
+                 && !obr_.foundObject<volScalarField>(rhoName_)
+                )
             )
             {
                 active_ = false;
+
                 WarningIn("void forces::read(const dictionary& dict)")
-                << "Could not find " << UName_ << " or "
-                    << pName_ << " in database." << nl
+                    << "Could not find " << UName_ << ", " << pName_;
+
+                if (rhoName_ != "rhoInf")
+                {
+                    Info<< " or " << rhoName_;
+                }
+
+                Info<< " in database." << nl
                     << "    De-activating forces."
                     << endl;
             }
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H
index 96651af97e..6fcdccc50e 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.H
+++ b/src/postProcessing/functionObjects/forces/forces/forces.H
@@ -132,6 +132,9 @@ protected:
             //- Name of velocity field
             word UName_;
 
+            //- Name of density field (optional)
+            word rhoName_;
+
             //- Is the force density being supplied directly?
             Switch directForceDensity_;
 
@@ -157,6 +160,9 @@ protected:
         //- Return the effective viscous stress (laminar + turbulent).
         tmp<volSymmTensorField> devRhoReff() const;
 
+        //- Return rho if rhoName is specified otherwise rhoRef
+        tmp<volScalarField> rho() const;
+
         //- Return rhoRef if the pressure field is dynamic, i.e. p/rho
         //  otherwise return 1
         scalar rho(const volScalarField& p) const;
@@ -190,9 +196,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~forces();
+    //- Destructor
+    virtual ~forces();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.C b/src/postProcessing/functionObjects/systemCall/systemCall.C
index 44f7948c80..ea429e9106 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.C
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.C
@@ -66,8 +66,8 @@ Foam::systemCall::~systemCall()
 void Foam::systemCall::read(const dictionary& dict)
 {
     dict.readIfPresent("executeCalls", executeCalls_);
-    dict.readIfPresent("endCalls",     endCalls_);
-    dict.readIfPresent("writeCalls",   writeCalls_);
+    dict.readIfPresent("endCalls", endCalls_);
+    dict.readIfPresent("writeCalls", writeCalls_);
 
     if (executeCalls_.empty() && endCalls_.empty() && writeCalls_.empty())
     {
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.H b/src/postProcessing/functionObjects/systemCall/systemCall.H
index 042ee0fc4d..a5039f6636 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.H
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.H
@@ -101,9 +101,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~systemCall();
+    //- Destructor
+    virtual ~systemCall();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
index 3e6b33c0d3..87b9d393b0 100644
--- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
+++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
@@ -98,9 +98,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~dsmcFields();
+    //- Destructor
+    virtual ~dsmcFields();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.H b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.H
index 71c4fd3516..8bf734ba14 100644
--- a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.H
+++ b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.H
@@ -106,9 +106,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~staticPressure();
+    //- Destructor
+    virtual ~staticPressure();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
index 0b8314667c..36740cbf11 100644
--- a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
@@ -57,7 +57,7 @@ Foam::faceZonesIntegration::faceZonesIntegration
     log_(false),
     faceZonesSet_(),
     fItems_(),
-    faceZonesIntegrationFilePtr_(NULL)
+    filePtr_(NULL)
 {
     // Check if the available mesh is an fvMesh otherise deactivate
     if (!isA<fvMesh>(obr_))
@@ -104,7 +104,7 @@ void Foam::faceZonesIntegration::read(const dictionary& dict)
 void Foam::faceZonesIntegration::makeFile()
 {
     // Create the face Zone file if not already created
-    if (faceZonesIntegrationFilePtr_.empty())
+    if (filePtr_.empty())
     {
         if (debug)
         {
@@ -132,7 +132,7 @@ void Foam::faceZonesIntegration::makeFile()
             mkDir(faceZonesIntegrationDir);
 
             // Open new file at start up
-            faceZonesIntegrationFilePtr_.resize(fItems_.size());
+            filePtr_.resize(fItems_.size());
 
             forAll(fItems_, Ifields)
             {
@@ -143,7 +143,7 @@ void Foam::faceZonesIntegration::makeFile()
                         faceZonesIntegrationDir/fieldName
                     );
 
-                faceZonesIntegrationFilePtr_.insert(fieldName, sPtr);
+                filePtr_.insert(fieldName, sPtr);
             }
 
             // Add headers to output data
@@ -155,11 +155,11 @@ void Foam::faceZonesIntegration::makeFile()
 
 void Foam::faceZonesIntegration::writeFileHeader()
 {
-    forAllIter(HashPtrTable<OFstream>, faceZonesIntegrationFilePtr_, iter)
+    forAllIter(HashPtrTable<OFstream>, filePtr_, iter)
     {
         unsigned int w = IOstream::defaultPrecision() + 7;
 
-        OFstream& os = *faceZonesIntegrationFilePtr_[iter.key()];
+        OFstream& os = *filePtr_[iter.key()];
 
         os  << "#Time " << setw(w);
 
@@ -191,48 +191,55 @@ void Foam::faceZonesIntegration::write()
     if (active_)
     {
         makeFile();
-        scalar dm = 0.0;
+
         forAll(fItems_, fieldI)
         {
             const word& fieldName = fItems_[fieldI];
 
-            const surfaceScalarField& fD =
+            const surfaceScalarField& sField =
                 obr_.lookupObject<surfaceScalarField>(fieldName);
 
-            const fvMesh& mesh = fD.mesh();
+            const fvMesh& mesh = sField.mesh();
+
+            // 1. integrate over all face zones
+
+            scalarField integralVals(faceZonesSet_.size());
+
+            forAll(faceZonesSet_, setI)
+            {
+                const word name = faceZonesSet_[setI];
+
+                label zoneID = mesh.faceZones().findZoneID(name);
+
+                const faceZone& fZone = mesh.faceZones()[zoneID];
+
+                integralVals[setI] = returnReduce
+                (
+                    calcIntegral(sField, fZone),
+                    sumOp<scalar>()
+                );
+            }
+
 
             unsigned int w = IOstream::defaultPrecision() + 7;
 
-            if
-            (
-                Pstream::master()
-             && faceZonesIntegrationFilePtr_.found(fieldName)
-            )
+            // 2. Write only on master
+
+            if (Pstream::master() && filePtr_.found(fieldName))
             {
-                OFstream& os = *faceZonesIntegrationFilePtr_(fieldName);
+                OFstream& os = *filePtr_(fieldName);
 
                 os  << obr_.time().value();
 
-                const faceZoneMesh& faceZoneList =  mesh.faceZones();
-
-                forAll(faceZonesSet_, zoneI)
+                forAll(integralVals, setI)
                 {
-                    const word name = faceZonesSet_[zoneI];
-
-                    label zoneID = faceZoneList.findZoneID(name);
-
-                    const faceZone& fz = mesh.faceZones()[zoneID];
-
-                    dm = calcFaceZonesIntegral(fD, fz);
-
-                    reduce(dm, sumOp<scalar>());
-
-                    os  << ' ' << setw(w) << dm;
+                    os  << ' ' << setw(w) << integralVals[setI];
 
                     if (log_)
                     {
                         Info<< "faceZonesIntegration output:" << nl
-                            << "    Integration" << dm << endl;
+                            << "    Integration[" << setI << "] "
+                            << integralVals[setI] << endl;
                     }
                 }
 
@@ -243,45 +250,47 @@ void Foam::faceZonesIntegration::write()
 }
 
 
-Foam::scalar Foam::faceZonesIntegration::calcFaceZonesIntegral
+Foam::scalar Foam::faceZonesIntegration::calcIntegral
 (
-    const surfaceScalarField& fD,
-    const faceZone& fz
+    const surfaceScalarField& sField,
+    const faceZone& fZone
 ) const
 {
-    scalar dm = 0.0;
-    const fvMesh& mesh = fD.mesh();
+    scalar sum = 0.0;
+    const fvMesh& mesh = sField.mesh();
 
-    forAll (fz, i)
+    forAll (fZone, i)
     {
-        label faceI = fz[i];
+        label faceI = fZone[i];
 
         if (mesh.isInternalFace(faceI))
         {
-            if (fz.flipMap()[faceI])
+            if (fZone.flipMap()[i])
             {
-                dm -= fD[faceI];
+                sum -= sField[faceI];
             }
             else
             {
-                dm += fD[faceI];
+                sum += sField[faceI];
             }
         }
         else
         {
             label patchI = mesh.boundaryMesh().whichPatch(faceI);
             const polyPatch& pp = mesh.boundaryMesh()[patchI];
+            const fvsPatchScalarField& bField = sField.boundaryField()[patchI];
             if (isA<processorPolyPatch>(pp))
             {
                 if (refCast<const processorPolyPatch>(pp).owner())
                 {
-                    if (fz.flipMap()[faceI])
+                    label patchFaceI = pp.whichFace(faceI);
+                    if (fZone.flipMap()[i])
                     {
-                        dm -= fD.boundaryField()[patchI][pp.whichFace(faceI)];
+                        sum -= bField[patchFaceI];
                     }
                     else
                     {
-                        dm += fD.boundaryField()[patchI][pp.whichFace(faceI)];
+                        sum += bField[patchFaceI];
                     }
                 }
             }
@@ -290,32 +299,32 @@ Foam::scalar Foam::faceZonesIntegration::calcFaceZonesIntegral
                 label patchFaceI = faceI - pp.start();
                 if (patchFaceI < pp.size()/2)
                 {
-                    if (fz.flipMap()[patchFaceI])
+                    if (fZone.flipMap()[i])
                     {
-                        dm -= fD.boundaryField()[patchI][patchFaceI];
+                        sum -= bField[patchFaceI];
                     }
                     else
                     {
-                        dm += fD.boundaryField()[patchI][patchFaceI];
+                        sum += bField[patchFaceI];
                     }
                 }
             }
             else if (!isA<emptyPolyPatch>(pp))
             {
                 label patchFaceI = faceI - pp.start();
-                if (fz.flipMap()[patchFaceI])
+                if (fZone.flipMap()[i])
                 {
-                    dm -= fD.boundaryField()[patchI][patchFaceI];
+                    sum -= bField[patchFaceI];
                 }
                 else
                 {
-                    dm += fD.boundaryField()[patchI][patchFaceI];
+                    sum += bField[patchFaceI];
                 }
             }
         }
     }
 
-    return dm;
+    return sum;
 }
 
 
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
index 5fc957bba7..c2f3ad9d4b 100644
--- a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
@@ -57,7 +57,7 @@ class dictionary;
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
-                           Class faceZonesIntegration Declaration
+                    Class faceZonesIntegration Declaration
 \*---------------------------------------------------------------------------*/
 
 class faceZonesIntegration
@@ -65,25 +65,23 @@ class faceZonesIntegration
 
 protected:
 
-    // Private data
+    // Protected data
 
         //- Name of this set of face zone integration,
-        //  Also used as the name of the probes directory.
+        //  Also used as the name of the output directory.
         word name_;
 
         const objectRegistry& obr_;
 
-        //- on/off switch
-        bool active_;
-
-        //- Switch to send output to Info as well as to file
-        Switch log_;
-
-        //- Current open files
-        HashPtrTable<OFstream> faceZonesIntegrationFilePtr_;
 
         // Read from dictionary
 
+            //- On/off switch
+            bool active_;
+
+            //- Switch to send output to Info as well as to file
+            Switch log_;
+
             //- faceZones to integrate over
             wordList faceZonesSet_;
 
@@ -91,15 +89,20 @@ protected:
             wordList fItems_;
 
 
-    // Private Member Functions
+        //- Current open files
+        HashPtrTable<OFstream> filePtr_;
+
+
+
+    // Protected Member Functions
 
         //- If the integration file has not been created create it
         void makeFile();
 
-        scalar calcFaceZonesIntegral
+        scalar calcIntegral
         (
-            const surfaceScalarField& fD,
-            const faceZone& fz
+            const surfaceScalarField& sField,
+            const faceZone& fZone
         ) const;
 
 
@@ -132,9 +135,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~faceZonesIntegration();
+    //- Destructor
+    virtual ~faceZonesIntegration();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C
index 7b6f08206f..8b1dbaa335 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.C
@@ -430,7 +430,7 @@ Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
         )   << "Unknown sample type " << sampleType
             << endl << endl
             << "Valid sample types : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/sampling/sampledSet/writers/writer.C b/src/sampling/sampledSet/writers/writer.C
index 3a116b564e..b16966d3a1 100644
--- a/src/sampling/sampledSet/writers/writer.C
+++ b/src/sampling/sampledSet/writers/writer.C
@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::writer<Type> > Foam::writer<Type>::New
         )   << "Unknown write type " << writeType
             << endl << endl
             << "Valid write types : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
index 5cbe630486..4f372a49b5 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
@@ -141,7 +141,7 @@ Foam::sampledSurface::New
         )   << "Unknown sample type " << sampleType
             << endl << endl
             << "Valid sample types : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.C b/src/sampling/sampledSurface/writers/surfaceWriter.C
index 99e19b96dd..a78ecbd21f 100644
--- a/src/sampling/sampledSurface/writers/surfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/surfaceWriter.C
@@ -77,7 +77,7 @@ Foam::surfaceWriter<Type>::New(const word& writeType)
                 "surfaceWriter::New(const word&)"
             )   << "Unknown write type \"" << writeType << "\"\n\n"
                 << "Valid write types : "
-                << wordConstructorTablePtr_->toc() << nl
+                << wordConstructorTablePtr_->sortedToc() << nl
                 << "Valid proxy types : "
                 << MeshedSurfaceProxy<face>::writeTypes() << endl
                 << exit(FatalError);
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C
index 3ebc3c6532..77f6592775 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C
@@ -55,7 +55,7 @@ Foam::barotropicCompressibilityModel::New
         )   << "Unknown barotropicCompressibilityModel type "
             << bcModelTypeName << endl << endl
             << "Valid  barotropicCompressibilityModels are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C
index 3f9c43a0f9..038ac2e843 100644
--- a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C
@@ -64,7 +64,7 @@ Foam::autoPtr<Foam::basicPsiThermo> Foam::basicPsiThermo::New
         FatalErrorIn("basicPsiThermo::New(const fvMesh&)")
             << "Unknown basicPsiThermo type " << thermoTypeName << nl << nl
             << "Valid basicPsiThermo types are:" << nl
-            << fvMeshConstructorTablePtr_->toc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
index 9a7ec5ac86..ad6d28ea23 100644
--- a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Selection function for 'basic' density-based thermodynamics
-
 \*---------------------------------------------------------------------------*/
 
 #include "basicRhoThermo.H"
@@ -67,7 +64,7 @@ Foam::autoPtr<Foam::basicRhoThermo> Foam::basicRhoThermo::New
         FatalErrorIn("basicRhoThermo::New(const fvMesh&)")
             << "Unknown basicRhoThermo type " << thermoTypeName << nl << nl
             << "Valid basicRhoThermo types are:" << nl
-            << fvMeshConstructorTablePtr_->toc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C
index 6a5606d0e7..a7f6ed9a50 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C
@@ -86,11 +86,11 @@ Foam::autoPtr<Foam::psiChemistryModel> Foam::psiChemistryModel::New
             FatalErrorIn("psiChemistryModelBase::New(const mesh&)")
                 << "Unknown psiChemistryModel type " << psiChemistryModelType
                 << nl << nl << "Valid psiChemistryModel types are:" << nl
-                << fvMeshConstructorTablePtr_->toc() << nl << exit(FatalError);
+                << fvMeshConstructorTablePtr_->sortedToc() << nl << exit(FatalError);
         }
         else
         {
-            wordList models = fvMeshConstructorTablePtr_->toc();
+            wordList models = fvMeshConstructorTablePtr_->sortedToc();
             forAll(models, i)
             {
                 models[i] = models[i].replace(typeName + ',', "");
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C
index c59a607f87..0fdad4e0a0 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C
@@ -86,11 +86,11 @@ Foam::autoPtr<Foam::rhoChemistryModel> Foam::rhoChemistryModel::New
             FatalErrorIn("rhoChemistryModelBase::New(const mesh&)")
                 << "Unknown rhoChemistryModel type " << rhoChemistryModelType
                 << nl << nl << "Valid rhoChemistryModel types are:" << nl
-                << fvMeshConstructorTablePtr_->toc() << nl << exit(FatalError);
+                << fvMeshConstructorTablePtr_->sortedToc() << nl << exit(FatalError);
         }
         else
         {
-            wordList models = fvMeshConstructorTablePtr_->toc();
+            wordList models = fvMeshConstructorTablePtr_->sortedToc();
             forAll(models, i)
             {
                 models[i] = models[i].replace(typeName + ',', "");
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
index b0baa00fbe..e8f4b74495 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
@@ -49,7 +49,7 @@ Foam::chemistrySolver<CompType, ThermoType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        wordList models = dictionaryConstructorTablePtr_->toc();
+        wordList models = dictionaryConstructorTablePtr_->sortedToc();
         forAll(models, i)
         {
             models[i] = models[i].replace
diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C
index 685f1d7e4f..e44f40c4c9 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C
@@ -66,7 +66,7 @@ Foam::autoPtr<Foam::laminarFlameSpeed> Foam::laminarFlameSpeed::New
         )   << "Unknown laminarFlameSpeed type "
             << laminarFlameSpeedType << endl << endl
             << "Valid laminarFlameSpeed types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
index cd7c7ab616..9677a4bfc7 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "liquidMixture.H"
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
index d1b0ac2610..6ceae42bcd 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 -------------------------------------------------------------------------------
 */
 
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
index f398523460..1b327b07c4 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
+++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "iC3H8O.H"
diff --git a/src/thermophysicalModels/liquids/liquid/liquid.C b/src/thermophysicalModels/liquids/liquid/liquid.C
index c2b5f8b3fa..542a215ff0 100644
--- a/src/thermophysicalModels/liquids/liquid/liquid.C
+++ b/src/thermophysicalModels/liquids/liquid/liquid.C
@@ -64,7 +64,7 @@ Foam::autoPtr<Foam::liquid> Foam::liquid::New(Istream& is)
                 << "Unknown liquid type " << liquidType
                 << nl << nl
                 << "Valid liquid types are:" << nl
-                << ConstructorTablePtr_->toc()
+                << ConstructorTablePtr_->sortedToc()
                 << abort(FatalError);
         }
 
@@ -81,7 +81,7 @@ Foam::autoPtr<Foam::liquid> Foam::liquid::New(Istream& is)
                 << "Unknown liquid type " << liquidType
                 << endl << endl
                 << "Valid liquid types are:" << nl
-                << IstreamConstructorTablePtr_->toc()
+                << IstreamConstructorTablePtr_->sortedToc()
                 << abort(FatalError);
         }
 
diff --git a/src/thermophysicalModels/pdfs/pdf/newPdf.C b/src/thermophysicalModels/pdfs/pdf/newPdf.C
index ce13e261fb..5a3b077d21 100644
--- a/src/thermophysicalModels/pdfs/pdf/newPdf.C
+++ b/src/thermophysicalModels/pdfs/pdf/newPdf.C
@@ -46,7 +46,7 @@ Foam::autoPtr<Foam::pdf> Foam::pdf::New
         FatalErrorIn("pdf::New(const dictionary&, Random&)")
             << "unknown pdf type " << pdfType << nl << nl
             << "Valid pdf types are:" << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C b/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C
index c7840d9433..a5c27adac8 100644
--- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C
@@ -76,7 +76,7 @@ autoPtr<radiationModel> radiationModel::New
         )   << "Unknown radiationModel type " << radiationModelTypeName
             << nl << nl
             << "Valid radiationModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
index 2aaa7d7e67..be93dc011e 100644
--- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
@@ -27,7 +27,7 @@ License
 #include "radiationModel.H"
 #include "absorptionEmissionModel.H"
 #include "scatterModel.H"
-#include "fvm.H"
+#include "fvmSup.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -112,6 +112,9 @@ bool Foam::radiation::radiationModel::read()
         lookup("radiation") >> radiation_;
         coeffs_ = subDict(type() + "Coeffs");
 
+        lookup("solverFreq") >> solverFreq_,
+        solverFreq_ = max(1, solverFreq_);
+
         return true;
     }
     else
diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H
index 4d01dee1cf..aae443461e 100644
--- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H
+++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H
@@ -163,7 +163,7 @@ public:
             virtual void calculate() = 0;
 
             //- Read radiationProperties dictionary
-            virtual bool read() = 0;
+            virtual bool read();
 
 
         // Access
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C
index d1628fd8d4..3ce41d3750 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C
@@ -53,7 +53,7 @@ Foam::radiation::absorptionEmissionModel::New
             << absorptionEmissionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid absorptionEmissionModel types are :" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<absorptionEmissionModel>(cstrIter()(dict, mesh));
diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C
index e1f545758a..82b451ae20 100644
--- a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C
+++ b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C
@@ -51,7 +51,7 @@ Foam::autoPtr<Foam::radiation::scatterModel> Foam::radiation::scatterModel::New
             << scatterModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid scatterModel types are :" << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
index e178bd0338..931706484b 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
@@ -55,7 +55,7 @@ Foam::chemistryReader<ThermoType>::New
         )   << "Unknown chemistryReader type "
             << chemistryReaderTypeName << nl << nl
             << "Valid  chemistryReaders are: " << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C
index 788a298d0d..b36172963c 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C
@@ -67,7 +67,7 @@ Foam::autoPtr<Foam::hCombustionThermo> Foam::hCombustionThermo::New
             << "Unknown hCombustionThermo type "
             << hCombustionThermoTypeName << nl << nl
             << "Valid hCombustionThermo types are:" << nl
-            << fvMeshConstructorTablePtr_->toc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
@@ -103,7 +103,7 @@ Foam::autoPtr<Foam::hCombustionThermo> Foam::hCombustionThermo::NewType
 
         if (hCombustionThermoTypeName.find(thermoType) == string::npos)
         {
-            wordList allModels = fvMeshConstructorTablePtr_->toc();
+            wordList allModels = fvMeshConstructorTablePtr_->sortedToc();
             DynamicList<word> validModels;
             forAll(allModels, i)
             {
@@ -140,7 +140,7 @@ Foam::autoPtr<Foam::hCombustionThermo> Foam::hCombustionThermo::NewType
             << "Unknown hCombustionThermo type "
             << hCombustionThermoTypeName << nl << nl
             << "Valid hCombustionThermo types are:" << nl
-            << fvMeshConstructorTablePtr_->toc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C
index 2e21f2d9c5..4945cc8815 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C
@@ -69,7 +69,7 @@ autoPtr<hhuCombustionThermo> hhuCombustionThermo::New(const fvMesh& mesh)
             << "Unknown hhuCombustionThermo type "
             << hhuCombustionThermoTypeName << endl << endl
             << "Valid hhuCombustionThermo types are :" << endl
-            << fvMeshConstructorTablePtr_->toc()
+            << fvMeshConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C
index 688b37b6d2..ad0c92f04f 100644
--- a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C
@@ -67,7 +67,7 @@ Foam::autoPtr<Foam::hReactionThermo> Foam::hReactionThermo::New
             << "Unknown hReactionThermo type "
             << hReactionThermoTypeName << nl << nl
             << "Valid hReactionThermo types are:" << nl
-            << fvMeshConstructorTablePtr_->toc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
@@ -103,7 +103,7 @@ Foam::autoPtr<Foam::hReactionThermo> Foam::hReactionThermo::NewType
 
         if (hReactionThermoTypeName.find(thermoType) == string::npos)
         {
-            wordList allModels = fvMeshConstructorTablePtr_->toc();
+            wordList allModels = fvMeshConstructorTablePtr_->sortedToc();
             DynamicList<word> validModels;
             forAll(allModels, i)
             {
@@ -140,7 +140,7 @@ Foam::autoPtr<Foam::hReactionThermo> Foam::hReactionThermo::NewType
             << "Unknown hReactionThermo type "
             << hReactionThermoTypeName << nl << nl
             << "Valid hReactionThermo types are:" << nl
-            << fvMeshConstructorTablePtr_->toc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/solids/solid/newSolid.C b/src/thermophysicalModels/solids/solid/newSolid.C
index 445a98a00d..63cf5c22af 100644
--- a/src/thermophysicalModels/solids/solid/newSolid.C
+++ b/src/thermophysicalModels/solids/solid/newSolid.C
@@ -51,7 +51,7 @@ Foam::autoPtr<Foam::solid> Foam::solid::New(Istream& is)
             FatalErrorIn("solid::New(Istream&)")
                 << "Unknown solid type " << solidType << nl << nl
                 << "Valid solid types are:" << endl
-                << ConstructorTablePtr_->toc()
+                << ConstructorTablePtr_->sortedToc()
                 << exit(FatalError);
         }
 
@@ -67,7 +67,7 @@ Foam::autoPtr<Foam::solid> Foam::solid::New(Istream& is)
             FatalErrorIn("solid::New(Istream&)")
                 << "Unknown solid type " << solidType << nl << nl
                 << "Valid solid types are:" << endl
-                << IstreamConstructorTablePtr_->toc()
+                << IstreamConstructorTablePtr_->sortedToc()
                 << exit(FatalError);
         }
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
index ab79adedd7..455d032634 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Perfect gas equation of state.
-
 \*---------------------------------------------------------------------------*/
 
 #include "perfectGas.H"
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
index 58e28a2bc1..7c896accb9 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    
 \*---------------------------------------------------------------------------*/
 
 #include "IrreversibleReaction.H"
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
index fc639515bb..6cc28a7c70 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    
 \*---------------------------------------------------------------------------*/
 
 #include "NonEquilibriumReversibleReaction.H"
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index f0ebd1c61a..30124a5819 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -22,10 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Simple extension of ReactionThermo to handle Reaction kinetics in addition
-    to the equilibrium thermodynamics already handled.
-
 \*---------------------------------------------------------------------------*/
 
 #include "Reaction.H"
@@ -207,7 +203,7 @@ Reaction<ReactionThermo>::Reaction
     setLRhs(is);
     setThermo(thermoDatabase);
 }
-    
+
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
@@ -228,7 +224,7 @@ autoPtr<Reaction<ReactionThermo> > Reaction<ReactionThermo>::New
             is
         )   << "Reaction type not specified" << endl << endl
             << "Valid Reaction types are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -246,7 +242,7 @@ autoPtr<Reaction<ReactionThermo> > Reaction<ReactionThermo>::New
             is
         )   << "Unknown reaction type " << reactionTypeName << endl << endl
             << "Valid reaction types are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
index 9bdfae4388..a11368caaf 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    
 \*---------------------------------------------------------------------------*/
 
 #include "ReversibleReaction.H"
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
index 3756f2e365..2a67e3143d 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "reactionTypes.H"
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeLangmuirHinshelwoodReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeLangmuirHinshelwoodReactions.C
index 1789fe80fc..637581bb1f 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeLangmuirHinshelwoodReactions.C
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeLangmuirHinshelwoodReactions.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "makeReactionThermo.H"
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
index 1a054b1124..bc9fc47732 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "reactionTypes.H"
diff --git a/src/thermophysicalModels/specie/speciesTable/speciesTable.C b/src/thermophysicalModels/specie/speciesTable/speciesTable.C
index acb4f0a72c..b2cb515e37 100644
--- a/src/thermophysicalModels/specie/speciesTable/speciesTable.C
+++ b/src/thermophysicalModels/specie/speciesTable/speciesTable.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "speciesTable.H"
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.C b/src/thermophysicalModels/specie/transport/const/constTransport.C
index cebe3765b6..8735480807 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.C
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.C
@@ -22,10 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Constant properties Transport package.  Templated ito a given
-    thermodynamics package (needed for thermal conductivity).
-
 \*---------------------------------------------------------------------------*/
 
 #include "constTransport.H"
diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C
index df5fb2754b..d4afb4df2e 100644
--- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C
+++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C
@@ -22,14 +22,9 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Basic species Transport type based on the use of a fitting
     function for nu.  All other properties are derived from
     this primitive function.
 
-    The nu function must be provided by the derived type,
-    e.g. SutherlandTransport.
-
 \*---------------------------------------------------------------------------*/
 
 #include "speciesTransport.H"
diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
index 885e4bb2fd..44d6f34b43 100644
--- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
+++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
@@ -38,7 +38,6 @@ SourceFiles
     speciesTransportI.H
     speciesTransport.C
 
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef speciesTransport_H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
index f936042653..9bae498a49 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "NSRDSfunc4.H"
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
index 7eda81bb2b..7cf74b659e 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
@@ -62,7 +62,7 @@ autoPtr<thermophysicalFunction> thermophysicalFunction::New(Istream& is)
             << thermophysicalFunctionType
             << endl << endl
             << "Valid thermophysicalFunction types are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << abort(FatalError);
     }
 
diff --git a/src/topoChangerFvMesh/Make/files b/src/topoChangerFvMesh/Make/files
index 838500fd8b..1788317304 100644
--- a/src/topoChangerFvMesh/Make/files
+++ b/src/topoChangerFvMesh/Make/files
@@ -1,4 +1,5 @@
 topoChangerFvMesh/topoChangerFvMesh.C
+rawTopoChangerFvMesh/rawTopoChangerFvMesh.C
 
 /*
 linearValveFvMesh/linearValveFvMesh.C
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C
new file mode 100644
index 0000000000..ccfb392b2e
--- /dev/null
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "rawTopoChangerFvMesh.H"
+#include "mapPolyMesh.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+#include "linear.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(rawTopoChangerFvMesh, 0);
+    addToRunTimeSelectionTable
+    (
+        topoChangerFvMesh,
+        rawTopoChangerFvMesh,
+        IOobject
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+// Construct from components
+Foam::rawTopoChangerFvMesh::rawTopoChangerFvMesh(const IOobject& io)
+:
+    topoChangerFvMesh(io)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::rawTopoChangerFvMesh::~rawTopoChangerFvMesh()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::rawTopoChangerFvMesh::update()
+{
+    // Do mesh changes (use inflation - put new points in topoChangeMap)
+    Info<< "rawTopoChangerFvMesh : Checking for topology changes..."
+        << endl;
+    autoPtr<mapPolyMesh> topoChangeMap = topoChanger_.changeMesh(true);
+
+    bool hasChanged = topoChangeMap.valid();
+
+    if (hasChanged)
+    {
+        Info<< "rawTopoChangerFvMesh : Done topology changes..."
+            << endl;
+
+        // Temporary: fix fields on patch faces created out of nothing
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        // Two situations:
+        // - internal faces inflated out of nothing
+        // - patch faces created out of previously internal faces
+
+        // Is face mapped in any way
+        PackedList<1> mappedFace(nFaces());
+
+        const label nOldInternal = topoChangeMap().oldPatchStarts()[0];
+
+        const labelList& faceMap = topoChangeMap().faceMap();
+        for (label faceI = 0; faceI < nInternalFaces(); faceI++)
+        {
+            if (faceMap[faceI] >= 0)
+            {
+                mappedFace[faceI] = 1;
+            }
+        }
+        for (label faceI = nInternalFaces(); faceI < nFaces(); faceI++)
+        {
+            if (faceMap[faceI] >= 0 && faceMap[faceI] >= nOldInternal)
+            {
+                mappedFace[faceI] = 1;
+            }
+        }
+
+        const List<objectMap>& fromFaces = topoChangeMap().facesFromFacesMap();
+
+        forAll(fromFaces, i)
+        {
+            mappedFace[fromFaces[i].index()] = 1;
+        }
+
+        const List<objectMap>& fromEdges = topoChangeMap().facesFromEdgesMap();
+
+        forAll(fromEdges, i)
+        {
+            mappedFace[fromEdges[i].index()] = 1;
+        }
+
+        const List<objectMap>& fromPts = topoChangeMap().facesFromPointsMap();
+
+        forAll(fromPts, i)
+        {
+            mappedFace[fromPts[i].index()] = 1;
+        }
+
+        // Set unmapped faces to zero
+        Info<< "rawTopoChangerFvMesh : zeroing unmapped boundary values."
+            << endl;
+        zeroUnmappedValues<scalar, fvPatchField, volMesh>(mappedFace);
+        zeroUnmappedValues<vector, fvPatchField, volMesh>(mappedFace);
+        zeroUnmappedValues<sphericalTensor, fvPatchField, volMesh>(mappedFace);
+        zeroUnmappedValues<symmTensor, fvPatchField, volMesh>(mappedFace);
+        zeroUnmappedValues<tensor, fvPatchField, volMesh>(mappedFace);
+
+        // Special handling for phi: set unmapped faces to recreated phi
+        Info<< "rawTopoChangerFvMesh :"
+            << " recreating phi for unmapped boundary values." << endl;
+        const volVectorField& U = lookupObject<volVectorField>("U");
+        surfaceScalarField& phi = const_cast<surfaceScalarField&>
+        (
+            lookupObject<surfaceScalarField>("phi")
+        );
+        setUnmappedValues
+        (
+            phi,
+            mappedFace,
+            (linearInterpolate(U) & Sf())()
+        );
+
+
+        if (topoChangeMap().hasMotionPoints())
+        {
+            pointField newPoints = topoChangeMap().preMotionPoints();
+
+            // Give the meshModifiers opportunity to modify points
+            Info<< "rawTopoChangerFvMesh :"
+                << " calling modifyMotionPoints." << endl;
+            topoChanger_.modifyMotionPoints(newPoints);
+
+            // Actually move points
+            Info<< "rawTopoChangerFvMesh :"
+                << " calling movePoints." << endl;
+
+            movePoints(newPoints);
+        }
+    }
+    else
+    {
+        //Pout<< "rawTopoChangerFvMesh :"
+        //    << " no topology changes..." << endl;
+    }
+
+    changing(hasChanged);
+
+    return hasChanged;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/fvm/fvmAdjDiv.H b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
similarity index 53%
rename from src/finiteVolume/finiteVolume/fvm/fvmAdjDiv.H
rename to src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
index 3b6de68237..612829c3c8 100644
--- a/src/finiteVolume/finiteVolume/fvm/fvmAdjDiv.H
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
@@ -22,67 +22,82 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-InNamespace
-    Foam::fvm
+Class
+    Foam::rawTopoChangerFvMesh
 
 Description
-    Calculate the matrix for the adjDivergence of the given field and flux.
+    topoChangerFvMesh without any added functionality.
+
+    Note: run without FOAM_SETNAN. Temporary has unitialised patch
+    data when faces get created out of nothing.
 
 SourceFiles
-    fvmAdjDiv.C
+    rawTopoChangerFvMesh.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fvmAdjDiv_H
-#define fvmAdjDiv_H
+#ifndef rawTopoChangerFvMesh_H
+#define rawTopoChangerFvMesh_H
 
-#include "volFieldsFwd.H"
-#include "surfaceFieldsFwd.H"
-#include "surfaceInterpolationScheme.H"
-#include "fvMatrix.H"
+#include "topoChangerFvMesh.H"
+#include "PackedList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward declaration of classes
+
 /*---------------------------------------------------------------------------*\
-                     Namespace fvm functions Declaration
+                      Class rawTopoChangerFvMesh Declaration
 \*---------------------------------------------------------------------------*/
 
-namespace fvm
+class rawTopoChangerFvMesh
+:
+    public topoChangerFvMesh
 {
-    template<class Type>
-    tmp<fvMatrix<Type> > adjDiv
-    (
-        const surfaceScalarField&,
-        GeometricField<Type, fvPatchField, volMesh>&,
-        const word& name
-    );
+    // Private Member Functions
 
-    template<class Type>
-    tmp<fvMatrix<Type> > adjDiv
-    (
-        const tmp<surfaceScalarField>&,
-        GeometricField<Type, fvPatchField, volMesh>&,
-        const word& name
-    );
+        //- Set unmapped values
+        template<class Type, template<class> class PatchField, class GeoMesh>
+        static void setUnmappedValues
+        (
+            GeometricField<Type, PatchField, GeoMesh>& fld,
+            const PackedList<1>& mappedFace,
+            const GeometricField<Type, PatchField, GeoMesh>& baseFld
+        );
+
+        template<class Type, template<class> class PatchField, class GeoMesh>
+        void zeroUnmappedValues(const PackedList<1>&) const;
+
+        //- Disallow default bitwise copy construct
+        rawTopoChangerFvMesh(const rawTopoChangerFvMesh&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const rawTopoChangerFvMesh&);
+
+public:
+
+    //- Runtime type information
+    TypeName("rawTopoChangerFvMesh");
 
 
-    template<class Type>
-    tmp<fvMatrix<Type> > adjDiv
-    (
-        const surfaceScalarField&,
-        GeometricField<Type, fvPatchField, volMesh>&
-    );
+    // Constructors
 
-    template<class Type>
-    tmp<fvMatrix<Type> > adjDiv
-    (
-        const tmp<surfaceScalarField>&,
-        GeometricField<Type, fvPatchField, volMesh>&
-    );
-}
+        //- Construct from database
+        explicit rawTopoChangerFvMesh(const IOobject& io);
+
+    // Destructor
+
+        virtual ~rawTopoChangerFvMesh();
+
+
+    // Member Functions
+
+        //- Update the mesh for both mesh motion and topology change
+        virtual bool update();
+};
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -92,7 +107,7 @@ namespace fvm
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "fvmAdjDiv.C"
+#   include "rawTopoChangerFvMeshTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
new file mode 100644
index 0000000000..0be0306186
--- /dev/null
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "rawTopoChangerFvMesh.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::rawTopoChangerFvMesh::setUnmappedValues
+(
+    GeometricField<Type, PatchField, GeoMesh>& fld,
+    const PackedList<1>& mappedFace,
+    const GeometricField<Type, PatchField, GeoMesh>& baseFld
+)
+{
+    //Pout<< "Checking field " << fld.name() << endl;
+
+    forAll(fld.boundaryField(), patchI)
+    {
+        PatchField<Type>& fvp = const_cast<PatchField<Type>&>
+        (
+            fld.boundaryField()[patchI]
+        );
+
+        label start = fvp.patch().patch().start();
+        forAll(fvp, i)
+        {
+            if (!mappedFace[start+i])
+            {
+                //Pout<< "** Resetting unassigned value on patch "
+                //    << fvp.patch().name()
+                //    << " localface:" << i
+                //    << " to:" << baseFld.boundaryField()[patchI][i] << endl;
+                fvp[i] = baseFld.boundaryField()[patchI][i];
+            }
+        }
+    }
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+void Foam::rawTopoChangerFvMesh::zeroUnmappedValues
+(
+    const PackedList<1>& mappedFace
+) const
+{
+    typedef GeometricField<Type, PatchField, GeoMesh> FieldType;
+
+    const wordList fldNames(names(FieldType::typeName));
+
+    forAll(fldNames, i)
+    {
+        //Pout<< "Checking field " << fldNames[i] << endl;
+
+        FieldType& fld = const_cast<FieldType&>
+        (
+            lookupObject<FieldType>(fldNames[i])
+        );
+
+        setUnmappedValues
+        (
+            fld,
+            mappedFace,
+            FieldType
+            (
+                IOobject
+                (
+                    "zero",
+                    time().timeName(),
+                    *this,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                *this,
+                dimensioned<Type>("0", fld.dimensions(), pTraits<Type>::zero)
+            )
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C b/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C
index fd7aa5183d..aeba455a8d 100644
--- a/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C
+++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C
@@ -60,7 +60,7 @@ autoPtr<viscosityModel> viscosityModel::New
         )   << "Unknown viscosityModel type "
             << viscosityModelTypeName << endl << endl
             << "Valid  viscosityModels are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/triSurface/Make/options b/src/triSurface/Make/options
index cd3f5ed69c..41306609f2 100644
--- a/src/triSurface/Make/options
+++ b/src/triSurface/Make/options
@@ -1,3 +1 @@
-EXE_INC = \
-    -I$(WM_THIRD_PARTY_DIR)/zlib-1.2.3
-
+EXE_INC =
diff --git a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H b/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H
index 7db3f27bd9..a641924684 100644
--- a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H
+++ b/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H
@@ -128,6 +128,12 @@ public:
             return index_;
         }
 
+        //- Return the index of this patch in the boundaryMesh
+        label& index()
+        {
+            return index_;
+        }
+
         //- Write
         void write(Ostream&) const;
 
diff --git a/src/triSurface/triSurface/interfaces/OBJ/writeOBJ.C b/src/triSurface/triSurface/interfaces/OBJ/writeOBJ.C
index 7207bdae32..300cdddf95 100644
--- a/src/triSurface/triSurface/interfaces/OBJ/writeOBJ.C
+++ b/src/triSurface/triSurface/interfaces/OBJ/writeOBJ.C
@@ -41,8 +41,8 @@ namespace Foam
 void triSurface::writeOBJ(const bool writeSorted, Ostream& os) const
 {
     // Write header
-    os  << "# Wavefront OBJ file" << endl
-        << "# Regions:" << endl;
+    os  << "# Wavefront OBJ file" << nl
+        << "# Regions:" << nl;
 
     labelList faceMap;
 
@@ -54,13 +54,13 @@ void triSurface::writeOBJ(const bool writeSorted, Ostream& os) const
     forAll(myPatches, patchI)
     {
         os  << "#     " << patchI << "    "
-            << myPatches[patchI].name() << endl;
+            << myPatches[patchI].name() << nl;
     }
-    os  << "#" << endl;
+    os  << "#" << nl;
 
-    os  << "# points    : " << ps.size() << endl
-        << "# triangles : " << size() << endl
-        << "#" << endl;
+    os  << "# points    : " << ps.size() << nl
+        << "# triangles : " << size() << nl
+        << "#" << nl;
 
 
     // Write vertex coords
@@ -69,7 +69,7 @@ void triSurface::writeOBJ(const bool writeSorted, Ostream& os) const
         os  << "v "
             << ps[pointi].x() << ' '
             << ps[pointi].y() << ' '
-            << ps[pointi].z() << endl;
+            << ps[pointi].z() << nl;
     }
 
     if (writeSorted)
@@ -80,7 +80,7 @@ void triSurface::writeOBJ(const bool writeSorted, Ostream& os) const
         {
             // Print all faces belonging to this patch
 
-            os << "g " << myPatches[patchI].name() << endl;
+            os << "g " << myPatches[patchI].name() << nl;
 
             for
             (
@@ -96,20 +96,39 @@ void triSurface::writeOBJ(const bool writeSorted, Ostream& os) const
                     << operator[](faceI)[1] + 1 << ' '
                     << operator[](faceI)[2] + 1
                     //<< "  # " << operator[](faceI).region()
-                    << endl;
+                    << nl;
             }
         }
     }
     else
     {
+        // Get patch (=compact region) per face
+        labelList patchIDs(size());
+        forAll(myPatches, patchI)
+        {
+            label faceI = myPatches[patchI].start();
+
+            forAll(myPatches[patchI], i)
+            {
+                patchIDs[faceMap[faceI++]] = patchI;
+            }
+        }
+
+
+        label prevPatchI = -1;
+
         forAll(*this, faceI)
         {
+            if (prevPatchI != patchIDs[faceI])
+            {
+                prevPatchI = patchIDs[faceI];
+                os << "g " << myPatches[patchIDs[faceI]].name() << nl;
+            }
             os  << "f "
                 << operator[](faceI)[0] + 1 << ' '
                 << operator[](faceI)[1] + 1 << ' '
                 << operator[](faceI)[2] + 1
-                //<< "  # " << operator[](faceI).region()
-                << endl;
+                << nl;
         }
     }
 }
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index b17aa88bb5..3b8d2f9d5f 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -544,6 +544,8 @@ Foam::surfacePatchList Foam::triSurface::calcPatches(labelList& faceMap) const
     {
         surfacePatch& newPatch = newPatches[newPatchI];
 
+        newPatch.index() = newPatchI;
+
         label oldPatchI = newPatchI;
 
         // start of patch
@@ -592,6 +594,7 @@ void Foam::triSurface::setDefaultPatches()
 
     forAll(newPatches, patchI)
     {
+        patches_[patchI].index() = patchI;
         patches_[patchI].name() = newPatches[patchI].name();
         patches_[patchI].geometricType() = newPatches[patchI].geometricType();
     }
diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
index 5f4283859a..54a73b1243 100644
--- a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
@@ -80,7 +80,7 @@ autoPtr<LESdelta> LESdelta::New
             "LESdelta::New(const fvMesh&, const dictionary&)"
         )   << "Unknown LESdelta type " << deltaType << endl << endl
             << "Valid LESdelta types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
index e77e00f189..ba60f21e4c 100644
--- a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
+++ b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
@@ -59,7 +59,7 @@ autoPtr<LESfilter> LESfilter::New
             "LESfilter::New(const fvMesh&, const dictionary&)"
         )   << "Unknown LESfilter type " << filterType << endl << endl
             << "Valid LESfilter types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
index 5602e44d7f..c32cb077d8 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
@@ -84,6 +84,10 @@ LESModel::LESModel
     delta_(LESdelta::New("delta", U.mesh(), *this))
 {
     readIfPresent("k0", k0_);
+
+    // Force the construction of the mesh deltaCoeffs which may be needed
+    // for the construction of the derived models and BCs
+    mesh_.deltaCoeffs();
 }
 
 
@@ -132,7 +136,7 @@ autoPtr<LESModel> LESModel::New
         )   << "Unknown LESModel type " << modelName
             << endl << endl
             << "Valid LESModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/compressible/LES/Make/files b/src/turbulenceModels/compressible/LES/Make/files
index 331f60eb87..27beea2967 100644
--- a/src/turbulenceModels/compressible/LES/Make/files
+++ b/src/turbulenceModels/compressible/LES/Make/files
@@ -15,7 +15,7 @@ vanDriestDelta/vanDriestDelta.C
 wallFunctions=derivedFvPatchFields/wallFunctions
 
 muSgsWallFunctions=$(wallFunctions)/muSgsWallFunctions
-$(muSgsWallFunctions)/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
+$(muSgsWallFunctions)/muSgsUSpaldingWallFunction/muSgsUSpaldingWallFunctionFvPatchScalarField.C
 
 alphaSgsWallFunctions=$(wallFunctions)/alphaSgsWallFunctions
 $(alphaSgsWallFunctions)/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsUSpaldingWallFunction/muSgsUSpaldingWallFunctionFvPatchScalarField.C
similarity index 86%
rename from src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsUSpaldingWallFunction/muSgsUSpaldingWallFunctionFvPatchScalarField.C
index c31ac8815c..18c25ca90a 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsUSpaldingWallFunction/muSgsUSpaldingWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "muSgsWallFunctionFvPatchScalarField.H"
+#include "muSgsUSpaldingWallFunctionFvPatchScalarField.H"
 #include "LESModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -41,7 +41,8 @@ namespace LESModels
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
+muSgsUSpaldingWallFunctionFvPatchScalarField::
+muSgsUSpaldingWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -56,9 +57,10 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
 {}
 
 
-muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
+muSgsUSpaldingWallFunctionFvPatchScalarField::
+muSgsUSpaldingWallFunctionFvPatchScalarField
 (
-    const muSgsWallFunctionFvPatchScalarField& ptf,
+    const muSgsUSpaldingWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -73,7 +75,8 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
 {}
 
 
-muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
+muSgsUSpaldingWallFunctionFvPatchScalarField::
+muSgsUSpaldingWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -89,9 +92,10 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
 {}
 
 
-muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
+muSgsUSpaldingWallFunctionFvPatchScalarField::
+muSgsUSpaldingWallFunctionFvPatchScalarField
 (
-    const muSgsWallFunctionFvPatchScalarField& mwfpsf
+    const muSgsUSpaldingWallFunctionFvPatchScalarField& mwfpsf
 )
 :
     fixedValueFvPatchScalarField(mwfpsf),
@@ -103,9 +107,10 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
 {}
 
 
-muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
+muSgsUSpaldingWallFunctionFvPatchScalarField::
+muSgsUSpaldingWallFunctionFvPatchScalarField
 (
-    const muSgsWallFunctionFvPatchScalarField& mwfpsf,
+    const muSgsUSpaldingWallFunctionFvPatchScalarField& mwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -120,7 +125,7 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void muSgsWallFunctionFvPatchScalarField::evaluate
+void muSgsUSpaldingWallFunctionFvPatchScalarField::evaluate
 (
     const Pstream::commsTypes
 )
@@ -190,7 +195,7 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
 }
 
 
-void muSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
+void muSgsUSpaldingWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeEntryIfDifferent<word>(os, "U", "U", UName_);
@@ -207,7 +212,7 @@ void muSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
 makePatchTypeField
 (
     fvPatchScalarField,
-    muSgsWallFunctionFvPatchScalarField
+    muSgsUSpaldingWallFunctionFvPatchScalarField
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsUSpaldingWallFunction/muSgsUSpaldingWallFunctionFvPatchScalarField.H
similarity index 76%
rename from src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsUSpaldingWallFunction/muSgsUSpaldingWallFunctionFvPatchScalarField.H
index 38f20535d3..9dbe8f0443 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsUSpaldingWallFunction/muSgsUSpaldingWallFunctionFvPatchScalarField.H
@@ -24,18 +24,19 @@ License
 
 Class
     Foam::compressible::LESModels::
-        muSgsWallFunctionFvPatchScalarField
+        muSgsUSpaldingWallFunctionFvPatchScalarField
 
 Description
-    Spalart Allmaas wall function boundary condition for compressible flows
+    Wall function boundary condition for walls, based on velocity, using
+    Spaldings law to give a continuous muSgs profile to the wall (y+ = 0).
 
 SourceFiles
-    muSgsWallFunctionFvPatchScalarField.C
+    muSgsUSpaldingWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef muSgsWallFunctionFvPatchScalarField_H
-#define muSgsWallFunctionFvPatchScalarField_H
+#ifndef muSgsUSpaldingWallFunctionFvPatchScalarField_H
+#define muSgsUSpaldingWallFunctionFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -49,10 +50,10 @@ namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
-     Class muSgsWallFunctionFvPatchScalarField Declaration
+       Class muSgsUSpaldingWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class muSgsWallFunctionFvPatchScalarField
+class muSgsUSpaldingWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
@@ -77,20 +78,20 @@ class muSgsWallFunctionFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("muSgsWallFunction");
+    TypeName("muSgsUSpaldingWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        muSgsWallFunctionFvPatchScalarField
+        muSgsUSpaldingWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        muSgsWallFunctionFvPatchScalarField
+        muSgsUSpaldingWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -98,20 +99,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  muSgsWallFunctionFvPatchScalarField
+        //  muSgsUSpaldingWallFunctionFvPatchScalarField
         //  onto a new patch
-        muSgsWallFunctionFvPatchScalarField
+        muSgsUSpaldingWallFunctionFvPatchScalarField
         (
-            const muSgsWallFunctionFvPatchScalarField&,
+            const muSgsUSpaldingWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        muSgsWallFunctionFvPatchScalarField
+        muSgsUSpaldingWallFunctionFvPatchScalarField
         (
-            const muSgsWallFunctionFvPatchScalarField&
+            const muSgsUSpaldingWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -119,14 +120,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new muSgsWallFunctionFvPatchScalarField(*this)
+                new muSgsUSpaldingWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        muSgsWallFunctionFvPatchScalarField
+        muSgsUSpaldingWallFunctionFvPatchScalarField
         (
-            const muSgsWallFunctionFvPatchScalarField&,
+            const muSgsUSpaldingWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -138,11 +139,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new muSgsWallFunctionFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
+                new muSgsUSpaldingWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files
index da455db87f..1329745581 100644
--- a/src/turbulenceModels/compressible/RAS/Make/files
+++ b/src/turbulenceModels/compressible/RAS/Make/files
@@ -17,11 +17,11 @@ alphatWallFunctions = $(wallFunctions)/alphatWallFunctions
 $(alphatWallFunctions)/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
 
 mutWallFunctions = $(wallFunctions)/mutWallFunctions
-$(mutWallFunctions)/mutWallFunction/mutWallFunctionFvPatchScalarField.C
-$(mutWallFunctions)/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
-$(mutWallFunctions)/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C
-$(mutWallFunctions)/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
-$(mutWallFunctions)/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+$(mutWallFunctions)/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C
+$(mutWallFunctions)/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
+$(mutWallFunctions)/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C
+$(mutWallFunctions)/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C
+$(mutWallFunctions)/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C
 
 epsilonWallFunctions = $(wallFunctions)/epsilonWallFunctions
 $(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index 8d18cec8c5..1d4054fb04 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
@@ -88,7 +88,11 @@ RASModel::RASModel
     omegaSmall_("omegaSmall", omega0_.dimensions(), SMALL),
 
     y_(mesh_)
-{}
+{
+    // Force the construction of the mesh deltaCoeffs which may be needed
+    // for the construction of the derived models and BCs
+    mesh_.deltaCoeffs();
+}
 
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
@@ -137,7 +141,7 @@ autoPtr<RASModel> RASModel::New
         )   << "Unknown RASModel type " << modelName
             << endl << endl
             << "Valid RASModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 603ed83962..af32894d27 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -249,6 +249,54 @@ SpalartAllmaras::SpalartAllmaras
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+tmp<volScalarField> SpalartAllmaras::k() const
+{
+    WarningIn("tmp<volScalarField> SpalartAllmaras::k() const")
+        << "Turbulence kinetic energy not defined for Spalart-Allmaras model. "
+        << "Returning zero field"
+        << endl;
+
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "k",
+                runTime_.timeName(),
+                mesh_
+            ),
+            mesh_,
+            dimensionedScalar("0", dimensionSet(0, 2, -2, 0, 0), 0)
+        )
+    );
+}
+
+
+tmp<volScalarField> SpalartAllmaras::epsilon() const
+{
+    WarningIn("tmp<volScalarField> SpalartAllmaras::epsilon() const")
+        << "Turbulence kinetic energy dissipation rate not defined for "
+        << "Spalart-Allmaras model. Returning zero field"
+        << endl;
+
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "epslion",
+                runTime_.timeName(),
+                mesh_
+            ),
+            mesh_,
+            dimensionedScalar("0", dimensionSet(0, 2, -3, 0, 0), 0)
+        )
+    );
+}
+
+
 tmp<volSymmTensorField> SpalartAllmaras::R() const
 {
     return tmp<volSymmTensorField>
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index 39e70c4922..94e736b9f8 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -188,42 +188,10 @@ public:
         }
 
         //- Return the turbulence kinetic energy
-        virtual tmp<volScalarField> k() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    IOobject
-                    (
-                        "k",
-                        runTime_.timeName(),
-                        mesh_
-                    ),
-                    mesh_,
-                    dimensionedScalar("0", dimensionSet(0, 2, -2, 0, 0), 0)
-                )
-            );
-        }
+        virtual tmp<volScalarField> k() const;
 
         //- Return the turbulence kinetic energy dissipation rate
-        virtual tmp<volScalarField> epsilon() const
-        {
-            return tmp<volScalarField>
-            (
-                new volScalarField
-                (
-                    IOobject
-                    (
-                        "epslion",
-                        runTime_.timeName(),
-                        mesh_
-                    ),
-                    mesh_,
-                    dimensionedScalar("0", dimensionSet(0, 2, -3, 0, 0), 0)
-                )
-            );
-        }
+        virtual tmp<volScalarField> epsilon() const;
 
         //- Return the Reynolds stress tensor
         virtual tmp<volSymmTensorField> R() const;
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
index 7096314fe3..700cfed818 100644
--- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
+++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
@@ -28,7 +28,7 @@ License
 
 #include "calculatedFvPatchField.H"
 #include "alphatWallFunctionFvPatchScalarField.H"
-#include "mutWallFunctionFvPatchScalarField.H"
+#include "mutkWallFunctionFvPatchScalarField.H"
 #include "epsilonWallFunctionFvPatchScalarField.H"
 #include "kqRWallFunctionFvPatchField.H"
 #include "omegaWallFunctionFvPatchScalarField.H"
@@ -146,7 +146,7 @@ tmp<volScalarField> autoCreateMut
             if (isType<wallFvPatch>(bm[patchI]))
             {
                 mutBoundaryTypes[patchI] =
-                    RASModels::mutWallFunctionFvPatchScalarField::typeName;
+                    RASModels::mutkWallFunctionFvPatchScalarField::typeName;
             }
             else
             {
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
index ad2115cdb1..dbc93fc8cb 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
@@ -111,10 +111,17 @@ alphatWallFunctionFvPatchScalarField
 
 void alphatWallFunctionFvPatchScalarField::updateCoeffs()
 {
+    if (updated())
+    {
+        return;
+    }
+
     const scalarField& mutw =
         patch().lookupPatchField<volScalarField, scalar>(mutName_);
 
     operator==(mutw/Prt_);
+
+    fixedValueFvPatchScalarField::updateCoeffs();
 }
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
index 4f21ba6472..28b8c89101 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
@@ -70,7 +70,7 @@ class alphatWallFunctionFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("compressible::alphatWallFunction");
+    TypeName("alphatWallFunction");
 
 
     // Constructors
@@ -147,7 +147,7 @@ public:
         // I-O
 
             //- Write
-            void write(Ostream&) const;
+            virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index dc6f2a3644..07382bad52 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -56,6 +56,32 @@ void epsilonWallFunctionFvPatchScalarField::checkType()
 }
 
 
+scalar epsilonWallFunctionFvPatchScalarField::calcYPlusLam
+(
+    const scalar kappa,
+    const scalar E
+) const
+{
+    scalar ypl = 11.0;
+
+    for (int i=0; i<10; i++)
+    {
+        ypl = log(E*ypl)/kappa;
+    }
+
+    return ypl;
+}
+
+
+void epsilonWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
+{
+    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
@@ -65,15 +91,13 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF),
-    UName_("U"),
-    kName_("k"),
     GName_("RASModel::G"),
-    rhoName_("rho"),
-    muName_("mu"),
-    mutName_("mut"),
     Cmu_(0.09),
     kappa_(0.41),
-    E_(9.8)
+    E_(9.8),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
+
+
 {
     checkType();
 }
@@ -88,15 +112,12 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    UName_(ptf.UName_),
-    kName_(ptf.kName_),
     GName_(ptf.GName_),
-    rhoName_(ptf.rhoName_),
-    muName_(ptf.muName_),
-    mutName_(ptf.mutName_),
     Cmu_(ptf.Cmu_),
     kappa_(ptf.kappa_),
-    E_(ptf.E_)
+    E_(ptf.E_),
+    yPlusLam_(ptf.yPlusLam_)
+
 {
     checkType();
 }
@@ -110,15 +131,12 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF, dict),
-    UName_(dict.lookupOrDefault<word>("U", "U")),
-    kName_(dict.lookupOrDefault<word>("k", "k")),
     GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
-    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    muName_(dict.lookupOrDefault<word>("mu", "mu")),
-    mutName_(dict.lookupOrDefault<word>("mut", "mut")),
     Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8))
+    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
+
 {
     checkType();
 }
@@ -130,15 +148,11 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(ewfpsf),
-    UName_(ewfpsf.UName_),
-    kName_(ewfpsf.kName_),
     GName_(ewfpsf.GName_),
-    rhoName_(ewfpsf.rhoName_),
-    muName_(ewfpsf.muName_),
-    mutName_(ewfpsf.mutName_),
     Cmu_(ewfpsf.Cmu_),
     kappa_(ewfpsf.kappa_),
-    E_(ewfpsf.E_)
+    E_(ewfpsf.E_),
+    yPlusLam_(ewfpsf.yPlusLam_)
 {
     checkType();
 }
@@ -151,15 +165,11 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(ewfpsf, iF),
-    UName_(ewfpsf.UName_),
-    kName_(ewfpsf.kName_),
     GName_(ewfpsf.GName_),
-    rhoName_(ewfpsf.rhoName_),
-    muName_(ewfpsf.muName_),
-    mutName_(ewfpsf.mutName_),
     Cmu_(ewfpsf.Cmu_),
     kappa_(ewfpsf.kappa_),
-    E_(ewfpsf.E_)
+    E_(ewfpsf.E_),
+    yPlusLam_(ewfpsf.yPlusLam_)
 {
     checkType();
 }
@@ -169,33 +179,41 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 
 void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
 {
+    if (updated())
+    {
+        return;
+    }
+
+    const label patchI = patch().index();
+
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
     const scalar Cmu25 = pow(Cmu_, 0.25);
     const scalar Cmu75 = pow(Cmu_, 0.75);
-    const scalar yPlusLam = rasModel.yPlusLam(kappa_, E_);
 
-    const scalarField& y = rasModel.y()[patch().index()];
+    const scalarField& y = rasModel.y()[patchI];
 
-    volScalarField& G = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>(GName_));
+    volScalarField& G =
+        const_cast<volScalarField&>(db().lookupObject<volScalarField>(GName_));
 
-    volScalarField& epsilon = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>(dimensionedInternalField().name()));
+    DimensionedField<scalar, volMesh>& epsilon =
+        const_cast<DimensionedField<scalar, volMesh>&>
+        (
+            dimensionedInternalField()
+        );
 
-    const volScalarField& k = db().lookupObject<volScalarField>(kName_);
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
 
-    const scalarField& rhow =
-        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
 
-    const scalarField& muw =
-        patch().lookupPatchField<volScalarField, scalar>(muName_);
+    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
 
-    const scalarField& mutw =
-        patch().lookupPatchField<volScalarField, scalar>(mutName_);
+    const tmp<volScalarField> tmut = rasModel.mut();
+    const volScalarField& mut = tmut();
+    const scalarField& mutw = mut.boundaryField()[patchI];
 
-    const fvPatchVectorField& Uw =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
 
     const scalarField magGradUw = mag(Uw.snGrad());
 
@@ -210,7 +228,7 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
 
         epsilon[faceCellI] = Cmu75*pow(k[faceCellI], 1.5)/(kappa_*y[faceI]);
 
-        if (yPlus > yPlusLam)
+        if (yPlus > yPlusLam_)
         {
             G[faceCellI] =
                 (mutw[faceI] + muw[faceI])
@@ -224,6 +242,8 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
         }
     }
 
+    fixedInternalValueFvPatchField<scalar>::updateCoeffs();
+
     // TODO: perform averaging for cells sharing more than one boundary face
 }
 
@@ -240,15 +260,7 @@ void epsilonWallFunctionFvPatchScalarField::evaluate
 void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fixedInternalValueFvPatchField<scalar>::write(os);
-    writeEntryIfDifferent<word>(os, "U", "U", UName_);
-    writeEntryIfDifferent<word>(os, "k", "k", kName_);
-    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
-    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
-    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
-    writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    writeLocalEntries(os);
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
index 5d5865e11e..1d4c64fb41 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
@@ -57,26 +57,13 @@ class epsilonWallFunctionFvPatchScalarField
 :
     public fixedInternalValueFvPatchField<scalar>
 {
-    // Private data
+protected:
 
-        //- Name of velocity field
-        word UName_;
-
-        //- Name of turbulence kinetic energy field
-        word kName_;
+    // Protected data
 
         //- Name of turbulence generation field
         word GName_;
 
-        //- Name of density field
-        word rhoName_;
-
-        //- Name of laminar viscosity field
-        word muName_;
-
-        //- Name of turbulent viscosity field
-        word mutName_;
-
         //- Cmu coefficient
         scalar Cmu_;
 
@@ -86,11 +73,20 @@ class epsilonWallFunctionFvPatchScalarField
         //- E coefficient
         scalar E_;
 
+        //- Y+ at the edge of the laminar sublayer
+        scalar yPlusLam_;
 
-    // Private member functions
+
+    // Protected member functions
 
         //- Check the type of the patch
-        void checkType();
+        virtual void checkType();
+
+        //- Calculate the Y+ at the edge of the laminar sublayer
+        virtual scalar calcYPlusLam(const scalar kappa, const scalar E) const;
+
+        //- Write local wall function variables
+        virtual void writeLocalEntries(Ostream&) const;
 
 
 public:
@@ -176,7 +172,7 @@ public:
         // I-O
 
             //- Write
-            void write(Ostream&) const;
+            virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
index 7d1954f982..4db7a49d65 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
@@ -147,7 +147,7 @@ public:
         // I-O
 
             //- Write
-            void write(Ostream&) const;
+            virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C
similarity index 77%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C
index 3a1d0b7ab0..c848c2b413 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H"
+#include "mutURoughWallFunctionFvPatchScalarField.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "RASModel.H"
@@ -41,8 +41,7 @@ namespace RASModels
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-tmp<scalarField>
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
+tmp<scalarField> mutURoughWallFunctionFvPatchScalarField::calcYPlus
 (
     const scalarField& magUp
 ) const
@@ -71,8 +70,7 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
             // of the wall will depend on yPlus
             forAll(yPlus, facei)
             {
-                const scalar magUpara = magUp[facei];
-                const scalar Re = rho[facei]*magUpara*y[facei]/muw[facei];
+                const scalar Re = rho[facei]*magUp[facei]*y[facei]/muw[facei];
                 const scalar kappaRe = kappa_*Re;
 
                 scalar yp = yPlusLam_;
@@ -90,7 +88,7 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
                 }
 
                 // Additional tuning parameter (fudge factor) - nominally = 1
-                dKsPlusdYPlus *= roughnessFudgeFactor_;
+                dKsPlusdYPlus *= roughnessFactor_;
 
                 do
                 {
@@ -143,8 +141,7 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
         // Smooth Walls
         forAll(yPlus, facei)
         {
-            const scalar magUpara = magUp[facei];
-            const scalar Re = rho[facei]*magUpara*y[facei]/muw[facei];
+            const scalar Re = rho[facei]*magUp[facei]*y[facei]/muw[facei];
             const scalar kappaRe = kappa_*Re;
 
             scalar yp = yPlusLam_;
@@ -172,8 +169,7 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
 }
 
 
-tmp<scalarField>
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcMut() const
+tmp<scalarField> mutURoughWallFunctionFvPatchScalarField::calcMut() const
 {
     const label patchI = patch().index();
 
@@ -195,7 +191,8 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcMut() const
     {
         if (yPlus[facei] > yPlusLam_)
         {
-            const scalar Re = rho[facei]*magUp[facei]*y[facei]/muw[facei];
+            const scalar Re =
+                rho[facei]*magUp[facei]*y[facei]/muw[facei] + ROOTVSMALL;
             mutw[facei] = muw[facei]*(sqr(yPlus[facei])/Re - 1);
         }
     }
@@ -206,82 +203,76 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcMut() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    mutWallFunctionFvPatchScalarField(p, iF),
+    mutkWallFunctionFvPatchScalarField(p, iF),
     roughnessHeight_(pTraits<scalar>::zero),
     roughnessConstant_(pTraits<scalar>::zero),
-    roughnessFudgeFactor_(pTraits<scalar>::zero)
+    roughnessFactor_(pTraits<scalar>::zero)
 {}
 
 
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& ptf,
+    const mutURoughWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
+    mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
     roughnessHeight_(ptf.roughnessHeight_),
     roughnessConstant_(ptf.roughnessConstant_),
-    roughnessFudgeFactor_(ptf.roughnessFudgeFactor_)
+    roughnessFactor_(ptf.roughnessFactor_)
 {}
 
 
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    mutWallFunctionFvPatchScalarField(p, iF, dict),
+    mutkWallFunctionFvPatchScalarField(p, iF, dict),
     roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
     roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
-    roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor")))
+    roughnessFactor_(readScalar(dict.lookup("roughnessFactor")))
 {}
 
 
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf
+    const mutURoughWallFunctionFvPatchScalarField& rwfpsf
 )
 :
-    mutWallFunctionFvPatchScalarField(rwfpsf),
+    mutkWallFunctionFvPatchScalarField(rwfpsf),
     roughnessHeight_(rwfpsf.roughnessHeight_),
     roughnessConstant_(rwfpsf.roughnessConstant_),
-    roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
+    roughnessFactor_(rwfpsf.roughnessFactor_)
 {}
 
 
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf,
+    const mutURoughWallFunctionFvPatchScalarField& rwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    mutWallFunctionFvPatchScalarField(rwfpsf, iF),
+    mutkWallFunctionFvPatchScalarField(rwfpsf, iF),
     roughnessHeight_(rwfpsf.roughnessHeight_),
     roughnessConstant_(rwfpsf.roughnessConstant_),
-    roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
+    roughnessFactor_(rwfpsf.roughnessFactor_)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField>
-mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const
+tmp<scalarField> mutURoughWallFunctionFvPatchScalarField::yPlus() const
 {
     const label patchI = patch().index();
 
@@ -293,10 +284,7 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const
 }
 
 
-void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
-(
-    Ostream& os
-) const
+void mutURoughWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fixedValueFvPatchScalarField::write(os);
     writeLocalEntries(os);
@@ -304,8 +292,8 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
         << roughnessHeight_ << token::END_STATEMENT << nl;
     os.writeKeyword("roughnessConstant")
         << roughnessConstant_ << token::END_STATEMENT << nl;
-    os.writeKeyword("roughnessFudgeFactor")
-        << roughnessFudgeFactor_ << token::END_STATEMENT << nl;
+    os.writeKeyword("roughnessFactor")
+        << roughnessFactor_ << token::END_STATEMENT << nl;
 }
 
 
@@ -314,7 +302,7 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
 makePatchTypeField
 (
     fvPatchScalarField,
-    mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+    mutURoughWallFunctionFvPatchScalarField
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H
similarity index 72%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H
index ff321bf622..67279322ee 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H
@@ -23,21 +23,20 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RASModels::
-        mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+    Foam::compressible::RASModels::mutURoughWallFunctionFvPatchScalarField
 
 Description
-    Wall function boundary condition for rough walls
+    Wall function boundary condition for rough walls, based on velocity.
 
 SourceFiles
     mutSpalartAllamarasStandardWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef compressibleMutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H
-#define compressibleMutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H
+#ifndef compressibleMutURoughWallFunctionFvPatchScalarField_H
+#define compressibleMutURoughWallFunctionFvPatchScalarField_H
 
-#include "mutWallFunctionFvPatchScalarField.H"
+#include "mutkWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,12 +48,12 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-Class mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField Declaration
+          Class mutURoughWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+class mutURoughWallFunctionFvPatchScalarField
 :
-    public mutWallFunctionFvPatchScalarField
+    public mutkWallFunctionFvPatchScalarField
 {
 protected:
 
@@ -69,7 +68,7 @@ protected:
             scalar roughnessConstant_;
 
             //- Scale factor
-            scalar roughnessFudgeFactor_;
+            scalar roughnessFactor_;
 
 
     // Protected member functions
@@ -84,20 +83,20 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("mutSpalartAllmarasStandardRoughWallFunction");
+    TypeName("mutURoughWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+        mutURoughWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+        mutURoughWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -105,20 +104,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+        //  mutURoughWallFunctionFvPatchScalarField
         //  onto a new patch
-        mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+        mutURoughWallFunctionFvPatchScalarField
         (
-            const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&,
+            const mutURoughWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+        mutURoughWallFunctionFvPatchScalarField
         (
-            const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&
+            const mutURoughWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -126,17 +125,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
-                (
-                    *this
-                )
+                new mutURoughWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+        mutURoughWallFunctionFvPatchScalarField
         (
-            const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&,
+            const mutURoughWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -148,11 +144,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
-                (
-                   *this,
-                    iF
-                )
+                new mutURoughWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
@@ -186,16 +178,16 @@ public:
             }
 
             //- Return the roughness scale factor
-            const scalar& roughnessFudgeFactor() const
+            const scalar& roughnessFactor() const
             {
-                return roughnessFudgeFactor_;
+                return roughnessFactor_;
             }
 
             //- Return reference to the roughness scale factor to allow
             //  adjustment
-            scalar& roughnessFudgeFactor()
+            scalar& roughnessFactor()
             {
-                return roughnessFudgeFactor_;
+                return roughnessFactor_;
             }
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C
similarity index 74%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C
index dfe1e88cab..0c63d7c8a0 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mutSpalartAllmarasWallFunctionFvPatchScalarField.H"
+#include "mutUSpaldingWallFunctionFvPatchScalarField.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "RASModel.H"
@@ -41,7 +41,7 @@ namespace RASModels
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-tmp<scalarField> mutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
+tmp<scalarField> mutUSpaldingWallFunctionFvPatchScalarField::calcUTau
 (
     const scalarField& magGradU
 ) const
@@ -66,10 +66,9 @@ tmp<scalarField> mutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
 
     forAll(mutw, faceI)
     {
-        scalar magUpara = magUp[faceI];
-
         scalar ut =
-            sqrt((mutw[faceI] + muw[faceI])*magGradU[faceI]/rhow[faceI]);
+            sqrt((mutw[faceI] + muw[faceI])*magGradU[faceI]/rhow[faceI])
+          + ROOTVSMALL;
 
         if (ut > VSMALL)
         {
@@ -78,17 +77,17 @@ tmp<scalarField> mutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
 
             do
             {
-                scalar kUu = min(kappa_*magUpara/ut, 50);
+                scalar kUu = min(kappa_*magUp[faceI]/ut, 50);
                 scalar fkUu = exp(kUu) - 1 - kUu*(1 + 0.5*kUu);
 
                 scalar f =
                     - ut*y[faceI]/(muw[faceI]/rhow[faceI])
-                    + magUpara/ut
+                    + magUp[faceI]/ut
                     + 1/E_*(fkUu - 1.0/6.0*kUu*sqr(kUu));
 
                 scalar df =
                     y[faceI]/(muw[faceI]/rhow[faceI])
-                  + magUpara/sqr(ut)
+                  + magUp[faceI]/sqr(ut)
                   + 1/E_*kUu*fkUu/ut;
 
                 scalar uTauNew = ut + f/df;
@@ -105,14 +104,13 @@ tmp<scalarField> mutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
 }
 
 
-tmp<scalarField>
-mutSpalartAllmarasWallFunctionFvPatchScalarField::calcMut() const
+tmp<scalarField> mutUSpaldingWallFunctionFvPatchScalarField::calcMut() const
 {
     const label patchI = patch().index();
 
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
     const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
-    const scalarField magGradU = mag(Uw.snGrad());
+    const scalarField magGradU = mag(Uw.snGrad()) + ROOTVSMALL;
     const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
     const scalarField& muw = rasModel.mu().boundaryField()[patchI];
 
@@ -122,67 +120,66 @@ mutSpalartAllmarasWallFunctionFvPatchScalarField::calcMut() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-mutSpalartAllmarasWallFunctionFvPatchScalarField::
-mutSpalartAllmarasWallFunctionFvPatchScalarField
+mutUSpaldingWallFunctionFvPatchScalarField::
+mutUSpaldingWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    mutWallFunctionFvPatchScalarField(p, iF)
+    mutkWallFunctionFvPatchScalarField(p, iF)
 {}
 
 
-mutSpalartAllmarasWallFunctionFvPatchScalarField::
-mutSpalartAllmarasWallFunctionFvPatchScalarField
+mutUSpaldingWallFunctionFvPatchScalarField::
+mutUSpaldingWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
+    const mutUSpaldingWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
+    mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
 {}
 
 
-mutSpalartAllmarasWallFunctionFvPatchScalarField::
-mutSpalartAllmarasWallFunctionFvPatchScalarField
+mutUSpaldingWallFunctionFvPatchScalarField::
+mutUSpaldingWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    mutWallFunctionFvPatchScalarField(p, iF, dict)
+    mutkWallFunctionFvPatchScalarField(p, iF, dict)
 {}
 
 
-mutSpalartAllmarasWallFunctionFvPatchScalarField::
-mutSpalartAllmarasWallFunctionFvPatchScalarField
+mutUSpaldingWallFunctionFvPatchScalarField::
+mutUSpaldingWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf
+    const mutUSpaldingWallFunctionFvPatchScalarField& wfpsf
 )
 :
-    mutWallFunctionFvPatchScalarField(wfpsf)
+    mutkWallFunctionFvPatchScalarField(wfpsf)
 {}
 
 
-mutSpalartAllmarasWallFunctionFvPatchScalarField::
-mutSpalartAllmarasWallFunctionFvPatchScalarField
+mutUSpaldingWallFunctionFvPatchScalarField::
+mutUSpaldingWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf,
+    const mutUSpaldingWallFunctionFvPatchScalarField& wfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    mutWallFunctionFvPatchScalarField(wfpsf, iF)
+    mutkWallFunctionFvPatchScalarField(wfpsf, iF)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField>
-mutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const
+tmp<scalarField> mutUSpaldingWallFunctionFvPatchScalarField::yPlus() const
 {
     const label patchI = patch().index();
 
@@ -196,10 +193,7 @@ mutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const
 }
 
 
-void mutSpalartAllmarasWallFunctionFvPatchScalarField::write
-(
-    Ostream& os
-) const
+void mutUSpaldingWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
@@ -209,7 +203,11 @@ void mutSpalartAllmarasWallFunctionFvPatchScalarField::write
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, mutSpalartAllmarasWallFunctionFvPatchScalarField);
+makePatchTypeField
+(
+    fvPatchScalarField,
+    mutUSpaldingWallFunctionFvPatchScalarField
+);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H
similarity index 75%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H
index fc37af6d82..c1ac830de6 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H
@@ -23,21 +23,20 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RASModels::
-    mutSpalartAllmarasWallFunctionFvPatchScalarField
+    Foam::compressible::RASModels::mutUSpaldingWallFunctionFvPatchScalarField
 
 Description
     Wall function boundary condition for walls
 
 SourceFiles
-    mutSpalartAllmarasWallFunctionFvPatchScalarField.C
+    mutUSpaldingWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef compressibleMutSpalartAllmarasWallFunctionFvPatchScalarField_H
-#define compressibleMutSpalartAllmarasWallFunctionFvPatchScalarField_H
+#ifndef compressibleMutUSpaldingWallFunctionFvPatchScalarField_H
+#define compressibleMutUSpaldingWallFunctionFvPatchScalarField_H
 
-#include "mutWallFunctionFvPatchScalarField.H"
+#include "mutkWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,12 +48,12 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-      Class mutSpalartAllmarasWallFunctionFvPatchScalarField Declaration
+        Class mutUSpaldingWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class mutSpalartAllmarasWallFunctionFvPatchScalarField
+class mutUSpaldingWallFunctionFvPatchScalarField
 :
-    public mutWallFunctionFvPatchScalarField
+    public mutkWallFunctionFvPatchScalarField
 {
 protected:
 
@@ -70,20 +69,20 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("mutSpalartAllmarasWallFunction");
+    TypeName("mutUSpaldingWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        mutSpalartAllmarasWallFunctionFvPatchScalarField
+        mutUSpaldingWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        mutSpalartAllmarasWallFunctionFvPatchScalarField
+        mutUSpaldingWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -91,20 +90,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  mutSpalartAllmarasWallFunctionFvPatchScalarField
+        //  mutUSpaldingWallFunctionFvPatchScalarField
         //  onto a new patch
-        mutSpalartAllmarasWallFunctionFvPatchScalarField
+        mutUSpaldingWallFunctionFvPatchScalarField
         (
-            const mutSpalartAllmarasWallFunctionFvPatchScalarField&,
+            const mutUSpaldingWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        mutSpalartAllmarasWallFunctionFvPatchScalarField
+        mutUSpaldingWallFunctionFvPatchScalarField
         (
-            const mutSpalartAllmarasWallFunctionFvPatchScalarField&
+            const mutUSpaldingWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -112,14 +111,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutSpalartAllmarasWallFunctionFvPatchScalarField(*this)
+                new mutUSpaldingWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        mutSpalartAllmarasWallFunctionFvPatchScalarField
+        mutUSpaldingWallFunctionFvPatchScalarField
         (
-            const mutSpalartAllmarasWallFunctionFvPatchScalarField&,
+            const mutUSpaldingWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -131,7 +130,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutSpalartAllmarasWallFunctionFvPatchScalarField(*this, iF)
+                new mutUSpaldingWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C
similarity index 74%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C
index c2a49ac751..62c8386bbb 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H"
+#include "mutUWallFunctionFvPatchScalarField.H"
 #include "RASModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -41,8 +41,7 @@ namespace RASModels
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-tmp<scalarField>
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus
+tmp<scalarField> mutUWallFunctionFvPatchScalarField::calcYPlus
 (
     const scalarField& magUp
 ) const
@@ -81,8 +80,7 @@ mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus
 }
 
 
-tmp<scalarField>
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcMut() const
+tmp<scalarField> mutUWallFunctionFvPatchScalarField::calcMut() const
 {
     const label patchI = patch().index();
 
@@ -112,67 +110,61 @@ mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcMut() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    mutWallFunctionFvPatchScalarField(p, iF)
+    mutkWallFunctionFvPatchScalarField(p, iF)
 {}
 
 
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& ptf,
+    const mutUWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
+    mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
 {}
 
 
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    mutWallFunctionFvPatchScalarField(p, iF, dict)
+    mutkWallFunctionFvPatchScalarField(p, iF, dict)
 {}
 
 
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf
+    const mutUWallFunctionFvPatchScalarField& sawfpsf
 )
 :
-    mutWallFunctionFvPatchScalarField(sawfpsf)
+    mutkWallFunctionFvPatchScalarField(sawfpsf)
 {}
 
 
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf,
+    const mutUWallFunctionFvPatchScalarField& sawfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    mutWallFunctionFvPatchScalarField(sawfpsf, iF)
+    mutkWallFunctionFvPatchScalarField(sawfpsf, iF)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField>
-mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const
+tmp<scalarField> mutUWallFunctionFvPatchScalarField::yPlus() const
 {
     const label patchI = patch().index();
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
@@ -183,10 +175,7 @@ mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const
 }
 
 
-void mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write
-(
-    Ostream& os
-) const
+void mutUWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
@@ -199,7 +188,7 @@ void mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write
 makePatchTypeField
 (
     fvPatchScalarField,
-    mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+    mutUWallFunctionFvPatchScalarField
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H
similarity index 70%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H
index 409bc0b9eb..5c70b81c44 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H
@@ -23,21 +23,20 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RASModels::
-    mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+    Foam::compressible::RASModels::mutUWallFunctionFvPatchScalarField
 
 Description
-    Wall function boundary condition for walls
+    Wall function boundary condition for walls, based on velocity.
 
 SourceFiles
-    mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+    mutUWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef compressibleMutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H
-#define compressibleMutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H
+#ifndef compressibleMutUWallFunctionFvPatchScalarField_H
+#define compressibleMutUWallFunctionFvPatchScalarField_H
 
-#include "mutWallFunctionFvPatchScalarField.H"
+#include "mutkWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,12 +48,12 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-  Class mutSpalartAllmarasStandardWallFunctionFvPatchScalarField Declaration
+            Class mutUWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+class mutUWallFunctionFvPatchScalarField
 :
-    public mutWallFunctionFvPatchScalarField
+    public mutkWallFunctionFvPatchScalarField
 {
 protected:
 
@@ -70,20 +69,20 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("mutSpalartAllmarasStandardWallFunction");
+    TypeName("mutUWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        mutUWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        mutUWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -91,20 +90,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        //  mutUWallFunctionFvPatchScalarField
         //  onto a new patch
-        mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        mutUWallFunctionFvPatchScalarField
         (
-            const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField&,
+            const mutUWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        mutUWallFunctionFvPatchScalarField
         (
-            const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField&
+            const mutUWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -112,17 +111,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
-                (
-                    *this
-                )
+                new mutUWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        mutUWallFunctionFvPatchScalarField
         (
-            const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField&,
+            const mutUWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -134,11 +130,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
+                new mutUWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C
similarity index 76%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C
index 0eaf6d0e00..6af9687f7b 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mutRoughWallFunctionFvPatchScalarField.H"
+#include "mutkRoughWallFunctionFvPatchScalarField.H"
 #include "RASModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -39,10 +39,9 @@ namespace compressible
 namespace RASModels
 {
 
-
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-scalar mutRoughWallFunctionFvPatchScalarField::fnRough
+scalar mutkRoughWallFunctionFvPatchScalarField::fnRough
 (
     const scalar KsPlus,
     const scalar Cs
@@ -65,7 +64,7 @@ scalar mutRoughWallFunctionFvPatchScalarField::fnRough
 }
 
 
-tmp<scalarField> mutRoughWallFunctionFvPatchScalarField::calcMut() const
+tmp<scalarField> mutkRoughWallFunctionFvPatchScalarField::calcMut() const
 {
     const label patchI = patch().index();
 
@@ -121,63 +120,63 @@ tmp<scalarField> mutRoughWallFunctionFvPatchScalarField::calcMut() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField
+mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    mutWallFunctionFvPatchScalarField(p, iF),
+    mutkWallFunctionFvPatchScalarField(p, iF),
     Ks_(p.size(), 0.0),
     Cs_(p.size(), 0.0)
 {}
 
 
-mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField
+mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField
 (
-    const mutRoughWallFunctionFvPatchScalarField& ptf,
+    const mutkRoughWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
+    mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
     Ks_(ptf.Ks_, mapper),
     Cs_(ptf.Cs_, mapper)
 {}
 
 
-mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField
+mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    mutWallFunctionFvPatchScalarField(p, iF, dict),
+    mutkWallFunctionFvPatchScalarField(p, iF, dict),
     Ks_("Ks", dict, p.size()),
     Cs_("Cs", dict, p.size())
 {}
 
 
-mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField
+mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField
 (
-    const mutRoughWallFunctionFvPatchScalarField& rwfpsf
+    const mutkRoughWallFunctionFvPatchScalarField& rwfpsf
 )
 :
-    mutWallFunctionFvPatchScalarField(rwfpsf),
+    mutkWallFunctionFvPatchScalarField(rwfpsf),
     Ks_(rwfpsf.Ks_),
     Cs_(rwfpsf.Cs_)
 {}
 
 
-mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField
+mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField
 (
-    const mutRoughWallFunctionFvPatchScalarField& rwfpsf,
+    const mutkRoughWallFunctionFvPatchScalarField& rwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    mutWallFunctionFvPatchScalarField(rwfpsf, iF),
+    mutkWallFunctionFvPatchScalarField(rwfpsf, iF),
     Ks_(rwfpsf.Ks_),
     Cs_(rwfpsf.Cs_)
 {}
@@ -185,34 +184,34 @@ mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void mutRoughWallFunctionFvPatchScalarField::autoMap
+void mutkRoughWallFunctionFvPatchScalarField::autoMap
 (
     const fvPatchFieldMapper& m
 )
 {
-    mutWallFunctionFvPatchScalarField::autoMap(m);
+    mutkWallFunctionFvPatchScalarField::autoMap(m);
     Ks_.autoMap(m);
     Cs_.autoMap(m);
 }
 
 
-void mutRoughWallFunctionFvPatchScalarField::rmap
+void mutkRoughWallFunctionFvPatchScalarField::rmap
 (
     const fvPatchScalarField& ptf,
     const labelList& addr
 )
 {
-    mutWallFunctionFvPatchScalarField::rmap(ptf, addr);
+    mutkWallFunctionFvPatchScalarField::rmap(ptf, addr);
 
-    const mutRoughWallFunctionFvPatchScalarField& nrwfpsf =
-        refCast<const mutRoughWallFunctionFvPatchScalarField>(ptf);
+    const mutkRoughWallFunctionFvPatchScalarField& nrwfpsf =
+        refCast<const mutkRoughWallFunctionFvPatchScalarField>(ptf);
 
     Cs_.rmap(nrwfpsf.Cs_, addr);
     Ks_.rmap(nrwfpsf.Ks_, addr);
 }
 
 
-void mutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
+void mutkRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
@@ -224,7 +223,11 @@ void mutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, mutRoughWallFunctionFvPatchScalarField);
+makePatchTypeField
+(
+    fvPatchScalarField,
+    mutkRoughWallFunctionFvPatchScalarField
+);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H
similarity index 79%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H
index 935ab29582..479fd7b9ab 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H
@@ -27,7 +27,7 @@ Class
 
 Description
     Boundary condition for turbulent (kinematic) viscosity when using wall
-    functions for rough walls.
+    functions for rough walls, based on turbulence kinetic energy.
 
     Manipulates the E parameter to account for roughness effects, based on
     KsPlus.
@@ -36,14 +36,14 @@ Description
     - roughness constant = 0.5-1.0 (0.5 default)
 
 SourceFiles
-    mutRoughWallFunctionFvPatchScalarField.C
+    mutkRoughWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef compressibleMutRoughWallFunctionFvPatchScalarField_H
-#define compressibleMutRoughWallFunctionFvPatchScalarField_H
+#ifndef compressibleMutkRoughWallFunctionFvPatchScalarField_H
+#define compressibleMutkRoughWallFunctionFvPatchScalarField_H
 
-#include "mutWallFunctionFvPatchScalarField.H"
+#include "mutkWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -55,12 +55,12 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-          Class mutRoughWallFunctionFvPatchScalarField Declaration
+          Class mutkRoughWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class mutRoughWallFunctionFvPatchScalarField
+class mutkRoughWallFunctionFvPatchScalarField
 :
-    public mutWallFunctionFvPatchScalarField
+    public mutkWallFunctionFvPatchScalarField
 {
 protected:
 
@@ -85,20 +85,20 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("mutRoughWallFunction");
+    TypeName("mutkRoughWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        mutRoughWallFunctionFvPatchScalarField
+        mutkRoughWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        mutRoughWallFunctionFvPatchScalarField
+        mutkRoughWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -106,20 +106,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  mutRoughWallFunctionFvPatchScalarField
+        //  mutkRoughWallFunctionFvPatchScalarField
         //  onto a new patch
-        mutRoughWallFunctionFvPatchScalarField
+        mutkRoughWallFunctionFvPatchScalarField
         (
-            const mutRoughWallFunctionFvPatchScalarField&,
+            const mutkRoughWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        mutRoughWallFunctionFvPatchScalarField
+        mutkRoughWallFunctionFvPatchScalarField
         (
-            const mutRoughWallFunctionFvPatchScalarField&
+            const mutkRoughWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -127,14 +127,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutRoughWallFunctionFvPatchScalarField(*this)
+                new mutkRoughWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        mutRoughWallFunctionFvPatchScalarField
+        mutkRoughWallFunctionFvPatchScalarField
         (
-            const mutRoughWallFunctionFvPatchScalarField&,
+            const mutkRoughWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -146,7 +146,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutRoughWallFunctionFvPatchScalarField(*this, iF)
+                new mutkRoughWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
@@ -156,10 +156,7 @@ public:
         // Mapping functions
 
             //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap
-            (
-                const fvPatchFieldMapper&
-            );
+            virtual void autoMap(const fvPatchFieldMapper&);
 
             //- Reverse map the given fvPatchField onto this fvPatchField
             virtual void rmap
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
similarity index 82%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
index 18ea20963c..5ab8324cda 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mutWallFunctionFvPatchScalarField.H"
+#include "mutkWallFunctionFvPatchScalarField.H"
 #include "RASModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -42,11 +42,11 @@ namespace RASModels
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void mutWallFunctionFvPatchScalarField::checkType()
+void mutkWallFunctionFvPatchScalarField::checkType()
 {
     if (!isA<wallFvPatch>(patch()))
     {
-        FatalErrorIn("mutWallFunctionFvPatchScalarField::checkType()")
+        FatalErrorIn("mutkWallFunctionFvPatchScalarField::checkType()")
             << "Invalid wall function specification" << nl
             << "    Patch type for patch " << patch().name()
             << " must be wall" << nl
@@ -56,7 +56,7 @@ void mutWallFunctionFvPatchScalarField::checkType()
 }
 
 
-scalar mutWallFunctionFvPatchScalarField::calcYPlusLam
+scalar mutkWallFunctionFvPatchScalarField::calcYPlusLam
 (
     const scalar kappa,
     const scalar E
@@ -73,7 +73,7 @@ scalar mutWallFunctionFvPatchScalarField::calcYPlusLam
 }
 
 
-tmp<scalarField> mutWallFunctionFvPatchScalarField::calcMut() const
+tmp<scalarField> mutkWallFunctionFvPatchScalarField::calcMut() const
 {
     const label patchI = patch().index();
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
@@ -105,7 +105,7 @@ tmp<scalarField> mutWallFunctionFvPatchScalarField::calcMut() const
 }
 
 
-void mutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
+void mutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
 {
     os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
     os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
@@ -115,7 +115,7 @@ void mutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
+mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -129,9 +129,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
 {}
 
 
-mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
+mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
 (
-    const mutWallFunctionFvPatchScalarField& ptf,
+    const mutkWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -145,7 +145,7 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
 {}
 
 
-mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
+mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -160,9 +160,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
 {}
 
 
-mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
+mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
 (
-    const mutWallFunctionFvPatchScalarField& wfpsf
+    const mutkWallFunctionFvPatchScalarField& wfpsf
 )
 :
     fixedValueFvPatchScalarField(wfpsf),
@@ -173,9 +173,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
 {}
 
 
-mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
+mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
 (
-    const mutWallFunctionFvPatchScalarField& wfpsf,
+    const mutkWallFunctionFvPatchScalarField& wfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -189,15 +189,20 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void mutWallFunctionFvPatchScalarField::updateCoeffs()
+void mutkWallFunctionFvPatchScalarField::updateCoeffs()
 {
+    if (updated())
+    {
+        return;
+    }
+
     operator==(calcMut());
 
     fixedValueFvPatchScalarField::updateCoeffs();
 }
 
 
-tmp<scalarField> mutWallFunctionFvPatchScalarField::yPlus() const
+tmp<scalarField> mutkWallFunctionFvPatchScalarField::yPlus() const
 {
     const label patchI = patch().index();
 
@@ -214,7 +219,7 @@ tmp<scalarField> mutWallFunctionFvPatchScalarField::yPlus() const
 }
 
 
-void mutWallFunctionFvPatchScalarField::write(Ostream& os) const
+void mutkWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
@@ -224,7 +229,7 @@ void mutWallFunctionFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, mutWallFunctionFvPatchScalarField);
+makePatchTypeField(fvPatchScalarField, mutkWallFunctionFvPatchScalarField);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H
similarity index 84%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H
index d90bf01e6e..91b930a344 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H
@@ -23,15 +23,15 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RASModels::mutWallFunctionFvPatchScalarField
+    Foam::compressible::RASModels::mutkWallFunctionFvPatchScalarField
 
 Description
     Boundary condition for turbulent (kinematic) viscosity when using wall
-    functions
+    functions, based on turbulence kinetic energy.
     - replicates OpenFOAM v1.5 (and earlier) behaviour
 
 SourceFiles
-    mutWallFunctionFvPatchScalarField.C
+    mutkWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -50,10 +50,10 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-             Class mutWallFunctionFvPatchScalarField Declaration
+             Class mutkWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class mutWallFunctionFvPatchScalarField
+class mutkWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
@@ -92,20 +92,20 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("mutWallFunction");
+    TypeName("mutkWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        mutWallFunctionFvPatchScalarField
+        mutkWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        mutWallFunctionFvPatchScalarField
+        mutkWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -113,20 +113,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  mutWallFunctionFvPatchScalarField
+        //  mutkWallFunctionFvPatchScalarField
         //  onto a new patch
-        mutWallFunctionFvPatchScalarField
+        mutkWallFunctionFvPatchScalarField
         (
-            const mutWallFunctionFvPatchScalarField&,
+            const mutkWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        mutWallFunctionFvPatchScalarField
+        mutkWallFunctionFvPatchScalarField
         (
-            const mutWallFunctionFvPatchScalarField&
+            const mutkWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -134,14 +134,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutWallFunctionFvPatchScalarField(*this)
+                new mutkWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        mutWallFunctionFvPatchScalarField
+        mutkWallFunctionFvPatchScalarField
         (
-            const mutWallFunctionFvPatchScalarField&,
+            const mutkWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -153,7 +153,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutWallFunctionFvPatchScalarField(*this, iF)
+                new mutkWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index f377694b21..6e475094ec 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -40,7 +40,7 @@ namespace compressible
 namespace RASModels
 {
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 void omegaWallFunctionFvPatchScalarField::checkType()
 {
@@ -56,6 +56,32 @@ void omegaWallFunctionFvPatchScalarField::checkType()
 }
 
 
+scalar omegaWallFunctionFvPatchScalarField::calcYPlusLam
+(
+    const scalar kappa,
+    const scalar E
+) const
+{
+    scalar ypl = 11.0;
+
+    for (int i=0; i<10; i++)
+    {
+        ypl = log(E*ypl)/kappa;
+    }
+
+    return ypl;
+}
+
+
+void omegaWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
+{
+    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
@@ -65,15 +91,12 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF),
-    UName_("U"),
-    rhoName_("rho"),
-    kName_("k"),
     GName_("RASModel::G"),
-    muName_("mu"),
-    mutName_("mut"),
     Cmu_(0.09),
     kappa_(0.41),
-    E_(9.8)
+    E_(9.8),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
+
 {
     checkType();
 }
@@ -88,15 +111,11 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    UName_(ptf.UName_),
-    rhoName_(ptf.rhoName_),
-    kName_(ptf.kName_),
     GName_(ptf.GName_),
-    muName_(ptf.muName_),
-    mutName_(ptf.mutName_),
     Cmu_(ptf.Cmu_),
     kappa_(ptf.kappa_),
-    E_(ptf.E_)
+    E_(ptf.E_),
+    yPlusLam_(ptf.yPlusLam_)
 {
     checkType();
 }
@@ -110,15 +129,11 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF, dict),
-    UName_(dict.lookupOrDefault<word>("U", "U")),
-    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    kName_(dict.lookupOrDefault<word>("k", "k")),
     GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
-    muName_(dict.lookupOrDefault<word>("mu", "mu")),
-    mutName_(dict.lookupOrDefault<word>("mut", "mut")),
     Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8))
+    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
 {
     checkType();
 }
@@ -130,15 +145,11 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(owfpsf),
-    UName_(owfpsf.UName_),
-    rhoName_(owfpsf.rhoName_),
-    kName_(owfpsf.kName_),
     GName_(owfpsf.GName_),
-    muName_(owfpsf.muName_),
-    mutName_(owfpsf.mutName_),
     Cmu_(owfpsf.Cmu_),
     kappa_(owfpsf.kappa_),
-    E_(owfpsf.E_)
+    E_(owfpsf.E_),
+    yPlusLam_(owfpsf.yPlusLam_)
 {
     checkType();
 }
@@ -151,15 +162,12 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(owfpsf, iF),
-    UName_(owfpsf.UName_),
-    rhoName_(owfpsf.rhoName_),
-    kName_(owfpsf.kName_),
     GName_(owfpsf.GName_),
-    muName_(owfpsf.muName_),
-    mutName_(owfpsf.mutName_),
     Cmu_(owfpsf.Cmu_),
     kappa_(owfpsf.kappa_),
-    E_(owfpsf.E_)
+    E_(owfpsf.E_),
+    yPlusLam_(owfpsf.yPlusLam_)
+
 {
     checkType();
 }
@@ -169,8 +177,14 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 
 void omegaWallFunctionFvPatchScalarField::updateCoeffs()
 {
+    if (updated())
+    {
+        return;
+    }
+
+    const label patchI = patch().index();
+
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-    const scalar yPlusLam = rasModel.yPlusLam(kappa_, E_);
     const scalarField& y = rasModel.y()[patch().index()];
 
     const scalar Cmu25 = pow(Cmu_, 0.25);
@@ -178,22 +192,24 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
     volScalarField& G = const_cast<volScalarField&>
         (db().lookupObject<volScalarField>(GName_));
 
-    volScalarField& omega = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>(dimensionedInternalField().name()));
+    DimensionedField<scalar, volMesh>& omega =
+        const_cast<DimensionedField<scalar, volMesh>&>
+        (
+            dimensionedInternalField()
+        );
 
-    const scalarField& k = db().lookupObject<volScalarField>(kName_);
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
 
-    const scalarField& rhow =
-        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
 
-    const scalarField& muw =
-        patch().lookupPatchField<volScalarField, scalar>(muName_);
+    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
 
-    const scalarField& mutw =
-        patch().lookupPatchField<volScalarField, scalar>(mutName_);
+    const tmp<volScalarField> tmut = rasModel.mut();
+    const volScalarField& mut = tmut();
+    const scalarField& mutw = mut.boundaryField()[patchI];
 
-    const fvPatchVectorField& Uw =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
 
     const scalarField magGradUw = mag(Uw.snGrad());
 
@@ -208,7 +224,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
 
         omega[faceCellI] = sqrt(k[faceCellI])/(Cmu25*kappa_*y[faceI]);
 
-        if (yPlus > yPlusLam)
+        if (yPlus > yPlusLam_)
         {
             G[faceCellI] =
                 (mutw[faceI] + muw[faceI])
@@ -222,6 +238,8 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
         }
     }
 
+    fixedInternalValueFvPatchField<scalar>::updateCoeffs();
+
     // TODO: perform averaging for cells sharing more than one boundary face
 }
 
@@ -229,15 +247,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
 void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fixedInternalValueFvPatchField<scalar>::write(os);
-    writeEntryIfDifferent<word>(os, "U", "U", UName_);
-    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
-    writeEntryIfDifferent<word>(os, "k", "k", kName_);
-    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
-    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
-    writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    writeLocalEntries(os);
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
index 2eb4779279..2efcc1e191 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
@@ -55,26 +55,13 @@ class omegaWallFunctionFvPatchScalarField
 :
     public fixedInternalValueFvPatchField<scalar>
 {
-    // Private data
+protected:
 
-        //- Name of velocity field
-        word UName_;
-
-        //- Name of density field
-        word rhoName_;
-
-        //- Name of turbulence kinetic energy field
-        word kName_;
+    // Protected data
 
         //- Name of turbulence generation field
         word GName_;
 
-        //- Name of laminar viscosity field
-        word muName_;
-
-        //- Name of turbulent viscosity field
-        word mutName_;
-
         //- Cmu coefficient
         scalar Cmu_;
 
@@ -84,11 +71,20 @@ class omegaWallFunctionFvPatchScalarField
         //- E coefficient
         scalar E_;
 
+        //- Y+ at the edge of the laminar sublayer
+        scalar yPlusLam_;
 
-    // Private member functions
+
+    // Protected member functions
 
         //- Check the type of the patch
-        void checkType();
+        virtual void checkType();
+
+        //- Calculate the Y+ at the edge of the laminar sublayer
+        virtual scalar calcYPlusLam(const scalar kappa, const scalar E) const;
+
+        //- Write local wall function variables
+        virtual void writeLocalEntries(Ostream&) const;
 
 
 public:
@@ -171,7 +167,7 @@ public:
         // I-O
 
             //- Write
-            void write(Ostream&) const;
+            virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
index 15cce81cc1..8c544ddef9 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
@@ -106,7 +106,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
         )   << "Unknown turbulenceModel type " << modelName
             << endl << endl
             << "Valid turbulenceModel types are :" << endl
-            << turbulenceModelConstructorTablePtr_->toc()
+            << turbulenceModelConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
index 3e3c952ffc..76c2ef0ba4 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
@@ -82,6 +82,10 @@ LESModel::LESModel
     delta_(LESdelta::New("delta", U.mesh(), *this))
 {
     readIfPresent("k0", k0_);
+
+    // Force the construction of the mesh deltaCoeffs which may be needed
+    // for the construction of the derived models and BCs
+    mesh_.deltaCoeffs();
 }
 
 
@@ -129,7 +133,7 @@ autoPtr<LESModel> LESModel::New
         )   << "Unknown LESModel type " << modelName
             << endl << endl
             << "Valid LESModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/incompressible/LES/Make/files b/src/turbulenceModels/incompressible/LES/Make/files
index 186324fde3..dae51c090a 100644
--- a/src/turbulenceModels/incompressible/LES/Make/files
+++ b/src/turbulenceModels/incompressible/LES/Make/files
@@ -32,7 +32,7 @@ kOmegaSSTSAS/kOmegaSSTSAS.C
 wallFunctions=derivedFvPatchFields/wallFunctions
 
 nuSgsWallFunctions=$(wallFunctions)/nuSgsWallFunctions
-$(nuSgsWallFunctions)/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
+$(nuSgsWallFunctions)/nuSgsUSpaldingWallFunction/nuSgsUSpaldingWallFunctionFvPatchScalarField.C
 
 
 LIB = $(FOAM_LIBBIN)/libincompressibleLESModels
diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsUSpaldingWallFunction/nuSgsUSpaldingWallFunctionFvPatchScalarField.C
similarity index 84%
rename from src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsUSpaldingWallFunction/nuSgsUSpaldingWallFunctionFvPatchScalarField.C
index 5555fd3086..cde42da5f3 100644
--- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsUSpaldingWallFunction/nuSgsUSpaldingWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "nuSgsWallFunctionFvPatchScalarField.H"
+#include "nuSgsUSpaldingWallFunctionFvPatchScalarField.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
@@ -40,8 +40,8 @@ namespace LESModels
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-nuSgsWallFunctionFvPatchScalarField::
-nuSgsWallFunctionFvPatchScalarField
+nuSgsUSpaldingWallFunctionFvPatchScalarField::
+nuSgsUSpaldingWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -55,10 +55,10 @@ nuSgsWallFunctionFvPatchScalarField
 {}
 
 
-nuSgsWallFunctionFvPatchScalarField::
-nuSgsWallFunctionFvPatchScalarField
+nuSgsUSpaldingWallFunctionFvPatchScalarField::
+nuSgsUSpaldingWallFunctionFvPatchScalarField
 (
-    const nuSgsWallFunctionFvPatchScalarField& ptf,
+    const nuSgsUSpaldingWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -72,8 +72,8 @@ nuSgsWallFunctionFvPatchScalarField
 {}
 
 
-nuSgsWallFunctionFvPatchScalarField::
-nuSgsWallFunctionFvPatchScalarField
+nuSgsUSpaldingWallFunctionFvPatchScalarField::
+nuSgsUSpaldingWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -88,10 +88,10 @@ nuSgsWallFunctionFvPatchScalarField
 {}
 
 
-nuSgsWallFunctionFvPatchScalarField::
-nuSgsWallFunctionFvPatchScalarField
+nuSgsUSpaldingWallFunctionFvPatchScalarField::
+nuSgsUSpaldingWallFunctionFvPatchScalarField
 (
-    const nuSgsWallFunctionFvPatchScalarField& nwfpsf
+    const nuSgsUSpaldingWallFunctionFvPatchScalarField& nwfpsf
 )
 :
     fixedValueFvPatchScalarField(nwfpsf),
@@ -102,10 +102,10 @@ nuSgsWallFunctionFvPatchScalarField
 {}
 
 
-nuSgsWallFunctionFvPatchScalarField::
-nuSgsWallFunctionFvPatchScalarField
+nuSgsUSpaldingWallFunctionFvPatchScalarField::
+nuSgsUSpaldingWallFunctionFvPatchScalarField
 (
-    const nuSgsWallFunctionFvPatchScalarField& nwfpsf,
+    const nuSgsUSpaldingWallFunctionFvPatchScalarField& nwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -119,7 +119,7 @@ nuSgsWallFunctionFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void nuSgsWallFunctionFvPatchScalarField::evaluate
+void nuSgsUSpaldingWallFunctionFvPatchScalarField::evaluate
 (
     const Pstream::commsTypes
 )
@@ -133,8 +133,8 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
 
     const scalarField& nuw =
         patch().lookupPatchField<volScalarField, scalar>(nuName_);
-    scalarField& nuSgsw = *this;
 
+    scalarField& nuSgsw = *this;
 
     scalarField magFaceGradU = mag(U.snGrad());
 
@@ -178,10 +178,12 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
             nuSgsw[facei] = 0;
         }
     }
+
+    fixedValueFvPatchScalarField::evaluate();
 }
 
 
-void nuSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
+void nuSgsUSpaldingWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeEntryIfDifferent<word>(os, "U", "U", UName_);
@@ -197,7 +199,7 @@ void nuSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
 makePatchTypeField
 (
     fvPatchScalarField,
-    nuSgsWallFunctionFvPatchScalarField
+    nuSgsUSpaldingWallFunctionFvPatchScalarField
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsUSpaldingWallFunction/nuSgsUSpaldingWallFunctionFvPatchScalarField.H
similarity index 76%
rename from src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsUSpaldingWallFunction/nuSgsUSpaldingWallFunctionFvPatchScalarField.H
index d1dbeb5fc9..2d122bacac 100644
--- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsUSpaldingWallFunction/nuSgsUSpaldingWallFunctionFvPatchScalarField.H
@@ -24,18 +24,19 @@ License
 
 Class
     Foam::incompressible::LESModels::
-        nuSgsWallFunctionFvPatchScalarField
+        nuSgsUSpaldingWallFunctionFvPatchScalarField
 
 Description
-    Spalart Allmaras wall function boundary condition for incompressible flows
+    Wall function boundary condition for walls, based on velocity, using
+    Spaldings law to give a continuous nuSgs profile to the wall (y+ = 0)
 
 SourceFiles
-    nuSgsWallFunctionFvPatchScalarField.C
+    nuSgsUSpaldingWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nuSgsWallFunctionFvPatchScalarField_H
-#define nuSgsWallFunctionFvPatchScalarField_H
+#ifndef nuSgsUSpaldingWallFunctionFvPatchScalarField_H
+#define nuSgsUSpaldingWallFunctionFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -49,10 +50,10 @@ namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
-     Class nuSgsWallFunctionFvPatchScalarField Declaration
+     Class nuSgsUSpaldingWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class nuSgsWallFunctionFvPatchScalarField
+class nuSgsUSpaldingWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
@@ -74,20 +75,20 @@ class nuSgsWallFunctionFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("nuSgsWallFunction");
+    TypeName("nuSgsUSpaldingWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        nuSgsWallFunctionFvPatchScalarField
+        nuSgsUSpaldingWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        nuSgsWallFunctionFvPatchScalarField
+        nuSgsUSpaldingWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -95,20 +96,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  nuSgsWallFunctionFvPatchScalarField
+        //  nuSgsUSpaldingWallFunctionFvPatchScalarField
         //  onto a new patch
-        nuSgsWallFunctionFvPatchScalarField
+        nuSgsUSpaldingWallFunctionFvPatchScalarField
         (
-            const nuSgsWallFunctionFvPatchScalarField&,
+            const nuSgsUSpaldingWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        nuSgsWallFunctionFvPatchScalarField
+        nuSgsUSpaldingWallFunctionFvPatchScalarField
         (
-            const nuSgsWallFunctionFvPatchScalarField&
+            const nuSgsUSpaldingWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -116,14 +117,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nuSgsWallFunctionFvPatchScalarField(*this)
+                new nuSgsUSpaldingWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        nuSgsWallFunctionFvPatchScalarField
+        nuSgsUSpaldingWallFunctionFvPatchScalarField
         (
-            const nuSgsWallFunctionFvPatchScalarField&,
+            const nuSgsUSpaldingWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -135,11 +136,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nuSgsWallFunctionFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
+                new nuSgsUSpaldingWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
index a3c9fd1b50..b8c1f48ee4 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
@@ -98,16 +98,20 @@ tmp<volScalarField> kOmegaSSTSAS::Lvk2
     const volScalarField& S2
 ) const
 {
-    return kappa_*sqrt(S2)
-   /(
-       mag(fvc::laplacian(U()))
-     + dimensionedScalar
-       (
-           "ROOTVSMALL",
-           dimensionSet(0, -1 , -1, 0, 0, 0, 0),
-           ROOTVSMALL
-       )
-   );
+    return max
+    (
+        kappa_*sqrt(S2)
+       /(
+            mag(fvc::laplacian(U()))
+          + dimensionedScalar
+            (
+                "ROOTVSMALL",
+                dimensionSet(0, -1 , -1, 0, 0, 0, 0),
+                ROOTVSMALL
+            )
+        ),
+        Cs_*delta()
+    );
 }
 
 
@@ -222,6 +226,15 @@ kOmegaSSTSAS::kOmegaSSTSAS
             10.0
         )
     ),
+    Cs_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cs",
+            coeffDict_,
+            0.262
+        )
+    ),
     alphaPhi_
     (
         dimensioned<scalar>::lookupOrAddToDict
@@ -441,6 +454,7 @@ bool kOmegaSSTSAS::read()
         betaStar_.readIfPresent(coeffDict());
         a1_.readIfPresent(coeffDict());
         c1_.readIfPresent(coeffDict());
+        Cs_.readIfPresent(coeffDict());
         alphaPhi_.readIfPresent(coeffDict());
         zetaTilda2_.readIfPresent(coeffDict());
         FSAS_.readIfPresent(coeffDict());
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
index 05632f9242..89b9a88190 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
@@ -28,8 +28,13 @@ Class
 Description
     kOmegaSSTSAS LES turbulence model for incompressible flows
 
-    Note: does not have an explicit dependency on spatial discretisation
-          i.e. LESdelta not used.
+    Reference:
+    DESider A European Effort on Hybrid RANS-LES Modelling:
+    Results of the European-Union Funded Project, 2004 - 2007
+    (Notes on Numerical Fluid Mechanics and Multidisciplinary Design).
+    Chapter 8 Formulation of the Scale-Adaptive Simulation (SAS) Model during
+    the DESIDER Project.
+    F. R. Menter and Y. Egorov.
 
 SourceFiles
     kOmegaSSTSAS.C
@@ -92,6 +97,7 @@ protected:
 
             dimensionedScalar a1_;
             dimensionedScalar c1_;
+            dimensionedScalar Cs_;
 
             dimensionedScalar alphaPhi_;
             dimensionedScalar zetaTilda2_;
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 7230b20dc9..33cdeec360 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -293,6 +293,7 @@ bool LaunderGibsonRSTM::read()
     if (RASModel::read())
     {
         Cmu_.readIfPresent(coeffDict());
+        kappa_.readIfPresent(coeffDict());
         Clg1_.readIfPresent(coeffDict());
         Clg2_.readIfPresent(coeffDict());
         C1_.readIfPresent(coeffDict());
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index 50a9aecf89..7e9a54bfd8 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -241,6 +241,7 @@ bool LienLeschzinerLowRe::read()
         sigmak_.readIfPresent(coeffDict());
         sigmaEps_.readIfPresent(coeffDict());
         Cmu_.readIfPresent(coeffDict());
+        kappa_.readIfPresent(coeffDict());
         Am_.readIfPresent(coeffDict());
         Aepsilon_.readIfPresent(coeffDict());
         Amu_.readIfPresent(coeffDict());
diff --git a/src/turbulenceModels/incompressible/RAS/Make/files b/src/turbulenceModels/incompressible/RAS/Make/files
index e7ac20e59e..d81b1735b8 100644
--- a/src/turbulenceModels/incompressible/RAS/Make/files
+++ b/src/turbulenceModels/incompressible/RAS/Make/files
@@ -21,11 +21,11 @@ LamBremhorstKE/LamBremhorstKE.C
 wallFunctions = derivedFvPatchFields/wallFunctions
 
 nutWallFunctions = $(wallFunctions)/nutWallFunctions
-$(nutWallFunctions)/nutWallFunction/nutWallFunctionFvPatchScalarField.C
-$(nutWallFunctions)/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
-$(nutWallFunctions)/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
-$(nutWallFunctions)/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
-$(nutWallFunctions)/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+$(nutWallFunctions)/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
+$(nutWallFunctions)/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
+$(nutWallFunctions)/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
+$(nutWallFunctions)/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
+$(nutWallFunctions)/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
 
 epsilonWallFunctions = $(wallFunctions)/epsilonWallFunctions
 $(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index 6b300390c9..c2546e659e 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -87,7 +87,11 @@ RASModel::RASModel
     omegaSmall_("omegaSmall", omega0_.dimensions(), SMALL),
 
     y_(mesh_)
-{}
+{
+    // Force the construction of the mesh deltaCoeffs which may be needed
+    // for the construction of the derived models and BCs
+    mesh_.deltaCoeffs();
+}
 
 
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
@@ -134,7 +138,7 @@ autoPtr<RASModel> RASModel::New
         )   << "Unknown RASModel type " << modelName
             << endl << endl
             << "Valid RASModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index ed37eca064..1cc7867625 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -233,6 +233,10 @@ tmp<volScalarField> SpalartAllmaras::DnuTildaEff() const
 
 tmp<volScalarField> SpalartAllmaras::k() const
 {
+    WarningIn("tmp<volScalarField> SpalartAllmaras::k() const")
+        << "Turbulence kinetic energy not defined for Spalart-Allmaras model. "
+        << "Returning zero field" << endl;
+
     return tmp<volScalarField>
     (
         new volScalarField
@@ -252,6 +256,11 @@ tmp<volScalarField> SpalartAllmaras::k() const
 
 tmp<volScalarField> SpalartAllmaras::epsilon() const
 {
+    WarningIn("tmp<volScalarField> SpalartAllmaras::epsilon() const")
+        << "Turbulence kinetic energy dissipation rate not defined for "
+        << "Spalart-Allmaras model. Returning zero field"
+        << endl;
+
     return tmp<volScalarField>
     (
         new volScalarField
@@ -326,6 +335,7 @@ bool SpalartAllmaras::read()
     if (RASModel::read())
     {
         sigmaNut_.readIfPresent(coeffDict());
+        kappa_.readIfPresent(coeffDict());
 
         Cb1_.readIfPresent(coeffDict());
         Cb2_.readIfPresent(coeffDict());
diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
index bfa6bb78a1..f71feb939d 100644
--- a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
+++ b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
@@ -27,7 +27,7 @@ License
 #include "backwardsCompatibilityWallFunctions.H"
 
 #include "calculatedFvPatchField.H"
-#include "nutWallFunctionFvPatchScalarField.H"
+#include "nutkWallFunctionFvPatchScalarField.H"
 #include "epsilonWallFunctionFvPatchScalarField.H"
 #include "kqRWallFunctionFvPatchField.H"
 #include "omegaWallFunctionFvPatchScalarField.H"
@@ -75,7 +75,7 @@ tmp<volScalarField> autoCreateNut
             if (isType<wallFvPatch>(bm[patchI]))
             {
                 nutBoundaryTypes[patchI] =
-                    RASModels::nutWallFunctionFvPatchScalarField::typeName;
+                    RASModels::nutkWallFunctionFvPatchScalarField::typeName;
             }
             else
             {
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index 93cad8188c..5f771ec663 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -56,6 +56,32 @@ void epsilonWallFunctionFvPatchScalarField::checkType()
 }
 
 
+scalar epsilonWallFunctionFvPatchScalarField::calcYPlusLam
+(
+    const scalar kappa,
+    const scalar E
+) const
+{
+    scalar ypl = 11.0;
+
+    for (int i=0; i<10; i++)
+    {
+        ypl = log(E*ypl)/kappa;
+    }
+
+    return ypl;
+}
+
+
+void epsilonWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
+{
+    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
@@ -65,14 +91,11 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF),
-    UName_("U"),
-    kName_("k"),
     GName_("RASModel::G"),
-    nuName_("nu"),
-    nutName_("nut"),
     Cmu_(0.09),
     kappa_(0.41),
-    E_(9.8)
+    E_(9.8),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
 {
     checkType();
 }
@@ -87,14 +110,11 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    UName_(ptf.UName_),
-    kName_(ptf.kName_),
     GName_(ptf.GName_),
-    nuName_(ptf.nuName_),
-    nutName_(ptf.nutName_),
     Cmu_(ptf.Cmu_),
     kappa_(ptf.kappa_),
-    E_(ptf.E_)
+    E_(ptf.E_),
+    yPlusLam_(ptf.yPlusLam_)
 {
     checkType();
 }
@@ -108,14 +128,11 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF, dict),
-    UName_(dict.lookupOrDefault<word>("U", "U")),
-    kName_(dict.lookupOrDefault<word>("k", "k")),
     GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
-    nuName_(dict.lookupOrDefault<word>("nu", "nu")),
-    nutName_(dict.lookupOrDefault<word>("nut", "nut")),
     Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8))
+    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
 {
     checkType();
 }
@@ -127,14 +144,11 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(ewfpsf),
-    UName_(ewfpsf.UName_),
-    kName_(ewfpsf.kName_),
     GName_(ewfpsf.GName_),
-    nuName_(ewfpsf.nuName_),
-    nutName_(ewfpsf.nutName_),
     Cmu_(ewfpsf.Cmu_),
     kappa_(ewfpsf.kappa_),
-    E_(ewfpsf.E_)
+    E_(ewfpsf.E_),
+    yPlusLam_(ewfpsf.yPlusLam_)
 {
     checkType();
 }
@@ -147,14 +161,11 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(ewfpsf, iF),
-    UName_(ewfpsf.UName_),
-    kName_(ewfpsf.kName_),
     GName_(ewfpsf.GName_),
-    nuName_(ewfpsf.nuName_),
-    nutName_(ewfpsf.nutName_),
     Cmu_(ewfpsf.Cmu_),
     kappa_(ewfpsf.kappa_),
-    E_(ewfpsf.E_)
+    E_(ewfpsf.E_),
+    yPlusLam_(ewfpsf.yPlusLam_)
 {
     checkType();
 }
@@ -164,29 +175,38 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 
 void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
 {
+    if (updated())
+    {
+        return;
+    }
+
+    const label patchI = patch().index();
+
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-    const scalar yPlusLam = rasModel.yPlusLam(kappa_, E_);
-    const scalarField& y = rasModel.y()[patch().index()];
+    const scalarField& y = rasModel.y()[patchI];
 
     const scalar Cmu25 = pow(Cmu_, 0.25);
     const scalar Cmu75 = pow(Cmu_, 0.75);
 
-    volScalarField& G = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>(GName_));
+    volScalarField& G =
+        const_cast<volScalarField&>(db().lookupObject<volScalarField>(GName_));
 
-    volScalarField& epsilon = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>(dimensionedInternalField().name()));
+    DimensionedField<scalar, volMesh>& epsilon =
+        const_cast<DimensionedField<scalar, volMesh>&>
+        (
+            dimensionedInternalField()
+        );
 
-    const volScalarField& k = db().lookupObject<volScalarField>(kName_);
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
 
-    const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>(nuName_);
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
 
-    const scalarField& nutw =
-        patch().lookupPatchField<volScalarField, scalar>(nutName_);
+    const tmp<volScalarField> tnut = rasModel.nut();
+    const volScalarField& nut = tnut();
+    const scalarField& nutw = nut.boundaryField()[patchI];
 
-    const fvPatchVectorField& Uw =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
 
     const scalarField magGradUw = mag(Uw.snGrad());
 
@@ -199,7 +219,7 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
 
         epsilon[faceCellI] = Cmu75*pow(k[faceCellI], 1.5)/(kappa_*y[faceI]);
 
-        if (yPlus > yPlusLam)
+        if (yPlus > yPlusLam_)
         {
             G[faceCellI] =
                 (nutw[faceI] + nuw[faceI])
@@ -213,6 +233,8 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
         }
     }
 
+    fixedInternalValueFvPatchField<scalar>::updateCoeffs();
+
     // TODO: perform averaging for cells sharing more than one boundary face
 }
 
@@ -229,14 +251,7 @@ void epsilonWallFunctionFvPatchScalarField::evaluate
 void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fixedInternalValueFvPatchField<scalar>::write(os);
-    writeEntryIfDifferent<word>(os, "U", "U", UName_);
-    writeEntryIfDifferent<word>(os, "k", "k", kName_);
-    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
-    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
-    writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    writeLocalEntries(os);
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
index bd98cced76..805daeb503 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
@@ -57,23 +57,13 @@ class epsilonWallFunctionFvPatchScalarField
 :
     public fixedInternalValueFvPatchField<scalar>
 {
-    // Private data
+protected:
 
-        //- Name of velocity field
-        word UName_;
-
-        //- Name of turbulence kinetic energy field
-        word kName_;
+    // Protected data
 
         //- Name of turbulence generation field
         word GName_;
 
-        //- Name of laminar viscosity field
-        word nuName_;
-
-        //- Name of turbulent viscosity field
-        word nutName_;
-
         //- Cmu coefficient
         scalar Cmu_;
 
@@ -84,10 +74,20 @@ class epsilonWallFunctionFvPatchScalarField
         scalar E_;
 
 
-    // Private member functions
+        //- Y+ at the edge of the laminar sublayer
+        scalar yPlusLam_;
+
+
+    // Protected member functions
 
         //- Check the type of the patch
-        void checkType();
+        virtual void checkType();
+
+        //- Calculate the Y+ at the edge of the laminar sublayer
+        virtual scalar calcYPlusLam(const scalar kappa, const scalar E) const;
+
+        //- Write local wall function variables
+        virtual void writeLocalEntries(Ostream&) const;
 
 
 public:
@@ -173,7 +173,7 @@ public:
         // I-O
 
             //- Write
-            void write(Ostream&) const;
+            virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
index e7405e9146..ef9f2747f1 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
@@ -147,7 +147,7 @@ public:
         // I-O
 
             //- Write
-            void write(Ostream&) const;
+            virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
similarity index 78%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
index 760559f679..c202ac479c 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H"
+#include "nutURoughWallFunctionFvPatchScalarField.H"
 #include "RASModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -41,8 +41,7 @@ namespace RASModels
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-tmp<scalarField>
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcNut() const
+tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::calcNut() const
 {
     const label patchI = patch().index();
 
@@ -64,7 +63,7 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcNut() const
     {
         if (yPlus[facei] > yPlusLam_)
         {
-            const scalar Re = magUp[facei]*y[facei]/nuw[facei];
+            const scalar Re = magUp[facei]*y[facei]/nuw[facei] + ROOTVSMALL;
             nutw[facei] = nuw[facei]*(sqr(yPlus[facei])/Re - 1);
         }
     }
@@ -73,8 +72,7 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcNut() const
 }
 
 
-tmp<scalarField>
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
+tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::calcYPlus
 (
     const scalarField& magUp
 ) const
@@ -120,8 +118,8 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
                     dKsPlusdYPlus = 1;
                 }
 
-                // Additional tuning parameter (fudge factor) - nominally = 1
-                dKsPlusdYPlus *= roughnessFudgeFactor_;
+                // Additional tuning parameter - nominally = 1
+                dKsPlusdYPlus *= roughnessFactor_;
 
                 do
                 {
@@ -200,82 +198,76 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    nutWallFunctionFvPatchScalarField(p, iF),
+    nutkWallFunctionFvPatchScalarField(p, iF),
     roughnessHeight_(pTraits<scalar>::zero),
     roughnessConstant_(pTraits<scalar>::zero),
-    roughnessFudgeFactor_(pTraits<scalar>::zero)
+    roughnessFactor_(pTraits<scalar>::zero)
 {}
 
 
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
 (
-    const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& ptf,
+    const nutURoughWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
+    nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
     roughnessHeight_(ptf.roughnessHeight_),
     roughnessConstant_(ptf.roughnessConstant_),
-    roughnessFudgeFactor_(ptf.roughnessFudgeFactor_)
+    roughnessFactor_(ptf.roughnessFactor_)
 {}
 
 
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    nutWallFunctionFvPatchScalarField(p, iF, dict),
+    nutkWallFunctionFvPatchScalarField(p, iF, dict),
     roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
     roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
-    roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor")))
+    roughnessFactor_(readScalar(dict.lookup("roughnessFactor")))
 {}
 
 
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
 (
-    const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf
+    const nutURoughWallFunctionFvPatchScalarField& rwfpsf
 )
 :
-    nutWallFunctionFvPatchScalarField(rwfpsf),
+    nutkWallFunctionFvPatchScalarField(rwfpsf),
     roughnessHeight_(rwfpsf.roughnessHeight_),
     roughnessConstant_(rwfpsf.roughnessConstant_),
-    roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
+    roughnessFactor_(rwfpsf.roughnessFactor_)
 {}
 
 
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
 (
-    const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf,
+    const nutURoughWallFunctionFvPatchScalarField& rwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    nutWallFunctionFvPatchScalarField(rwfpsf, iF),
+    nutkWallFunctionFvPatchScalarField(rwfpsf, iF),
     roughnessHeight_(rwfpsf.roughnessHeight_),
     roughnessConstant_(rwfpsf.roughnessConstant_),
-    roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
+    roughnessFactor_(rwfpsf.roughnessFactor_)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField>
-nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const
+tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::yPlus() const
 {
     const label patchI = patch().index();
 
@@ -287,10 +279,7 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const
 }
 
 
-void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
-(
-    Ostream& os
-) const
+void nutURoughWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
@@ -298,8 +287,8 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
         << roughnessHeight_ << token::END_STATEMENT << nl;
     os.writeKeyword("roughnessConstant")
         << roughnessConstant_ << token::END_STATEMENT << nl;
-    os.writeKeyword("roughnessFudgeFactor")
-        << roughnessFudgeFactor_ << token::END_STATEMENT << nl;
+    os.writeKeyword("roughnessFactor")
+        << roughnessFactor_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
 
@@ -309,7 +298,7 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
 makePatchTypeField
 (
     fvPatchScalarField,
-    nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+    nutURoughWallFunctionFvPatchScalarField
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H
similarity index 73%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H
index 8d72e5ad13..1fbb24f9c5 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H
@@ -23,21 +23,20 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RASModels::
-    nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+    Foam::incompressible::RASModels::nutURoughWallFunctionFvPatchScalarField
 
 Description
-    Wall function boundary condition for rough walls
+    Wall function boundary condition for rough walls, based on velocity.
 
 SourceFiles
     nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H
-#define nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H
+#ifndef nutURoughWallFunctionFvPatchScalarField_H
+#define nutURoughWallFunctionFvPatchScalarField_H
 
-#include "nutWallFunctionFvPatchScalarField.H"
+#include "nutkWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,12 +48,12 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-Class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField Declaration
+          Class nutURoughWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+class nutURoughWallFunctionFvPatchScalarField
 :
-    public nutWallFunctionFvPatchScalarField
+    public nutkWallFunctionFvPatchScalarField
 {
     // Private data
 
@@ -67,7 +66,7 @@ class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
             scalar roughnessConstant_;
 
             //- Scale factor
-            scalar roughnessFudgeFactor_;
+            scalar roughnessFactor_;
 
 
     // Protected member functions
@@ -82,20 +81,20 @@ class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("nutSpalartAllmarasStandardRoughWallFunction");
+    TypeName("nutURoughWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+        nutURoughWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+        nutURoughWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -103,20 +102,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+        //  nutURoughWallFunctionFvPatchScalarField
         //  onto a new patch
-        nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+        nutURoughWallFunctionFvPatchScalarField
         (
-            const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&,
+            const nutURoughWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+        nutURoughWallFunctionFvPatchScalarField
         (
-            const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&
+            const nutURoughWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -124,17 +123,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
-                (
-                    *this
-                )
+                new nutURoughWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+        nutURoughWallFunctionFvPatchScalarField
         (
-            const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&,
+            const nutURoughWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -146,11 +142,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
+                new nutURoughWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
@@ -185,16 +177,16 @@ public:
             }
 
             //- Return the roughness scale factor
-            const scalar& roughnessFudgeFactor() const
+            const scalar& roughnessFactor() const
             {
-                return roughnessFudgeFactor_;
+                return roughnessFactor_;
             }
 
             //- Return reference to the roughness scale factor to allow
             //  adjustment
-            scalar& roughnessFudgeFactor()
+            scalar& roughnessFactor()
             {
-                return roughnessFudgeFactor_;
+                return roughnessFactor_;
             }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
similarity index 73%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
index 8b968a4fa2..4adf3227ab 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "nutSpalartAllmarasWallFunctionFvPatchScalarField.H"
+#include "nutUSpaldingWallFunctionFvPatchScalarField.H"
 #include "RASModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -41,21 +41,20 @@ namespace RASModels
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-tmp<scalarField>
-nutSpalartAllmarasWallFunctionFvPatchScalarField::calcNut() const
+tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::calcNut() const
 {
     const label patchI = patch().index();
 
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
     const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
-    const scalarField magGradU = mag(Uw.snGrad());
+    const scalarField magGradU = mag(Uw.snGrad()) + ROOTVSMALL;
     const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
 
     return max(scalar(0), sqr(calcUTau(magGradU))/magGradU - nuw);
 }
 
 
-tmp<scalarField> nutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
+tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::calcUTau
 (
     const scalarField& magGradU
 ) const
@@ -75,9 +74,8 @@ tmp<scalarField> nutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
 
     forAll(uTau, facei)
     {
-        scalar magUpara = magUp[facei];
-
-        scalar ut = sqrt((nutw[facei] + nuw[facei])*magGradU[facei]);
+        scalar ut =
+            sqrt((nutw[facei] + nuw[facei])*magGradU[facei]) + ROOTVSMALL;
 
         if (ut > VSMALL)
         {
@@ -86,17 +84,17 @@ tmp<scalarField> nutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
 
             do
             {
-                scalar kUu = min(kappa_*magUpara/ut, 50);
+                scalar kUu = min(kappa_*magUp[facei]/ut, 50);
                 scalar fkUu = exp(kUu) - 1 - kUu*(1 + 0.5*kUu);
 
                 scalar f =
                     - ut*y[facei]/nuw[facei]
-                    + magUpara/ut
+                    + magUp[facei]/ut
                     + 1/E_*(fkUu - 1.0/6.0*kUu*sqr(kUu));
 
                 scalar df =
                     y[facei]/nuw[facei]
-                  + magUpara/sqr(ut)
+                  + magUp[facei]/sqr(ut)
                   + 1/E_*kUu*fkUu/ut;
 
                 scalar uTauNew = ut + f/df;
@@ -104,6 +102,7 @@ tmp<scalarField> nutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
                 ut = uTauNew;
 
             } while (ut > VSMALL && err > 0.01 && ++iter < 10);
+
             uTau[facei] = max(0.0, ut);
         }
     }
@@ -114,67 +113,66 @@ tmp<scalarField> nutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-nutSpalartAllmarasWallFunctionFvPatchScalarField::
-nutSpalartAllmarasWallFunctionFvPatchScalarField
+nutUSpaldingWallFunctionFvPatchScalarField::
+nutUSpaldingWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    nutWallFunctionFvPatchScalarField(p, iF)
+    nutkWallFunctionFvPatchScalarField(p, iF)
 {}
 
 
-nutSpalartAllmarasWallFunctionFvPatchScalarField::
-nutSpalartAllmarasWallFunctionFvPatchScalarField
+nutUSpaldingWallFunctionFvPatchScalarField::
+nutUSpaldingWallFunctionFvPatchScalarField
 (
-    const nutSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
+    const nutUSpaldingWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
+    nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
 {}
 
 
-nutSpalartAllmarasWallFunctionFvPatchScalarField::
-nutSpalartAllmarasWallFunctionFvPatchScalarField
+nutUSpaldingWallFunctionFvPatchScalarField::
+nutUSpaldingWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    nutWallFunctionFvPatchScalarField(p, iF, dict)
+    nutkWallFunctionFvPatchScalarField(p, iF, dict)
 {}
 
 
-nutSpalartAllmarasWallFunctionFvPatchScalarField::
-nutSpalartAllmarasWallFunctionFvPatchScalarField
+nutUSpaldingWallFunctionFvPatchScalarField::
+nutUSpaldingWallFunctionFvPatchScalarField
 (
-    const nutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf
+    const nutUSpaldingWallFunctionFvPatchScalarField& wfpsf
 )
 :
-    nutWallFunctionFvPatchScalarField(wfpsf)
+    nutkWallFunctionFvPatchScalarField(wfpsf)
 {}
 
 
-nutSpalartAllmarasWallFunctionFvPatchScalarField::
-nutSpalartAllmarasWallFunctionFvPatchScalarField
+nutUSpaldingWallFunctionFvPatchScalarField::
+nutUSpaldingWallFunctionFvPatchScalarField
 (
-    const nutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf,
+    const nutUSpaldingWallFunctionFvPatchScalarField& wfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    nutWallFunctionFvPatchScalarField(wfpsf, iF)
+    nutkWallFunctionFvPatchScalarField(wfpsf, iF)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField>
-nutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const
+tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::yPlus() const
 {
     const label patchI = patch().index();
 
@@ -187,10 +185,7 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const
 }
 
 
-void nutSpalartAllmarasWallFunctionFvPatchScalarField::write
-(
-    Ostream& os
-) const
+void nutUSpaldingWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
@@ -203,7 +198,7 @@ void nutSpalartAllmarasWallFunctionFvPatchScalarField::write
 makePatchTypeField
 (
     fvPatchScalarField,
-    nutSpalartAllmarasWallFunctionFvPatchScalarField
+    nutUSpaldingWallFunctionFvPatchScalarField
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H
similarity index 74%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H
index 36f2aadb15..de663d32a9 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H
@@ -23,21 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RASModels::
-    nutSpalartAllmarasWallFunctionFvPatchScalarField
+    Foam::incompressible::RASModels::nutUSpaldingWallFunctionFvPatchScalarField
 
 Description
-    Wall function boundary condition for walls
+    Wall function boundary condition for walls, based on velocity, using
+    Spaldings law to give a continuous nut profile to the wall (y+ = 0)
 
 SourceFiles
-    nutSpalartAllmarasWallFunctionFvPatchScalarField.C
+    nutUSpaldingWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nutSpalartAllmarasWallFunctionFvPatchScalarField_H
-#define nutSpalartAllmarasWallFunctionFvPatchScalarField_H
+#ifndef nutUSpaldingWallFunctionFvPatchScalarField_H
+#define nutUSpaldingWallFunctionFvPatchScalarField_H
 
-#include "nutWallFunctionFvPatchScalarField.H"
+#include "nutkWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,12 +49,12 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-           Class nutSpalartAllmarasWallFunctionFvPatch Declaration
+              Class nutUSpaldingWallFunctionFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class nutSpalartAllmarasWallFunctionFvPatchScalarField
+class nutUSpaldingWallFunctionFvPatchScalarField
 :
-    public nutWallFunctionFvPatchScalarField
+    public nutkWallFunctionFvPatchScalarField
 {
 protected:
 
@@ -70,20 +70,20 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("nutSpalartAllmarasWallFunction");
+    TypeName("nutUSpaldingWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        nutSpalartAllmarasWallFunctionFvPatchScalarField
+        nutUSpaldingWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        nutSpalartAllmarasWallFunctionFvPatchScalarField
+        nutUSpaldingWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -91,20 +91,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  nutSpalartAllmarasWallFunctionFvPatchScalarField
+        //  nutUSpaldingWallFunctionFvPatchScalarField
         //  onto a new patch
-        nutSpalartAllmarasWallFunctionFvPatchScalarField
+        nutUSpaldingWallFunctionFvPatchScalarField
         (
-            const nutSpalartAllmarasWallFunctionFvPatchScalarField&,
+            const nutUSpaldingWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        nutSpalartAllmarasWallFunctionFvPatchScalarField
+        nutUSpaldingWallFunctionFvPatchScalarField
         (
-            const nutSpalartAllmarasWallFunctionFvPatchScalarField&
+            const nutUSpaldingWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -112,14 +112,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutSpalartAllmarasWallFunctionFvPatchScalarField(*this)
+                new nutUSpaldingWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        nutSpalartAllmarasWallFunctionFvPatchScalarField
+        nutUSpaldingWallFunctionFvPatchScalarField
         (
-            const nutSpalartAllmarasWallFunctionFvPatchScalarField&,
+            const nutUSpaldingWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -131,7 +131,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutSpalartAllmarasWallFunctionFvPatchScalarField(*this, iF)
+                new nutUSpaldingWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
similarity index 74%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
index e3c3e55671..bccc07672f 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H"
+#include "nutUWallFunctionFvPatchScalarField.H"
 #include "RASModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -41,8 +41,7 @@ namespace RASModels
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-tmp<scalarField>
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcNut() const
+tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcNut() const
 {
     const label patchI = patch().index();
 
@@ -70,8 +69,7 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcNut() const
 }
 
 
-tmp<scalarField>
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus
+tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcYPlus
 (
     const scalarField& magUp
 ) const
@@ -111,67 +109,61 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    nutWallFunctionFvPatchScalarField(p, iF)
+    nutkWallFunctionFvPatchScalarField(p, iF)
 {}
 
 
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
 (
-    const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& ptf,
+    const nutUWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
+    nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
 {}
 
 
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    nutWallFunctionFvPatchScalarField(p, iF, dict)
+    nutkWallFunctionFvPatchScalarField(p, iF, dict)
 {}
 
 
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
 (
-    const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf
+    const nutUWallFunctionFvPatchScalarField& sawfpsf
 )
 :
-    nutWallFunctionFvPatchScalarField(sawfpsf)
+    nutkWallFunctionFvPatchScalarField(sawfpsf)
 {}
 
 
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField
 (
-    const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf,
+    const nutUWallFunctionFvPatchScalarField& sawfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    nutWallFunctionFvPatchScalarField(sawfpsf, iF)
+    nutkWallFunctionFvPatchScalarField(sawfpsf, iF)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField>
-nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const
+tmp<scalarField> nutUWallFunctionFvPatchScalarField::yPlus() const
 {
     const label patchI = patch().index();
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
@@ -182,10 +174,7 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const
 }
 
 
-void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write
-(
-    Ostream& os
-) const
+void nutUWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
@@ -198,7 +187,7 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write
 makePatchTypeField
 (
     fvPatchScalarField,
-    nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+    nutUWallFunctionFvPatchScalarField
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H
similarity index 70%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H
index f54bb57c8a..32bd0aad51 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H
@@ -23,21 +23,20 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RASModels::
-    nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+    Foam::incompressible::RASModels::nutUWallFunctionFvPatchScalarField
 
 Description
-    Wall function boundary condition for walls
+    Wall function boundary condition for walls, based on velocity.
 
 SourceFiles
-    nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+    nutUWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H
-#define nutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H
+#ifndef nutUWallFunctionFvPatchScalarField_H
+#define nutUWallFunctionFvPatchScalarField_H
 
-#include "nutWallFunctionFvPatchScalarField.H"
+#include "nutkWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,12 +48,12 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-  Class nutSpalartAllmarasStandardWallFunctionFvPatchScalarField Declaration
+  Class nutUWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+class nutUWallFunctionFvPatchScalarField
 :
-    public nutWallFunctionFvPatchScalarField
+    public nutkWallFunctionFvPatchScalarField
 {
 protected:
 
@@ -70,20 +69,20 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("nutSpalartAllmarasStandardWallFunction");
+    TypeName("nutUWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        nutUWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        nutUWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -91,20 +90,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        //  nutUWallFunctionFvPatchScalarField
         //  onto a new patch
-        nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        nutUWallFunctionFvPatchScalarField
         (
-            const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&,
+            const nutUWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        nutUWallFunctionFvPatchScalarField
         (
-            const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&
+            const nutUWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -112,17 +111,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
-                (
-                    *this
-                )
+                new nutUWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        nutUWallFunctionFvPatchScalarField
         (
-            const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&,
+            const nutUWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -134,11 +130,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
+                new nutUWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
similarity index 76%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
index 48d9ba1dde..f81cb76c5c 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "nutRoughWallFunctionFvPatchScalarField.H"
+#include "nutkRoughWallFunctionFvPatchScalarField.H"
 #include "RASModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -41,7 +41,7 @@ namespace RASModels
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-scalar nutRoughWallFunctionFvPatchScalarField::fnRough
+scalar nutkRoughWallFunctionFvPatchScalarField::fnRough
 (
     const scalar KsPlus,
     const scalar Cs
@@ -64,7 +64,7 @@ scalar nutRoughWallFunctionFvPatchScalarField::fnRough
 }
 
 
-tmp<scalarField> nutRoughWallFunctionFvPatchScalarField::calcNut() const
+tmp<scalarField> nutkRoughWallFunctionFvPatchScalarField::calcNut() const
 {
     const label patchI = patch().index();
 
@@ -128,63 +128,63 @@ tmp<scalarField> nutRoughWallFunctionFvPatchScalarField::calcNut() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
+nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    nutWallFunctionFvPatchScalarField(p, iF),
+    nutkWallFunctionFvPatchScalarField(p, iF),
     Ks_(p.size(), 0.0),
     Cs_(p.size(), 0.0)
 {}
 
 
-nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
+nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
 (
-    const nutRoughWallFunctionFvPatchScalarField& ptf,
+    const nutkRoughWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
+    nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
     Ks_(ptf.Ks_, mapper),
     Cs_(ptf.Cs_, mapper)
 {}
 
 
-nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
+nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    nutWallFunctionFvPatchScalarField(p, iF, dict),
+    nutkWallFunctionFvPatchScalarField(p, iF, dict),
     Ks_("Ks", dict, p.size()),
     Cs_("Cs", dict, p.size())
 {}
 
 
-nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
+nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
 (
-    const nutRoughWallFunctionFvPatchScalarField& rwfpsf
+    const nutkRoughWallFunctionFvPatchScalarField& rwfpsf
 )
 :
-    nutWallFunctionFvPatchScalarField(rwfpsf),
+    nutkWallFunctionFvPatchScalarField(rwfpsf),
     Ks_(rwfpsf.Ks_),
     Cs_(rwfpsf.Cs_)
 {}
 
 
-nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
+nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField
 (
-    const nutRoughWallFunctionFvPatchScalarField& rwfpsf,
+    const nutkRoughWallFunctionFvPatchScalarField& rwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    nutWallFunctionFvPatchScalarField(rwfpsf, iF),
+    nutkWallFunctionFvPatchScalarField(rwfpsf, iF),
     Ks_(rwfpsf.Ks_),
     Cs_(rwfpsf.Cs_)
 {}
@@ -192,34 +192,34 @@ nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void nutRoughWallFunctionFvPatchScalarField::autoMap
+void nutkRoughWallFunctionFvPatchScalarField::autoMap
 (
     const fvPatchFieldMapper& m
 )
 {
-    nutWallFunctionFvPatchScalarField::autoMap(m);
+    nutkWallFunctionFvPatchScalarField::autoMap(m);
     Ks_.autoMap(m);
     Cs_.autoMap(m);
 }
 
 
-void nutRoughWallFunctionFvPatchScalarField::rmap
+void nutkRoughWallFunctionFvPatchScalarField::rmap
 (
     const fvPatchScalarField& ptf,
     const labelList& addr
 )
 {
-    nutWallFunctionFvPatchScalarField::rmap(ptf, addr);
+    nutkWallFunctionFvPatchScalarField::rmap(ptf, addr);
 
-    const nutRoughWallFunctionFvPatchScalarField& nrwfpsf =
-        refCast<const nutRoughWallFunctionFvPatchScalarField>(ptf);
+    const nutkRoughWallFunctionFvPatchScalarField& nrwfpsf =
+        refCast<const nutkRoughWallFunctionFvPatchScalarField>(ptf);
 
     Ks_.rmap(nrwfpsf.Ks_, addr);
     Cs_.rmap(nrwfpsf.Cs_, addr);
 }
 
 
-void nutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
+void nutkRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
@@ -231,7 +231,11 @@ void nutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, nutRoughWallFunctionFvPatchScalarField);
+makePatchTypeField
+(
+    fvPatchScalarField,
+    nutkRoughWallFunctionFvPatchScalarField
+);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H
similarity index 79%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H
index 488bf39145..c45bedc516 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H
@@ -23,11 +23,11 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RASModels::nutRoughWallFunctionFvPatchScalarField
+    Foam::incompressible::RASModels::nutkRoughWallFunctionFvPatchScalarField
 
 Description
     Boundary condition for turbulent (kinematic) viscosity when using wall
-    functions for rough walls.
+    functions for rough walls, based on turbulence kinetic energy.
 
     Manipulates the E parameter to account for roughness effects, based on
     KsPlus.
@@ -36,14 +36,14 @@ Description
     - roughness constant = 0.5-1.0 (0.5 default)
 
 SourceFiles
-    nutRoughWallFunctionFvPatchScalarField.C
+    nutkRoughWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nutRoughWallFunctionFvPatchScalarField_H
-#define nutRoughWallFunctionFvPatchScalarField_H
+#ifndef nutkRoughWallFunctionFvPatchScalarField_H
+#define nutkRoughWallFunctionFvPatchScalarField_H
 
-#include "nutWallFunctionFvPatchScalarField.H"
+#include "nutkWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -55,12 +55,12 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-           Class nutRoughWallFunctionFvPatchScalarField Declaration
+           Class nutkRoughWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class nutRoughWallFunctionFvPatchScalarField
+class nutkRoughWallFunctionFvPatchScalarField
 :
-    public nutWallFunctionFvPatchScalarField
+    public nutkWallFunctionFvPatchScalarField
 {
 protected:
 
@@ -85,20 +85,20 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("nutRoughWallFunction");
+    TypeName("nutkRoughWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        nutRoughWallFunctionFvPatchScalarField
+        nutkRoughWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        nutRoughWallFunctionFvPatchScalarField
+        nutkRoughWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -106,20 +106,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  nutRoughWallFunctionFvPatchScalarField
+        //  nutkRoughWallFunctionFvPatchScalarField
         //  onto a new patch
-        nutRoughWallFunctionFvPatchScalarField
+        nutkRoughWallFunctionFvPatchScalarField
         (
-            const nutRoughWallFunctionFvPatchScalarField&,
+            const nutkRoughWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        nutRoughWallFunctionFvPatchScalarField
+        nutkRoughWallFunctionFvPatchScalarField
         (
-            const nutRoughWallFunctionFvPatchScalarField&
+            const nutkRoughWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -127,14 +127,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutRoughWallFunctionFvPatchScalarField(*this)
+                new nutkRoughWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        nutRoughWallFunctionFvPatchScalarField
+        nutkRoughWallFunctionFvPatchScalarField
         (
-            const nutRoughWallFunctionFvPatchScalarField&,
+            const nutkRoughWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -146,7 +146,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutRoughWallFunctionFvPatchScalarField(*this, iF)
+                new nutkRoughWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
similarity index 82%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
index aef4df68b3..dbb07712d8 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "nutWallFunctionFvPatchScalarField.H"
+#include "nutkWallFunctionFvPatchScalarField.H"
 #include "RASModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -42,11 +42,11 @@ namespace RASModels
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void nutWallFunctionFvPatchScalarField::checkType()
+void nutkWallFunctionFvPatchScalarField::checkType()
 {
     if (!isA<wallFvPatch>(patch()))
     {
-        FatalErrorIn("nutWallFunctionFvPatchScalarField::checkType()")
+        FatalErrorIn("nutkWallFunctionFvPatchScalarField::checkType()")
             << "Invalid wall function specification" << nl
             << "    Patch type for patch " << patch().name()
             << " must be wall" << nl
@@ -56,7 +56,7 @@ void nutWallFunctionFvPatchScalarField::checkType()
 }
 
 
-scalar nutWallFunctionFvPatchScalarField::calcYPlusLam
+scalar nutkWallFunctionFvPatchScalarField::calcYPlusLam
 (
     const scalar kappa,
     const scalar E
@@ -73,7 +73,7 @@ scalar nutWallFunctionFvPatchScalarField::calcYPlusLam
 }
 
 
-tmp<scalarField> nutWallFunctionFvPatchScalarField::calcNut() const
+tmp<scalarField> nutkWallFunctionFvPatchScalarField::calcNut() const
 {
     const label patchI = patch().index();
 
@@ -104,7 +104,7 @@ tmp<scalarField> nutWallFunctionFvPatchScalarField::calcNut() const
 }
 
 
-void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
+void nutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
 {
     os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
     os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
@@ -114,7 +114,7 @@ void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
+nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -130,9 +130,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
 }
 
 
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
+nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
 (
-    const nutWallFunctionFvPatchScalarField& ptf,
+    const nutkWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -148,7 +148,7 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
 }
 
 
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
+nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -165,9 +165,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
 }
 
 
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
+nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
 (
-    const nutWallFunctionFvPatchScalarField& wfpsf
+    const nutkWallFunctionFvPatchScalarField& wfpsf
 )
 :
     fixedValueFvPatchScalarField(wfpsf),
@@ -180,9 +180,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
 }
 
 
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
+nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
 (
-    const nutWallFunctionFvPatchScalarField& wfpsf,
+    const nutkWallFunctionFvPatchScalarField& wfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -198,15 +198,20 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void nutWallFunctionFvPatchScalarField::updateCoeffs()
+void nutkWallFunctionFvPatchScalarField::updateCoeffs()
 {
+    if (updated())
+    {
+        return;
+    }
+
     operator==(calcNut());
 
     fixedValueFvPatchScalarField::updateCoeffs();
 }
 
 
-tmp<scalarField> nutWallFunctionFvPatchScalarField::yPlus() const
+tmp<scalarField> nutkWallFunctionFvPatchScalarField::yPlus() const
 {
     const label patchI = patch().index();
 
@@ -222,7 +227,7 @@ tmp<scalarField> nutWallFunctionFvPatchScalarField::yPlus() const
 }
 
 
-void nutWallFunctionFvPatchScalarField::write(Ostream& os) const
+void nutkWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
     writeLocalEntries(os);
@@ -232,7 +237,7 @@ void nutWallFunctionFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, nutWallFunctionFvPatchScalarField);
+makePatchTypeField(fvPatchScalarField, nutkWallFunctionFvPatchScalarField);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H
similarity index 82%
rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H
index 369d718b0a..5b781a934a 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H
@@ -23,20 +23,20 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RASModels::nutWallFunctionFvPatchScalarField
+    Foam::incompressible::RASModels::nutkWallFunctionFvPatchScalarField
 
 Description
     Boundary condition for turbulent (kinematic) viscosity when using wall
-    functions
+    functions, based on turbulence kinetic energy.
     - replicates OpenFOAM v1.5 (and earlier) behaviour
 
 SourceFiles
-    nutWallFunctionFvPatchScalarField.C
+    nutkWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nutWallFunctionFvPatchScalarField_H
-#define nutWallFunctionFvPatchScalarField_H
+#ifndef nutkWallFunctionFvPatchScalarField_H
+#define nutkWallFunctionFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -50,10 +50,10 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-             Class nutWallFunctionFvPatchScalarField Declaration
+             Class nutkWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class nutWallFunctionFvPatchScalarField
+class nutkWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
@@ -92,20 +92,20 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("nutWallFunction");
+    TypeName("nutkWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        nutWallFunctionFvPatchScalarField
+        nutkWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        nutWallFunctionFvPatchScalarField
+        nutkWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -113,20 +113,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  nutWallFunctionFvPatchScalarField
+        //  nutkWallFunctionFvPatchScalarField
         //  onto a new patch
-        nutWallFunctionFvPatchScalarField
+        nutkWallFunctionFvPatchScalarField
         (
-            const nutWallFunctionFvPatchScalarField&,
+            const nutkWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        nutWallFunctionFvPatchScalarField
+        nutkWallFunctionFvPatchScalarField
         (
-            const nutWallFunctionFvPatchScalarField&
+            const nutkWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -134,14 +134,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutWallFunctionFvPatchScalarField(*this)
+                new nutkWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        nutWallFunctionFvPatchScalarField
+        nutkWallFunctionFvPatchScalarField
         (
-            const nutWallFunctionFvPatchScalarField&,
+            const nutkWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -153,7 +153,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutWallFunctionFvPatchScalarField(*this, iF)
+                new nutkWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 300b0aaf4f..c39b20bf0c 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -40,7 +40,7 @@ namespace incompressible
 namespace RASModels
 {
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 void omegaWallFunctionFvPatchScalarField::checkType()
 {
@@ -56,6 +56,32 @@ void omegaWallFunctionFvPatchScalarField::checkType()
 }
 
 
+scalar omegaWallFunctionFvPatchScalarField::calcYPlusLam
+(
+    const scalar kappa,
+    const scalar E
+) const
+{
+    scalar ypl = 11.0;
+
+    for (int i=0; i<10; i++)
+    {
+        ypl = log(E*ypl)/kappa;
+    }
+
+    return ypl;
+}
+
+
+void omegaWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
+{
+    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
@@ -65,14 +91,11 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF),
-    UName_("U"),
-    kName_("k"),
     GName_("RASModel::G"),
-    nuName_("nu"),
-    nutName_("nut"),
     Cmu_(0.09),
     kappa_(0.41),
-    E_(9.8)
+    E_(9.8),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
 {
     checkType();
 }
@@ -87,14 +110,11 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper),
-    UName_(ptf.UName_),
-    kName_(ptf.kName_),
     GName_(ptf.GName_),
-    nuName_(ptf.nuName_),
-    nutName_(ptf.nutName_),
     Cmu_(ptf.Cmu_),
     kappa_(ptf.kappa_),
-    E_(ptf.E_)
+    E_(ptf.E_),
+    yPlusLam_(ptf.yPlusLam_)
 {
     checkType();
 }
@@ -108,14 +128,11 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(p, iF, dict),
-    UName_(dict.lookupOrDefault<word>("U", "U")),
-    kName_(dict.lookupOrDefault<word>("k", "k")),
     GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
-    nuName_(dict.lookupOrDefault<word>("nu", "nu")),
-    nutName_(dict.lookupOrDefault<word>("nut", "nut")),
     Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
-    E_(dict.lookupOrDefault<scalar>("E", 9.8))
+    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
 {
     checkType();
 }
@@ -127,14 +144,11 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(owfpsf),
-    UName_(owfpsf.UName_),
-    kName_(owfpsf.kName_),
     GName_(owfpsf.GName_),
-    nuName_(owfpsf.nuName_),
-    nutName_(owfpsf.nutName_),
     Cmu_(owfpsf.Cmu_),
     kappa_(owfpsf.kappa_),
-    E_(owfpsf.E_)
+    E_(owfpsf.E_),
+    yPlusLam_(owfpsf.yPlusLam_)
 {
     checkType();
 }
@@ -147,14 +161,12 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 )
 :
     fixedInternalValueFvPatchField<scalar>(owfpsf, iF),
-    UName_(owfpsf.UName_),
-    kName_(owfpsf.kName_),
     GName_(owfpsf.GName_),
-    nuName_(owfpsf.nuName_),
-    nutName_(owfpsf.nutName_),
     Cmu_(owfpsf.Cmu_),
     kappa_(owfpsf.kappa_),
-    E_(owfpsf.E_)
+    E_(owfpsf.E_),
+    yPlusLam_(owfpsf.yPlusLam_)
+
 {
     checkType();
 }
@@ -164,28 +176,37 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 
 void omegaWallFunctionFvPatchScalarField::updateCoeffs()
 {
+    if (updated())
+    {
+        return;
+    }
+
+    const label patchI = patch().index();
+
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-    const scalar yPlusLam = rasModel.yPlusLam(kappa_, E_);
-    const scalarField& y = rasModel.y()[patch().index()];
+    const scalarField& y = rasModel.y()[patchI];
 
     const scalar Cmu25 = pow(Cmu_, 0.25);
 
-    volScalarField& G = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>(GName_));
+    volScalarField& G =
+        const_cast<volScalarField&>(db().lookupObject<volScalarField>(GName_));
 
-    volScalarField& omega = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>(dimensionedInternalField().name()));
+    DimensionedField<scalar, volMesh>& omega =
+        const_cast<DimensionedField<scalar, volMesh>&>
+        (
+            dimensionedInternalField()
+        );
 
-    const scalarField& k = db().lookupObject<volScalarField>(kName_);
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
 
-    const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>(nuName_);
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
 
-    const scalarField& nutw =
-        patch().lookupPatchField<volScalarField, scalar>(nutName_);
+    const tmp<volScalarField> tnut = rasModel.nut();
+    const volScalarField& nut = tnut();
+    const scalarField& nutw = nut.boundaryField()[patchI];
 
-    const fvPatchVectorField& Uw =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
 
     const scalarField magGradUw = mag(Uw.snGrad());
 
@@ -198,7 +219,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
 
         omega[faceCellI] = sqrt(k[faceCellI])/(Cmu25*kappa_*y[faceI]);
 
-        if (yPlus > yPlusLam)
+        if (yPlus > yPlusLam_)
         {
             G[faceCellI] =
                 (nutw[faceI] + nuw[faceI])
@@ -212,6 +233,8 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
         }
     }
 
+    fixedInternalValueFvPatchField<scalar>::updateCoeffs();
+
     // TODO: perform averaging for cells sharing more than one boundary face
 }
 
@@ -219,14 +242,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
 void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fixedInternalValueFvPatchField<scalar>::write(os);
-    writeEntryIfDifferent<word>(os, "U", "U", UName_);
-    writeEntryIfDifferent<word>(os, "k", "k", kName_);
-    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
-    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
-    writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
-    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
-    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
-    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    writeLocalEntries(os);
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
index ce9060de8a..1b3915b575 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
@@ -55,23 +55,13 @@ class omegaWallFunctionFvPatchScalarField
 :
     public fixedInternalValueFvPatchField<scalar>
 {
-    // Private data
+protected:
 
-        //- Name of velocity field
-        word UName_;
-
-        //- Name of turbulence kinetic energy field
-        word kName_;
+    // Protected data
 
         //- Name of turbulence generation field
         word GName_;
 
-        //- Name of laminar viscosity field
-        word nuName_;
-
-        //- Name of turbulent viscosity field
-        word nutName_;
-
         //- Cmu coefficient
         scalar Cmu_;
 
@@ -81,11 +71,20 @@ class omegaWallFunctionFvPatchScalarField
         //- E coefficient
         scalar E_;
 
+        //- Y+ at the edge of the laminar sublayer
+        scalar yPlusLam_;
 
-    // Private member functions
+
+    // Protected member functions
 
         //- Check the type of the patch
-        void checkType();
+        virtual void checkType();
+
+        //- Calculate the Y+ at the edge of the laminar sublayer
+        virtual scalar calcYPlusLam(const scalar kappa, const scalar E) const;
+
+        //- Write local wall function variables
+        virtual void writeLocalEntries(Ostream&) const;
 
 
 public:
@@ -168,7 +167,7 @@ public:
         // I-O
 
             //- Write
-            void write(Ostream&) const;
+            virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
index cdbb61fa70..2cc9c9462a 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
@@ -102,7 +102,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
         )   << "Unknown turbulenceModel type " << modelName
             << endl << endl
             << "Valid turbulenceModel types are :" << endl
-            << turbulenceModelConstructorTablePtr_->toc()
+            << turbulenceModelConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
index dde33b47e9..145d82f010 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
@@ -32,13 +32,13 @@ boundaryField
 
     upperWall
     {
-        type            compressible::alphaSgsJayatillekeWallFunction;
+        type            alphaSgsJayatillekeWallFunction;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            compressible::alphaSgsJayatillekeWallFunction;
+        type            alphaSgsJayatillekeWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
index 2f642fa18a..05bf1b5329 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
@@ -32,13 +32,13 @@ boundaryField
 
     upperWall
     {
-        type            compressible::muSgsWallFunction;
+        type            muSgsUSpaldingWallFunction;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            compressible::muSgsWallFunction;
+        type            muSgsUSpaldingWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
index eb4a4e461d..313dcceba1 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
index 6213437696..d07fcd05f0 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
@@ -17,22 +17,6 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
     p
     {
         solver          PCG;
@@ -41,79 +25,13 @@ solvers
         relTol          0;
     }
 
-    ft
+    rho
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $p;
         tolerance       1e-05;
-        relTol          0;
     }
 
-    fu
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    b
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    Xi
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    Su
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    hu
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
+    "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
index bc78e8f836..b536298afb 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
@@ -32,13 +32,13 @@ boundaryField
 
     upperWall
     {
-        type            compressible::alphaSgsJayatillekeWallFunction;
+        type            alphaSgsJayatillekeWallFunction;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            compressible::alphaSgsJayatillekeWallFunction;
+        type            alphaSgsJayatillekeWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
index 8f65a48265..7a45526d54 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
@@ -32,13 +32,13 @@ boundaryField
 
     upperWall
     {
-        type            compressible::muSgsWallFunction;
+        type            muSgsUSpaldingWallFunction;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            compressible::muSgsWallFunction;
+        type            muSgsUSpaldingWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
index 7a35f54079..19a09dd2c7 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
index 6213437696..faeb96b22f 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
@@ -17,22 +17,6 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
     p
     {
         solver          PCG;
@@ -41,79 +25,14 @@ solvers
         relTol          0;
     }
 
-    ft
+    rho
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $p;
         tolerance       1e-05;
         relTol          0;
     }
 
-    fu
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    b
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    Xi
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    Su
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    hu
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
+    "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution
index d7814dd904..1ccfb0e86e 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution
@@ -17,22 +17,6 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
     p
     {
         solver          PCG;
@@ -41,79 +25,14 @@ solvers
         relTol          0;
     }
 
-    ft
+    rho
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $p;
         tolerance       1e-05;
         relTol          0;
     }
 
-    fu
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    b
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    Xi
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    Su
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    hu
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
+    "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat
index 46c50d5bee..5eceb3da78 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/mut b/tutorials/combustion/dieselFoam/aachenBomb/0/mut
index a26a484df3..747fa2e1f1 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/mut
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/mut
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
index 0d7e29c2b5..a1ebddd2ca 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "system";
     object      fvSolution;
@@ -17,22 +17,6 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
     p
     {
         solver          PCG;
@@ -41,31 +25,13 @@ solvers
         relTol          0;
     }
 
-    Yi
+    rho
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $p;
         tolerance       1e-06;
-        relTol          0;
     }
 
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    epsilon
+    "(U|Yi|h|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/alphat b/tutorials/combustion/engineFoam/kivaTest/-180/alphat
index 3c40b89e22..7d6c338d7c 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/alphat
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/alphat
@@ -23,19 +23,19 @@ boundaryField
 {
     piston
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     liner
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     cylinderHead
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/mut b/tutorials/combustion/engineFoam/kivaTest/-180/mut
index 4aa8e4942b..741abaf73f 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/mut
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/mut
@@ -23,7 +23,7 @@ boundaryField
 {
     piston
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -31,7 +31,7 @@ boundaryField
     }
     liner
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -39,7 +39,7 @@ boundaryField
     }
     cylinderHead
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
index 1891fe83bf..9c14f182e1 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
+++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
@@ -17,22 +17,6 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
     p
     {
         solver          PCG;
@@ -41,79 +25,14 @@ solvers
         relTol          0;
     }
 
-    ft
+    rho
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $p;
         tolerance       1e-05;
         relTol          0;
     }
 
-    fu
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    b
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    Xi
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    Su
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    hu
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
+    "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
index 09395b92a3..8beaac4383 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
@@ -17,17 +17,7 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          diagonal;
-    }
-
-    rhoU
-    {
-        solver          diagonal;
-    }
-
-    rhoE
+    "(rho|rhoU|rhoE)"
     {
         solver          diagonal;
     }
@@ -43,10 +33,9 @@ solvers
 
     e
     {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        nSweeps         2;
-        tolerance       1e-10 relTol 0;
+        $U;
+        tolerance       1e-10;
+        relTol          0;
     }
 }
 
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution
index 1b0e6d8a3e..8e6dae039c 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution
@@ -17,17 +17,7 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          diagonal;
-    }
-
-    rhoU
-    {
-        solver          diagonal;
-    }
-
-    rhoE
+    "(rho|rhoU|rhoE)"
     {
         solver          diagonal;
     }
@@ -43,10 +33,8 @@ solvers
 
     e
     {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        nSweeps         2;
-        tolerance       1e-09 relTol 0.1;
+        $U;
+        relTol          0.1;
     }
 }
 
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution
index 48811594f1..7a6b9b148a 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution
@@ -17,17 +17,7 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          diagonal;
-    }
-
-    rhoU
-    {
-        solver          diagonal;
-    }
-
-    rhoE
+    "(rho|rhoU|rhoE)"
     {
         solver          diagonal;
     }
@@ -43,10 +33,9 @@ solvers
 
     h
     {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        nSweeps         2;
-        tolerance       1e-10 relTol 0;
+        $U;
+        tolerance       1e-10;
+        relTol          0;
     }
 }
 
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution
index 48811594f1..7a6b9b148a 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution
@@ -17,17 +17,7 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          diagonal;
-    }
-
-    rhoU
-    {
-        solver          diagonal;
-    }
-
-    rhoE
+    "(rho|rhoU|rhoE)"
     {
         solver          diagonal;
     }
@@ -43,10 +33,9 @@ solvers
 
     h
     {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        nSweeps         2;
-        tolerance       1e-10 relTol 0;
+        $U;
+        tolerance       1e-10;
+        relTol          0;
     }
 }
 
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution
index 48811594f1..7a6b9b148a 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution
@@ -17,17 +17,7 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          diagonal;
-    }
-
-    rhoU
-    {
-        solver          diagonal;
-    }
-
-    rhoE
+    "(rho|rhoU|rhoE)"
     {
         solver          diagonal;
     }
@@ -43,10 +33,9 @@ solvers
 
     h
     {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        nSweeps         2;
-        tolerance       1e-10 relTol 0;
+        $U;
+        tolerance       1e-10;
+        relTol          0;
     }
 }
 
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution
index 48811594f1..7a6b9b148a 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution
@@ -17,17 +17,7 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          diagonal;
-    }
-
-    rhoU
-    {
-        solver          diagonal;
-    }
-
-    rhoE
+    "(rho|rhoU|rhoE)"
     {
         solver          diagonal;
     }
@@ -43,10 +33,9 @@ solvers
 
     h
     {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        nSweeps         2;
-        tolerance       1e-10 relTol 0;
+        $U;
+        tolerance       1e-10;
+        relTol          0;
     }
 }
 
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat
index caf0ef5da9..28bd4effe6 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat
@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     back
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     wall
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     porosityWall
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut
index 3caf2a763d..46709ca669 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut
@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     back
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     wall
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     porosityWall
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution
index 583c3637aa..bb9efe6559 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution
@@ -17,10 +17,24 @@ FoamFile
 
 solvers
 {
-    rho
+    p
     {
         solver          PCG;
         preconditioner  DIC;
+        tolerance       1e-06;
+        relTol          0.01;
+    }
+
+    pFinal
+    {
+        $p;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    rho
+    {
+        $p;
         tolerance       1e-05;
         relTol          0;
     }
@@ -33,77 +47,15 @@ solvers
         relTol          0.1;
     }
 
-    UFinal
+    h { $U; }
+
+    "(UFinal|hFinal|R|k|epsilon|omega)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $U;
         tolerance       1e-05;
         relTol          0;
     }
 
-    p
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-06;
-        relTol          0.01;
-    }
-
-    pFinal
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    hFinal
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    omega
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
 }
 
 PIMPLE
@@ -117,12 +69,11 @@ PIMPLE
 
 relaxationFactors
 {
-    U               0.7;
     p               0.3;
     rho             0.05;
+    U               0.7;
     h               0.7;
-    k               0.7;
-    omega           0.7;
+    "(k|epsilon|omega)"  0.7;
 }
 
 
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution
index a945332784..b016735ea1 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    rho
+    "(p|rho)"
     {
         solver          PCG;
         preconditioner  DIC;
@@ -33,42 +33,9 @@ solvers
         relTol          0;
     }
 
-    p
+    "(U|k|B|nuTilda)"
     {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    B
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    nuTilda
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $h;
         tolerance       1e-05;
         relTol          0;
     }
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat
index e168ce375e..9c62cf78f3 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat
@@ -23,13 +23,13 @@ boundaryField
 {
     movingWall
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut
index eac0c1e9aa..40518123e7 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut
@@ -23,7 +23,7 @@ boundaryField
 {
     movingWall
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -31,7 +31,7 @@ boundaryField
     }
     fixedWalls
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution
index 72b829ca39..863d53ae7f 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution
@@ -17,22 +17,6 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
     p
     {
         solver          PCG;
@@ -41,39 +25,14 @@ solvers
         relTol          0;
     }
 
-    h
+    rho
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $p;
         tolerance       1e-05;
         relTol          0;
     }
 
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    omega
+    "(U|h|R|k|epsilon|omega)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
index 844c55c57c..bca8aa6720 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
@@ -46,20 +46,9 @@ solvers
         relTol          0.1;
     }
 
-    k
+    "(k|epsilon)"
     {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        nSweeps         2;
-        tolerance       1e-07;
-        relTol          0.1;
-    }
-
-    epsilon
-    {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        nSweeps         2;
+        $U;
         tolerance       1e-07;
         relTol          0.1;
     }
@@ -76,8 +65,7 @@ relaxationFactors
     p               0.3;
     rho             0.05;
     U               0.7;
-    k               0.7;
-    epsilon         0.7;
+    "(k|epsilon)"   0.7;
     h               0.5;
 }
 
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
index caf0ef5da9..28bd4effe6 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat
@@ -23,22 +23,22 @@ boundaryField
 {
     front
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     back
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     wall
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     porosityWall
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut
index a557d62335..ed42bb0c0e 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut
@@ -23,25 +23,25 @@ boundaryField
 {
     front
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
 
     back
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
 
     wall
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
 
     porosityWall
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
index 334b1287bd..5785a9798e 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "system";
     object      fvSolution;
@@ -37,16 +37,7 @@ solvers
         relTol          0.1;
     }
 
-    k
-    {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        nSweeps         2;
-        tolerance       1e-07;
-        relTol          0.1;
-    }
-
-    epsilon
+    "(k|epsilon)"
     {
         solver          smoothSolver;
         smoother        GaussSeidel;
@@ -68,8 +59,7 @@ relaxationFactors
     p               0.3;
     rho             1;
     U               0.7;
-    k               0.9;
-    epsilon         0.9;
+    "(k|epsilon)"   0.9;
     h               0.9;
 }
 
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution
index 9a29517e84..5a5c63eb6c 100644
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution
@@ -17,31 +17,7 @@ FoamFile
 
 solvers
 {
-    p
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    rho
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    rhoU
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    rhoE
+    "(p|rho|rhoU|rhoE)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution
index 9a29517e84..5a5c63eb6c 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution
@@ -17,31 +17,7 @@ FoamFile
 
 solvers
 {
-    p
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    rho
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    rhoU
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    rhoE
+    "(p|rho|rhoU|rhoE)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution
index 202961f804..1f5b9bbf66 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution
@@ -25,31 +25,7 @@ solvers
         relTol          0;
     }
 
-    rho
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    rhoU
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    rhoE
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    rhoH
+    "(rho|rhoU|rhoE|rhoH)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution
index 296ffb3319..11d75c60c3 100644
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution
@@ -25,31 +25,7 @@ solvers
         relTol          0;
     }
 
-    rho
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    rhoU
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    rhoE
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    rhoH
+    "(rho|rhoU|rhoE|rhoH)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
index 93b01a8285..bf44ab8ab2 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
@@ -25,10 +25,9 @@ solvers
         relTol          0;
     }
 
-    U
+    "(U|e)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $p;
         tolerance       1e-05;
         relTol          0;
     }
@@ -40,14 +39,6 @@ solvers
         tolerance       1e-05;
         relTol          0;
     }
-
-    e
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
 }
 
 PISO
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
index 58c5fb5202..948330cc5b 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
@@ -17,15 +17,7 @@ FoamFile
 
 solvers
 {
-    p
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
-
-    U
+    "(p|U|e)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -40,14 +32,6 @@ solvers
         tolerance       1e-15;
         relTol          0;
     }
-
-    e
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-15;
-        relTol          0;
-    }
 }
 
 PISO
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat
new file mode 100644
index 0000000000..6b66930cda
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/alphat
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    INLE1
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    OUTL2
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    SYMP3
+    {
+        type            empty;
+    }
+    WALL10
+    {
+        type            alphatWallFunction;
+        Prt             0.85;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
index 8f09366b8f..9a65ce7eec 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,29 +21,31 @@ internalField   uniform 25000;
 
 boundaryField
 {
-    INLE1           
+    INLE1
     {
         type            inletOutlet;
         inletValue      uniform 25000;
         value           uniform 25000;
     }
-
-    OUTL2           
+    OUTL2
     {
         type            inletOutlet;
         inletValue      uniform 25000;
         value           uniform 25000;
     }
-
-    SYMP3           
+    SYMP3
     {
         type            empty;
     }
-
-    WALL10          
+    WALL10
     {
-        type            zeroGradient;
+        type            compressible::epsilonWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 25000;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
index 93c09e9044..552f881f4e 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,29 +21,28 @@ internalField   uniform 1000;
 
 boundaryField
 {
-    INLE1           
+    INLE1
     {
         type            inletOutlet;
         inletValue      uniform 1000;
         value           uniform 1000;
     }
-
-    OUTL2           
+    OUTL2
     {
         type            inletOutlet;
         inletValue      uniform 1000;
         value           uniform 1000;
     }
-
-    SYMP3           
+    SYMP3
     {
         type            empty;
     }
-
-    WALL10          
+    WALL10
     {
-        type            zeroGradient;
+        type            compressible::kqRWallFunction;
+        value           uniform 1000;
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/mut b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/mut
new file mode 100644
index 0000000000..d10d508706
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/mut
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      mut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    INLE1
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    OUTL2
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    SYMP3
+    {
+        type            empty;
+    }
+    WALL10
+    {
+        type            mutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
index b15d0272a6..59a99aa3f0 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
index b7e967eeb2..d85a6d5e98 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
@@ -33,42 +33,9 @@ solvers
         relTol          0;
     }
 
-    U
+    "(U|e|k|epsilon|R)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    e 
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $p;
         tolerance       1e-08;
         relTol          0;
     }
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/alphat b/tutorials/compressible/sonicFoam/ras/prism/0/alphat
index c361d50f31..cdb024c97e 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/alphat
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/alphat
@@ -43,7 +43,7 @@ boundaryField
     }
     prismWall
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     defaultFaces
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/mut b/tutorials/compressible/sonicFoam/ras/prism/0/mut
index 2278015c7b..604af39b10 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/mut
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/mut
@@ -43,7 +43,7 @@ boundaryField
     }
     prismWall
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     defaultFaces
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
index 20afd845a0..5f22468321 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
@@ -33,45 +33,20 @@ solvers
         relTol          0;
     }
 
-    U
+    "(U|e|R)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $p;
         tolerance       1e-05;
         relTol          0;
     }
 
-    e 
+    "(k|epsilon)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $p;
         tolerance       1e-08;
         relTol          0;
     }
 
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
 }
 
 PISO
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
index 0b8bc2b1c3..f5364dd73a 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
@@ -27,8 +27,7 @@ solvers
 
     U
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $p;
         tolerance       1e-05;
         relTol          0;
     }
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
index 177af26b52..737956951d 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
@@ -25,26 +25,17 @@ solvers
         relTol          0;
     }
 
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    B
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
     pB
     {
-        solver          PCG;
-        preconditioner  DIC;
+        $p;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    "(U|B)"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
         tolerance       1e-05;
         relTol          0;
     }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/nut
index 3b427915fc..57b8cfbcdd 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/nut
@@ -23,17 +23,17 @@ boundaryField
 {
     floor
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     ceiling
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution
index 39cc9a45f4..2526e8b4b1 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/fvSolution
@@ -27,45 +27,12 @@ solvers
 
     pFinal
     {
-        solver          PCG;
-        preconditioner  DIC;
+        $p;
         tolerance       1e-07;
         relTol          0;
     }
 
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    T
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    R
+    "(U|T|k|epsilon|R)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut
index 3b427915fc..57b8cfbcdd 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut
@@ -23,17 +23,17 @@ boundaryField
 {
     floor
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     ceiling
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
index 8524660a6a..e27eae3fe5 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
@@ -25,39 +25,7 @@ solvers
         relTol          0.01;
     }
 
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    T
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    R
+    "(U|T|k|epsilon|R)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -79,9 +47,7 @@ relaxationFactors
     p               0.7;
     U               0.2;
     T               0.7;
-    k               0.7;
-    epsilon         0.7;
-    R               0.7;
+    "(k|epsilon|R)" 0.7;
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
index 26e59c7cd3..87027f2cc2 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
@@ -23,25 +23,25 @@ boundaryField
 {
     ground
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     igloo_region0
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     twoFridgeFreezers_seal_0
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     twoFridgeFreezers_herring_1
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
index f24144294e..b04fdc8e05 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
@@ -25,39 +25,7 @@ solvers
         relTol          0.01;
     }
 
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    T
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    R
+    "(U|T|k|epsilon|R)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -79,9 +47,7 @@ relaxationFactors
     p               0.3;
     U               0.7;
     T               0.7;
-    k               0.7;
-    epsilon         0.7;
-    R               0.7;
+    "(k|epsilon|R)" 0.7;
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat
index 88f7153e5c..fcaa8d0c1d 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/alphat
@@ -23,17 +23,17 @@ boundaryField
 {
     floor
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     ceiling
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut
index 675eb6014b..32e5dfbb20 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut
@@ -23,17 +23,17 @@ boundaryField
 {
     floor
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     ceiling
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution
index 2d5e8be034..c1e26f6e57 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/fvSolution
@@ -35,45 +35,12 @@ solvers
 
     pFinal
     {
-        solver          PCG;
-        preconditioner  DIC;
+        $p;
         tolerance       1e-06;
         relTol          0;
     }
 
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    R
+    "(U|h|k|epsilon|R)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T
new file mode 100644
index 0000000000..c15520f994
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/T
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 293;
+
+boundaryField
+{
+    frontAndBack
+    {
+        type            zeroGradient;
+    }
+
+    topAndBottom
+    {
+        type            zeroGradient;
+    }
+
+    hot
+    {
+        type            fixedValue;
+        value           uniform 307.75; // 34.6 degC
+    }
+
+    cold
+    {
+        type            fixedValue;
+        value           uniform 288.15; // 15 degC
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
new file mode 100644
index 0000000000..3e850b913b
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/U
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    frontAndBack
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    topAndBottom
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    hot
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    cold
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat
new file mode 100644
index 0000000000..4b700cf1b7
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/alphat
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    frontAndBack
+    {
+        type            alphatWallFunction;
+        Prt             0.85;
+        value           uniform 0;
+    }
+    topAndBottom
+    {
+        type            alphatWallFunction;
+        Prt             0.85;
+        value           uniform 0;
+    }
+    hot
+    {
+        type            alphatWallFunction;
+        Prt             0.85;
+        value           uniform 0;
+    }
+    cold
+    {
+        type            alphatWallFunction;
+        Prt             0.85;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon
new file mode 100644
index 0000000000..f4a2099bc8
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/epsilon
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   uniform 4e-06;
+
+boundaryField
+{
+    frontAndBack
+    {
+        type            compressible::epsilonWallFunction;
+        value           uniform 4e-06;
+    }
+    topAndBottom
+    {
+        type            compressible::epsilonWallFunction;
+        value           uniform 4e-06;
+    }
+    hot
+    {
+        type            compressible::epsilonWallFunction;
+        value           uniform 4e-06;
+    }
+    cold
+    {
+        type            compressible::epsilonWallFunction;
+        value           uniform 4e-06;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k
new file mode 100644
index 0000000000..eb1640eabd
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/k
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 3.75e-04;
+
+boundaryField
+{
+    frontAndBack
+    {
+        type            compressible::kqRWallFunction;
+        value           uniform 3.75e-04;
+    }
+    topAndBottom
+    {
+        type            compressible::kqRWallFunction;
+        value           uniform 3.75e-04;
+    }
+    hot
+    {
+        type            compressible::kqRWallFunction;
+        value           uniform 3.75e-04;
+    }
+    cold
+    {
+        type            compressible::kqRWallFunction;
+        value           uniform 3.75e-04;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/mut b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/mut
new file mode 100644
index 0000000000..1ce1d05f30
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/mut
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      mut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    frontAndBack
+    {
+        type            mutUWallFunction;
+        value           uniform 0;
+    }
+    topAndBottom
+    {
+        type            mutUWallFunction;
+        value           uniform 0;
+    }
+    hot
+    {
+        type            mutUWallFunction;
+        value           uniform 0;
+    }
+    cold
+    {
+        type            mutUWallFunction;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega
new file mode 100644
index 0000000000..f1b0c5bfbf
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/omega
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      omega;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 -1 0 0 0 0];
+
+internalField   uniform 0.12;
+
+boundaryField
+{
+    frontAndBack
+    {
+        type            compressible::omegaWallFunction;
+        value           uniform 0.12;
+    }
+    topAndBottom
+    {
+        type            compressible::omegaWallFunction;
+        value           uniform 0.12;
+    }
+    hot
+    {
+        type            compressible::omegaWallFunction;
+        value           uniform 0.12;
+    }
+    cold
+    {
+        type            compressible::omegaWallFunction;
+        value           uniform 0.12;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p
new file mode 100644
index 0000000000..19224ed2b0
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 1e5;
+
+boundaryField
+{
+    frontAndBack 
+    {
+        type            buoyantPressure;
+        value           uniform 1e5;
+    }
+
+    topAndBottom
+    {
+        type            buoyantPressure;
+        value           uniform 1e5;
+    }
+
+    hot
+    {
+        type            buoyantPressure;
+        value           uniform 1e5;
+    }
+
+    cold
+    {
+        type            buoyantPressure;
+        value           uniform 1e5;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
new file mode 100755
index 0000000000..c5ab4caba9
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+rm -rf sets
+(cd validation && rm -f *.eps)
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
new file mode 100755
index 0000000000..5a8beb93c5
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Set application name
+application="buoyantSimpleFoam"
+
+runApplication blockMesh
+runApplication $application
+runApplication sample -latestTime
+(cd validation && ./createGraphs)
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/README b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/README
new file mode 100644
index 0000000000..c8952e9c42
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/README
@@ -0,0 +1,12 @@
+* Buoyancy driven, natural convection
+
+
+* Reference: Betts, P.L. and Bokhari, I.H.; "Experiments in turbulent natural convection in an enclosed tall cavity"; International Journal of Heat and Fluid Flow; volume 21; 2000; pp 675-683.
+
+
+* Test case considers the lower of the two plate temperature differences, 19.6 degC.
+
+
+* Experimental data publicly available from (13/08/2009):
+
+http://cfd.mace.manchester.ac.uk/cgi-bin/cfddb/prpage.cgi?79&EXP&database/cases/case79/Case_data&database/cases/case79&cas79_head.html&cas79_desc.html&cas79_meth.html&cas79_data.html&cas79_refs.html&cas79_rsol.html&1&0&0&0&0&unknown
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties
new file mode 100644
index 0000000000..8abafb5ce5
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/RASProperties
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel            kOmegaSST;
+
+turbulence          on;
+
+printCoeffs         on;
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g
new file mode 100644
index 0000000000..27d4d32488
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..3182880286
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/blockMeshDict
@@ -0,0 +1,68 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.001;
+
+vertices
+(
+    ( 0     0  -260)
+    (76     0  -260)
+    (76  2180  -260)
+    ( 0  2180  -260)
+    ( 0     0   260)
+    (76     0   260)
+    (76  2180   260)
+    ( 0  2180   260)
+);
+
+edges
+(
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (35 150 15) simpleGrading (1 1 1)
+);
+
+patches
+(
+    wall frontAndBack
+    (
+        (0 1 5 4)
+        (2 3 7 6)
+    )
+
+    wall topAndBottom
+    (
+        (4 5 6 7)
+        (3 2 1 0)
+    )
+
+    wall hot
+    (
+        (6 5 1 2)
+    )
+
+    wall cold
+    (
+        (4 7 3 0)
+    )
+);
+
+mergePatchPairs
+(
+);
+
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary
new file mode 100644
index 0000000000..3d13809c69
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/polyMesh/boundary
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+4
+(
+    frontAndBack
+    {
+        type            wall;
+        nFaces          1050;
+        startFace       228225;
+    }
+    topAndBottom
+    {
+        type            wall;
+        nFaces          10500;
+        startFace       229275;
+    }
+    hot
+    {
+        type            wall;
+        nFaces          2250;
+        startFace       239775;
+    }
+    cold
+    {
+        type            wall;
+        nFaces          2250;
+        startFace       242025;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
new file mode 100644
index 0000000000..6f5a818e17
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+
+mixture         air 1 28.96 1004.4 0 1.831e-05 0.705;
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
new file mode 100644
index 0000000000..aecc274b4b
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     buoyantSimpleFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         1000;
+
+deltaT          1;
+
+writeControl    timeStep;
+
+writeInterval   50;
+
+purgeWrite      3;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
new file mode 100644
index 0000000000..517ebe571f
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
@@ -0,0 +1,66 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default steadyState;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss limitedLinear 0.2;
+    div(phi,h)      Gauss limitedLinear 0.2;
+    div(phi,k)      Gauss limitedLinear 0.2;
+    div(phi,epsilon) Gauss limitedLinear 0.2;
+    div(phi,omega) Gauss limitedLinear 0.2;
+    div((muEff*dev2(grad(U).T()))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         none;
+    laplacian(muEff,U) Gauss linear uncorrected;
+    laplacian((rho*(1|A(U))),p) Gauss linear uncorrected;
+    laplacian(alphaEff,h) Gauss linear uncorrected;
+    laplacian(DkEff,k) Gauss linear uncorrected;
+    laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
+    laplacian(DomegaEff,omega) Gauss linear uncorrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         uncorrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
new file mode 100644
index 0000000000..451f5da1aa
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver           GAMG;
+        tolerance        1e-7;
+        relTol           0.1;
+
+        smoother         DICGaussSeidel;
+
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator     faceAreaPair;
+        mergeLevels      1;
+    }
+
+    "(U|h|k|epsilon|omega)"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-8;
+        relTol          0.1;
+    }
+}
+
+SIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+    pRefCell        0;
+    pRefValue       100000;
+    convergence     1e-04;
+}
+
+relaxationFactors
+{
+    p               0.3;
+    U               0.7;
+    h               0.7;
+    "(k|epsilon|omega)" 0.7;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
new file mode 100644
index 0000000000..b095bf0503
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    location        "system";
+    object          sampleDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+interpolationScheme cellPointFace;
+
+setFormat raw;
+
+sets
+(
+    y0.1
+    {
+        type            face;
+        axis            x;
+        start           (-1 0.218 0);
+        end             (1 0.218 0);
+    }
+    y0.2
+    {
+        type            face;
+        axis            x;
+        start           (-1 0.436 0);
+        end             (1 0.436 0);
+    }
+    y0.3
+    {
+        type            face;
+        axis            x;
+        start           (-1 0.654 0);
+        end             (1 0.654 0);
+    }
+    y0.4
+    {
+        type            face;
+        axis            x;
+        start           (-1 0.872 0);
+        end             (1 0.872 0);
+    }
+    y0.5
+    {
+        type            face;
+        axis            x;
+        start           (-1 1.09 0);
+        end             (1 1.09 0);
+    }
+    y0.6
+    {
+        type            face;
+        axis            x;
+        start           (-1 1.308 0);
+        end             (1 1.308 0);
+    }
+    y0.7
+    {
+        type            face;
+        axis            x;
+        start           (-1 1.526 0);
+        end             (1 1.526 0);
+    }
+    y0.8
+    {
+        type            face;
+        axis            x;
+        start           (-1 1.744 0);
+        end             (1 1.744 0);
+    }
+    y0.9
+    {
+        type            face;
+        axis            x;
+        start           (-1 1.962 0);
+        end             (1 1.962 0);
+    }
+);
+
+surfaces ();
+
+fields
+(
+    T
+    U
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
new file mode 100755
index 0000000000..74eadd7127
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
@@ -0,0 +1,115 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2009-2009 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 2 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, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     createGraphs
+#
+# Description
+#     Creates .eps graphs of OpenFOAM results vs experiment for the buoyant
+#     cavity case
+#
+#------------------------------------------------------------------------------
+
+createEpsT() {
+    index=$1
+    OF=$2
+    EXPT=$3
+
+    gnuplot<<EOF
+    set terminal postscript eps color enhanced
+    set output "OF_vs_EXPT_T$i.eps"
+    set xlabel "Channel width, x / [m]"
+    set ylabel "Temperature / [K]"
+    set grid
+    set key left top
+    set size 0.6, 0.6
+    set xrange [0:0.08]
+    set yrange [285:310]
+    plot \
+        "$EXPT" u (\$1/1000):(\$2+273.15) title "Expt 0.$index" with points lt 1 pt 6, \
+        "$OF" title "OpenFOAM 0.$index" with lines linetype -1
+EOF
+}
+
+
+createEpsU() {
+    index=$1
+    OF=$2
+    EXPT=$3
+
+    gnuplot<<EOF
+    set terminal postscript eps color enhanced
+    set output "OF_vs_EXPT_U$i.eps"
+    set xlabel "Channel width, x / [m]"
+    set ylabel "Vertical velocity component, Uy / [m/s]"
+    set grid
+    set key left top
+    set size 0.6, 0.6
+    set xrange [0:0.08]
+    set yrange [-0.2:0.2]
+    plot \
+        "$EXPT" u (\$1/1000):(\$2) title "Expt 0.$index" with points lt 1 pt 6, \
+        "$OF" u 1:3 title "OpenFOAM 0.$index" with lines linetype -1
+EOF
+}
+
+
+# test if gnuplot exists on the system
+type -P gnuplot &>/dev/null || {
+    echo "gnuplot not found - skipping graph creation" >&2; exit 1;
+}
+
+# paths to data
+LATESTTIME=`ls ../sets`
+OFDATAROOT=../sets/$LATESTTIME
+
+EXPTDATAROOT=./exptData
+
+# generate temperature profiles
+TSets="1 3 4 5 6 7 9"
+for i in $TSets; do
+    echo "    processing temperature profile at y/yMax of 0.$i"
+
+    OF="$OFDATAROOT/y0.${i}_T.xy"
+    EXPT="$EXPTDATAROOT/mt_z0_${i}0_lo.dat"
+
+    createEpsT $i $OF $EXPT
+done
+
+
+# generate velocity profiles
+USets="1 3 4 5 6 7 9"
+for i in $USets; do
+    echo "    processing velocity profile at y/yMax of 0.$i"
+
+    OF="$OFDATAROOT/y0.${i}_U.xy"
+    EXPT="$EXPTDATAROOT/mv_z0_${i}0_lo.dat"
+
+    createEpsU $i $OF $EXPT
+done
+
+echo "done"
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_10_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_10_lo.dat
new file mode 100644
index 0000000000..f89c5756bb
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_10_lo.dat
@@ -0,0 +1,55 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Mean temperature profile through z=0, y/H=0.10
+#  x (mm)   T (deg C)
+   0.33      15.13
+   0.58      15.38
+   0.84      15.65
+   1.09      15.82
+   1.6       16.29
+   2.11      16.72
+   2.61      17.15
+   3.25      17.44
+   3.88      17.79
+   5.15      18.37
+   6.42      18.72
+   7.69      19.04
+   8.96      19.14
+   10.23     19.57
+   11.5      19.62
+   12.77     19.8
+   15.31     20.02
+   17.85     20.23
+   20.39     20.46
+   22.93     20.48
+   25.47     20.48
+   28.01     20.67
+   30.55     20.69
+   33.09     20.71
+   35.63     20.87
+   38.17     20.79
+#   40.57     24.66  spurious value
+   43.11     20.73
+#   45.65     25.36  spurious value
+   48.19     20.87
+#   50.73     25.62  spurious value
+   53.27     20.93
+#   55.81     26.09  spurious value
+   58.35     21.25
+   60.89     21.29
+   63.43     21.72
+   64.7      21.77
+   65.97     22.52
+   67.24     23.09
+   68.51     23.87
+   69.78     24.99
+   71.05     26.42
+   72.32     28.32
+   72.95     29.14
+   73.59     30.1
+   74.09     31.15
+   74.6      32.06
+   75.11     33.15
+   75.36     33.52
+   75.62     33.99
+   75.87     34.6
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_30_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_30_lo.dat
new file mode 100644
index 0000000000..499d599aca
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_30_lo.dat
@@ -0,0 +1,51 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Mean temperature profile through z=0, y/H=0.30
+#  x (mm)     T (deg C)
+   0.33     15.4  
+   0.58     15.81 
+   0.84     16.52 
+   1.09     16.52 
+   1.6      17.24 
+   2.11     17.98 
+   2.61     18.5  
+   3.25     18.89 
+   3.88     19.55 
+   5.15     20.56 
+   6.42     20.84 
+   7.69     21.49 
+   8.96     21.69 
+   10.23    21.97 
+   11.5     22.07
+   12.77    22.52
+   15.31    22.64
+   17.85    23.17
+   20.39    23.31 
+   22.93    23.61 
+   25.47    23.51 
+   28.01    23.79 
+   30.55    24.38 
+   33.09    24.28 
+   35.63    24.81 
+   38.17    25.09 
+   43.11    25.01 
+   48.19    25.44 
+   53.27    25.76 
+   58.35    26.33 
+   60.89    26.79 
+   63.43    27.2  
+   64.7     27.32 
+   65.97    27.4  
+   67.24    27.87 
+   68.51    28.04 
+   69.78    28.5  
+   71.05    29.03 
+   72.32    29.72 
+   72.95    30.41 
+   73.59    31.27 
+   74.09    31.6  
+   74.6     32.55 
+   75.11    33.3  
+   75.36    33.52 
+   75.62    34.14
+   75.87    34.43 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_40_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_40_lo.dat
new file mode 100644
index 0000000000..1ecdbccd8f
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_40_lo.dat
@@ -0,0 +1,55 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Mean temperature profile through z=0, y/H=0.40
+#  x (mm)    T (deg C)
+   0.33    15.55 
+   0.58    16.03 
+   0.84    16.45 
+   1.09    16.98 
+   1.6     17.53 
+   2.11    18.1  
+   2.61    18.71 
+   3.25    19.68 
+   3.88    19.88 
+   5.15    20.78 
+   6.42    21.44 
+   7.69    21.47 
+   8.96    22.13 
+   10.23   22.48 
+   11.5    22.64 
+   12.77   22.87 
+   15.31   23.09 
+   17.85   23.42 
+   20.39   23.9  
+   22.93   23.84 
+   25.47   24.18 
+   28.01   24.26 
+   30.55   24.67 
+   33.09   25.08 
+   35.63   25.29 
+   38.17   25.3  
+   40.57   25.12 
+   43.11   25.4  
+   45.65   25.69 
+   48.19   25.92 
+   50.73   25.95 
+   53.27   26.07 
+   55.81   26.77
+   58.35   26.75 
+   60.89   27.02 
+   63.43   27.61 
+   64.7    27.51 
+   65.97   27.8  
+   67.24   28.21 
+   68.51   28.32 
+   69.78   28.94 
+   71.05   29.36 
+   72.32   30.26 
+   72.95   30.74 
+   73.59   31.16 
+   74.09   31.82 
+   74.6    32.28 
+   75.11   33.09 
+   75.36   33.47 
+   75.62   33.92 
+   75.87   34.16 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_50_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_50_lo.dat
new file mode 100644
index 0000000000..c0784b2a16
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_50_lo.dat
@@ -0,0 +1,55 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Mean temperature profile through z=0, y/H=0.50
+#  x (mm)    T (deg C)
+   0.33      15.62 
+   0.58      15.94 
+   0.84      16.45 
+   1.09      16.78 
+   1.6       17.58 
+   2.11      18.48 
+   2.61      19.05 
+   3.25      19.43 
+   3.88      19.96 
+   5.15      20.46 
+   6.42      21.32 
+   7.69      21.74 
+   8.96      22.01 
+   10.23     22.21 
+   11.5      22.53 
+   12.77     22.74 
+   15.31     23.02 
+   17.85     23.35 
+   20.39     23.76
+   22.93     23.69 
+   25.47     24.17 
+   28.01     24.25 
+   30.55     25.08 
+   33.09     25.15 
+   35.63     25.33 
+   38.17     25.26 
+   40.57     25.23 
+   43.11     25.57 
+   45.65     25.92 
+   48.19     26.12 
+   50.73     25.87 
+   53.27     26.3  
+   55.81     26.55 
+   58.35     26.99 
+   60.89     27.05 
+   63.43     27.53 
+   64.7      27.65 
+   65.97     27.77 
+   67.24     27.71 
+   68.51     28.38 
+   69.78     28.61 
+   71.05     29.44 
+   72.32     30.06 
+   72.95     30.5  
+   73.59     31.12 
+   74.09     31.66 
+   74.6      32.37 
+   75.11     33.08 
+   75.36     33.37 
+   75.62     33.94 
+   75.87     34.21
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_60_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_60_lo.dat
new file mode 100644
index 0000000000..0d8d74f538
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_60_lo.dat
@@ -0,0 +1,49 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Mean temperature profile through z=0, y/H=0.60
+#  x (mm)    T (deg C)
+   0.33     15.59 
+   0.58     16.15 
+   0.84     16.44 
+   1.09     16.81 
+   1.6      17.52 
+   2.11     18.15 
+   2.61     18.89 
+   3.25     19.63 
+   3.88     20.03 
+   5.15     20.75 
+   6.42     21.11 
+   7.69     21.5  
+   8.96     21.94 
+   10.23    22.51 
+   11.5     22.56 
+   12.77    22.92 
+   15.31    23.27 
+   17.85    23.66 
+   20.39    23.96 
+   22.93    24.01 
+   28.01    24.57 
+   33.09    25.16 
+   38.17    24.98 
+   43.11    25.57 
+   48.19    25.95 
+   53.27    26.32 
+   55.81    26.71 
+   58.35    27.13 
+   60.89    27.12 
+   63.43    27.51 
+   64.7     27.84 
+   65.97    28.2  
+   67.24    28.2  
+   68.51    28.43 
+   69.78    28.76 
+   71.05    29.4  
+   72.32    29.86 
+   72.95    30.7  
+   73.59    31.43 
+   74.09    31.72 
+   74.6     32.47 
+   75.11    33.07 
+   75.36    33.45 
+   75.62    33.95 
+   75.87    34.23 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_70_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_70_lo.dat
new file mode 100644
index 0000000000..c50c726cbc
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_70_lo.dat
@@ -0,0 +1,55 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Mean temperature profile through z=0, y/H=0.70
+#  x (mm)    T (deg C)
+   0.33    15.84 
+   0.58    16.3  
+   0.84    16.61 
+   1.09    16.92 
+   1.6     17.9  
+   2.11    18.77 
+   2.61    19.1  
+   3.25    20.04 
+   3.88    20.44 
+   5.15    21.13 
+   6.42    21.78 
+   7.69    22.22 
+   8.96    22.46 
+   10.23   22.94 
+   11.5    23.11 
+   12.77   23.45 
+   15.31   23.51 
+   17.85   24.08 
+   20.39   24.32 
+   22.93   24.44 
+   25.47   24.98 
+   28.01   24.88 
+   30.55   24.81 
+   33.09   25.3  
+   35.63   25.5  
+   38.17   25.38 
+   40.57   25.65 
+   43.11   25.94 
+   45.65   26.25 
+   48.19   26.41 
+   50.73   26.65 
+   53.27   26.96 
+   55.81   27.16 
+   58.35   27.46 
+   60.89   27.6  
+   63.43   27.7  
+   64.7    27.84 
+   65.97   28.24 
+   67.24   28.58 
+   68.51   28.87 
+   69.78   29.1  
+   71.05   29.75 
+   72.32   30.4  
+   72.95   30.62 
+   73.59   31.37 
+   74.09   32.07 
+   74.6    32.38 
+   75.11   33.3  
+   75.36   33.6  
+   75.62   34.13 
+   75.87   34.37 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_90_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_90_lo.dat
new file mode 100644
index 0000000000..b59b04e5c2
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mt_z0_90_lo.dat
@@ -0,0 +1,55 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Mean temperature profile through z=0, y/H=0.90
+#  x (mm)    T (deg C)
+   0.33      15.61 
+   0.58      16.32 
+   0.84      16.8  
+   1.09      17.38 
+   1.6       18.36 
+   2.11      19.52 
+   2.61      20.39 
+   3.25      21.64 
+   3.88      22.49 
+   5.15      24.23 
+   6.42      25.68 
+   7.69      26.84 
+   8.96      27.48 
+   10.23     28.1  
+   11.5      28.55 
+   12.77     28.97 
+   15.31     29.26 
+   17.85     29.52 
+   20.39     29.53 
+   22.93     29.54 
+   25.47     29.55 
+   28.01     29.6  
+   30.55     29.67 
+   33.09     29.71 
+   35.63     29.74 
+   38.17     29.73 
+   40.57     29.93 
+   43.11     29.99 
+   45.65     30.07 
+   48.19     30.1  
+   50.73     30.12 
+   53.27     30.18 
+   55.81     30.29 
+   58.35     30.4  
+   60.89     30.57 
+   63.43     30.69 
+   64.7      30.85 
+   65.97     31.02 
+   67.24     31.19 
+   68.51     31.48 
+   69.78     31.68 
+   71.05     32.06 
+   72.32     32.52 
+   72.95     32.77 
+   73.59     33.2  
+   74.09     33.49 
+   74.6      33.78 
+   75.11     34.19 
+   75.36     34.38 
+   75.62     34.6  
+   75.87     34.77 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_10_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_10_lo.dat
new file mode 100644
index 0000000000..a86a625a15
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_10_lo.dat
@@ -0,0 +1,34 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Vertical mean velocity profile through z=0, y/H=0.10
+#      x (mm)     V (m/s)
+         1.5   -0.049
+         3.5   -0.086
+         5.5   -0.095
+         7.5   -0.101
+         9.5   -0.098
+        10.5   -0.096
+        12.5   -0.087
+        14.5   -0.081
+        16.5   -0.078
+        18.5    -0.07
+        20.5   -0.064
+        25.5   -0.052
+        30.5   -0.044
+        35.5   -0.028
+        38.2   -0.019
+        43.2   -0.011
+        48.2    0.003
+        53.2    0.023
+        58.2    0.038
+        60.2    0.055
+        62.2     0.07
+        64.2     0.09
+        66.2    0.121
+        68.2    0.151
+        69.2    0.168
+        70.2     0.18
+        71.2     0.19
+        72.2    0.192
+        73.2    0.193
+        74.2     0.16
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_30_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_30_lo.dat
new file mode 100644
index 0000000000..56cc9ec065
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_30_lo.dat
@@ -0,0 +1,33 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Vertical mean velocity profile through z=0, y/H=0.30
+#      x (mm)     V (m/s)
+           3   -0.114
+           5   -0.123
+           7   -0.131
+           8   -0.135
+           9   -0.129
+          10   -0.121
+          12    -0.11
+          14   -0.099
+          16    -0.09
+          18    -0.08
+          23   -0.059
+          28   -0.043
+          33    -0.02
+          38   -0.006
+          43    0.016
+          48    0.051
+        51.2    0.063
+        56.2    0.092
+        58.2    0.097
+        60.2    0.105
+        62.2    0.118
+        64.2    0.124
+        66.2    0.132
+        68.2    0.136
+        70.2    0.142
+        71.2    0.141
+        72.2     0.14
+        73.2    0.121
+        74.2    0.089
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_40_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_40_lo.dat
new file mode 100644
index 0000000000..3cd97eceb6
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_40_lo.dat
@@ -0,0 +1,32 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Vertical mean velocity profile through z=0, y/H=0.40
+#      x (mm)     V (m/s)
+         2.2   -0.101
+         3.2   -0.119
+         4.2   -0.123
+         6.2   -0.127
+         8.2   -0.123
+        10.2   -0.121
+        12.2   -0.113
+        14.2     -0.1
+        16.2   -0.088
+        18.2    -0.08
+        23.2   -0.065
+        28.2   -0.036
+        33.2   -0.008
+        38.2    0.006
+        43.2    0.018
+        48.2    0.047
+        53.2    0.063
+        58.2    0.077
+        60.2    0.097
+        62.2    0.104
+        64.2    0.117
+        66.2    0.124
+        68.2    0.133
+        69.2    0.137
+        70.2    0.146
+        71.2    0.137
+        72.2    0.131
+        73.2    0.125
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_50_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_50_lo.dat
new file mode 100644
index 0000000000..4780933d18
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_50_lo.dat
@@ -0,0 +1,32 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Vertical mean velocity profile through z=0, y/H=0.50
+#      x (mm)     V (m/s)
+         1.2   -0.081
+         2.2   -0.115
+         3.2   -0.124
+         4.2   -0.133
+         6.2   -0.135
+         8.2   -0.134
+        10.2    -0.12
+        12.2   -0.112
+        14.2    -0.11
+        16.2     -0.1
+        18.2   -0.089
+        23.2   -0.062
+        28.2   -0.048
+        33.2   -0.011
+        38.2    0.012
+        43.2    0.041
+        48.2    0.054
+        53.2    0.077
+        58.2    0.091
+        60.2    0.099
+        62.2    0.106
+        64.2     0.12
+        66.2    0.127
+        68.2    0.133
+        70.2    0.137
+        71.2     0.14
+        72.2    0.131
+        73.2    0.121
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_60_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_60_lo.dat
new file mode 100644
index 0000000000..e56a31ad2f
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_60_lo.dat
@@ -0,0 +1,30 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Vertical mean velocity profile through z=0, y/H=0.60
+#      x (mm)     V (m/s)
+           3    -0.12
+           4   -0.137
+           5   -0.144
+           7   -0.134
+           8   -0.122
+           9   -0.116
+          11   -0.107
+          13    -0.09
+          17   -0.072
+          22   -0.058
+          27   -0.041
+          32   -0.014
+          37   -0.003
+        43.2    0.029
+        48.2     0.05
+        53.2    0.066
+        58.2    0.083
+        60.2    0.093
+        62.2    0.105
+        64.2    0.116
+        66.2    0.124
+        69.2    0.132
+        71.2    0.139
+        72.2    0.121
+        73.2     0.11
+        74.2    0.099
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_70_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_70_lo.dat
new file mode 100644
index 0000000000..5949153892
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_70_lo.dat
@@ -0,0 +1,31 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Vertical mean velocity profile through z=0, y/H=0.70
+#      x (mm)     V (m/s)
+         1.2   -0.069
+         2.2   -0.106
+         4.2   -0.137
+         6.2    -0.15
+         8.2   -0.141
+        10.2   -0.135
+        12.2   -0.134
+        14.2   -0.109
+        16.2   -0.102
+        18.2   -0.101
+        23.2   -0.065
+        28.2   -0.044
+        33.2   -0.025
+        38.2    0.017
+        43.2    0.039
+        48.2    0.057
+        53.2     0.08
+        58.2    0.095
+        60.2    0.112
+        62.2    0.112
+        64.2    0.128
+        66.2    0.128
+        68.2    0.128
+        70.2    0.131
+        72.2    0.118
+        73.2    0.103
+        74.2    0.094
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_90_lo.dat b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_90_lo.dat
new file mode 100644
index 0000000000..96822cf415
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/exptData/mv_z0_90_lo.dat
@@ -0,0 +1,38 @@
+# Natural Convection in Tall Cavity: Ra=8.6E+5
+# Expts of Betts and Bokhari
+# Vertical mean velocity profile through z=0, y/H=0.90
+#      x (mm)     V (m/s)
+         1.7    -0.14
+         2.7   -0.172
+         3.7    -0.18
+         4.7   -0.179
+         5.7   -0.164
+         6.7    -0.15
+         7.7   -0.133
+         8.7   -0.122
+        10.7    -0.09
+        12.7   -0.067
+        14.7   -0.051
+        16.7   -0.036
+        18.7   -0.025
+        23.7   -0.006
+        28.7    0.012
+        33.7     0.02
+        38.7    0.032
+        43.7     0.04
+        48.7    0.058
+        53.7    0.067
+        58.7     0.08
+        60.7    0.088
+        62.7     0.09
+        64.7    0.096
+        65.7    0.097
+        66.7    0.101
+        67.7    0.102
+        68.7    0.103
+        69.7    0.102
+        70.7    0.096
+        71.7    0.089
+        72.7    0.085
+        73.7    0.069
+        74.7    0.052
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat
index 2557d81789..1625699677 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat
@@ -23,19 +23,19 @@ boundaryField
 {
     floor
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     ceiling
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/mut b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/mut
index 06a40eb020..ab109864e0 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/mut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/mut
@@ -23,7 +23,7 @@ boundaryField
 {
     floor
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -31,7 +31,7 @@ boundaryField
     }
     ceiling
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -39,7 +39,7 @@ boundaryField
     }
     fixedWalls
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution
index 8d67100cf8..db8f4e2294 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution
@@ -25,39 +25,7 @@ solvers
         relTol          0;
     }
 
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    R
+    "(U|h|k|epsilon|R)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -70,7 +38,7 @@ SIMPLE
 {
     nNonOrthogonalCorrectors 0;
     pRefCell        0;
-    pRefValue       1e5;
+    pRefValue       100000;
 }
 
 relaxationFactors
@@ -79,9 +47,7 @@ relaxationFactors
     p               0.7;
     U               0.2;
     h               0.7;
-    k               0.7;
-    epsilon         0.7;
-    R               0.7;
+    "(k|epsilon|R)" 0.7;
 }
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat
index 00d1a6abb3..a7132ce19d 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat
@@ -23,22 +23,22 @@ boundaryField
 {
     box
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     floor
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     ceiling
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut
index df9665bbef..0c91ea84e9 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut
@@ -23,22 +23,22 @@ boundaryField
 {
     box
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     floor
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     ceiling
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
index b450f1eb75..a6d32c8a9c 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
@@ -25,31 +25,7 @@ solvers
         relTol          0.01;
     }
 
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    epsilon
+    "(U|h|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -59,8 +35,7 @@ solvers
 
     G
     {
-        solver          PCG;
-        preconditioner  DIC;
+        $p;
         tolerance       1e-05;
         relTol          0.1;
     }
@@ -69,8 +44,8 @@ solvers
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    pRefCell       0;
-    pRefValue      0;
+    pRefCell        0;
+    pRefValue       0;
 }
 
 relaxationFactors
@@ -79,8 +54,7 @@ relaxationFactors
     p               0.3;
     U               0.7;
     h               0.7;
-    k               0.7;
-    epsilon         0.7;
+    "(k|epsilon)"   0.7;
     G               0.7;
 }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat
index 51389bfd04..970624b7b9 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat
@@ -23,25 +23,25 @@ boundaryField
 {
     box
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     floor
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     ceiling
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut
index 3baf1d358a..a7ba9f9007 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut
@@ -23,7 +23,7 @@ boundaryField
 {
     box
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -31,7 +31,7 @@ boundaryField
     }
     floor
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -39,7 +39,7 @@ boundaryField
     }
     ceiling
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -47,7 +47,7 @@ boundaryField
     }
     fixedWalls
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution
index 14ade54123..4afcc3aafa 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution
@@ -29,39 +29,7 @@ solvers
         mergeLevels     1;
     }
 
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    Ii
+    "(U|h|k|epsilon|Ii)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -73,18 +41,17 @@ solvers
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    pRefCell       0;
-    pRefValue      0;
+    pRefCell        0;
+    pRefValue       0;
 }
 
 relaxationFactors
 {
-    rho             1.0;
+    rho             1;
     p               0.3;
     U               0.7;
     h               0.7;
-    k               0.7;
-    epsilon         0.7;
+    "(k|epsilon)"   0.7;
     "ILambda.*"     0.7;
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
index 3248e05562..16947842af 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
@@ -22,7 +22,8 @@ solvers
         preconditioner  DIC;
         tolerance       1e-8;
         relTol          0;
-    };
+    }
+
     p
     {
         solver           GAMG;
@@ -31,68 +32,38 @@ solvers
 
         smoother         GaussSeidel;
 
-        cacheAgglomeration true;
+        cacheAgglomeration  true;
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
+
     pFinal
     {
-        solver           GAMG;
+        $p;
         tolerance        1e-8;
         relTol           0;
+    }
 
-        smoother         GaussSeidel;
-
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
-    };
     U
     {
         solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 
     h
     {
-        solver           PBiCG;
-        preconditioner   DILU;
+        $U;
         tolerance        1e-08;
         relTol           0.1;
-    };
-    hFinal
-    {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
+    }
 
-    k
+    "(hFinal|k|epsilon|R)"
     {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
-    epsilon
-    {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
-    R
-    {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
+        $U;
+    }
 }
 
 PISO
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
index be20334b74..19370a0e39 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1E-06;
         relTol           0;
-    };
+    }
 }
 
 PISO
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
index be20334b74..19370a0e39 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1E-06;
         relTol           0;
-    };
+    }
 }
 
 PISO
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
index be20334b74..19370a0e39 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1E-06;
         relTol           0;
-    };
+    }
 }
 
 PISO
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
index 3248e05562..27f5cfb1dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
@@ -22,7 +22,8 @@ solvers
         preconditioner  DIC;
         tolerance       1e-8;
         relTol          0;
-    };
+    }
+
     p
     {
         solver           GAMG;
@@ -35,64 +36,34 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
+
     pFinal
     {
-        solver           GAMG;
+        $p;
         tolerance        1e-8;
         relTol           0;
+    }
 
-        smoother         GaussSeidel;
-
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
-    };
     U
     {
         solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 
     h
     {
-        solver           PBiCG;
-        preconditioner   DILU;
+        $U;
         tolerance        1e-08;
         relTol           0.1;
-    };
-    hFinal
-    {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
+    }
 
-    k
+    "(hFinal|k|epsilon|R)"
     {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
-    epsilon
-    {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
-    R
-    {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
+        $U;
+    }
 }
 
 PISO
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
index 3248e05562..a2f76a21ca 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
@@ -22,7 +22,8 @@ solvers
         preconditioner  DIC;
         tolerance       1e-8;
         relTol          0;
-    };
+    }
+
     p
     {
         solver           GAMG;
@@ -35,64 +36,35 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
+
     pFinal
     {
-        solver           GAMG;
+        $p;
         tolerance        1e-8;
         relTol           0;
+    }
 
-        smoother         GaussSeidel;
-
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
-    };
     U
     {
         solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 
     h
     {
-        solver           PBiCG;
-        preconditioner   DILU;
+        $U;
         tolerance        1e-08;
         relTol           0.1;
-    };
-    hFinal
-    {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
+    }
 
-    k
+
+    "(hFinal|k|epsilon|R)"
     {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
-    epsilon
-    {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
-    R
-    {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
+        $U;
+    }
 }
 
 PISO
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
index be20334b74..19370a0e39 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1E-06;
         relTol           0;
-    };
+    }
 }
 
 PISO
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
index be20334b74..19370a0e39 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1E-06;
         relTol           0;
-    };
+    }
 }
 
 PISO
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
index be20334b74..19370a0e39 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
@@ -22,7 +22,7 @@ solvers
         preconditioner   DIC;
         tolerance        1E-06;
         relTol           0;
-    };
+    }
 }
 
 PISO
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
index 3248e05562..27f5cfb1dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
@@ -22,7 +22,8 @@ solvers
         preconditioner  DIC;
         tolerance       1e-8;
         relTol          0;
-    };
+    }
+
     p
     {
         solver           GAMG;
@@ -35,64 +36,34 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator     faceAreaPair;
         mergeLevels      1;
-    };
+    }
+
     pFinal
     {
-        solver           GAMG;
+        $p;
         tolerance        1e-8;
         relTol           0;
+    }
 
-        smoother         GaussSeidel;
-
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
-    };
     U
     {
         solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
-    };
+    }
 
     h
     {
-        solver           PBiCG;
-        preconditioner   DILU;
+        $U;
         tolerance        1e-08;
         relTol           0.1;
-    };
-    hFinal
-    {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
+    }
 
-    k
+    "(hFinal|k|epsilon|R)"
     {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
-    epsilon
-    {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
-    R
-    {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-08;
-        relTol           0;
-    };
+        $U;
+    }
 }
 
 PISO
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/nut b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/nut
index 765db2eefe..a8bd969de2 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/nut
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/nut
@@ -23,13 +23,13 @@ boundaryField
 {
     rotor
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
     stator
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
index 3a8408227f..5bcd4c4a1d 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
@@ -23,12 +23,12 @@ boundaryField
 {
     lowerWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     upperWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     frontBack
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
new file mode 100644
index 0000000000..b75d124cdc
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (1 0 0);
+
+boundaryField
+{
+    lowerWall       
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    upperWall       
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    frontBack
+    {
+        type            cyclic;
+    }
+
+    defaultFaces    
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon
new file mode 100644
index 0000000000..5b6d7f698f
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   uniform 1e-08;
+
+boundaryField
+{
+    lowerWall
+    {
+        type            epsilonWallFunction;
+        value           uniform 1e-08;
+    }
+    upperWall
+    {
+        type            epsilonWallFunction;
+        value           uniform 1e-08;
+    }
+    frontBack
+    {
+        type            cyclic;
+        value           uniform 1e-08;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k
new file mode 100644
index 0000000000..d278c05cef
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0.000000001;
+
+boundaryField
+{
+    lowerWall
+    {
+        type            kqRWallFunction;
+        internalField   uniform 0.1;
+    }
+    upperWall
+    {
+        type            kqRWallFunction;
+        internalField   uniform 0.1;
+    }
+    frontBack
+    {
+        type            cyclic;
+        internalField   uniform 0.1;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nu.xy b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nu.xy
new file mode 100644
index 0000000000..39d86bc30f
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nu.xy
@@ -0,0 +1,80 @@
+  0.000625      0.001
+  0.001875      0.001
+  0.003125      0.001
+  0.004375      0.001
+  0.005625      0.001
+  0.006875      0.001
+  0.008125      0.001
+  0.009375      0.001
+  0.010625      0.001
+  0.011875      0.001
+  0.013125      0.001
+  0.014375      0.001
+  0.015625      0.001
+  0.016875      0.001
+  0.018125      0.001
+  0.019375      0.001
+  0.020625      0.001
+  0.021875      0.001
+  0.023125      0.001
+  0.024375      0.001
+  0.025625      0.001
+  0.026875      0.001
+  0.028125      0.001
+  0.029375      0.001
+  0.030625      0.001
+  0.031875      0.001
+  0.033125      0.001
+  0.034375      0.001
+  0.035625      0.001
+  0.036875      0.001
+  0.038125      0.001
+  0.039375      0.001
+  0.040625      0.001
+  0.041875      0.001
+  0.043125      0.001
+  0.044375      0.001
+  0.045625      0.001
+  0.046875      0.001
+  0.048125      0.001
+  0.049375      0.001
+  0.050625      0.001
+  0.051875      0.001
+  0.053125      0.001
+  0.054375      0.001
+  0.055625      0.001
+  0.056875      0.001
+  0.058125      0.001
+  0.059375      0.001
+  0.060625      0.001
+  0.061875      0.001
+  0.063125      0.001
+  0.064375      0.001
+  0.065625      0.001
+  0.066875      0.001
+  0.068125      0.001
+  0.069375      0.001
+  0.070625      0.001
+  0.071875      0.001
+  0.073125      0.001
+  0.074375      0.001
+  0.075625      0.001
+  0.076875      0.001
+  0.078125      0.001
+  0.079375      0.001
+  0.080625      0.001
+  0.081875      0.001
+  0.083125      0.001
+  0.084375      0.001
+  0.085625      0.001
+  0.086875      0.001
+  0.088125      0.001
+  0.089375      0.001
+  0.090625      0.001
+  0.091875      0.001
+  0.093125      0.001
+  0.094375      0.001
+  0.095625      0.001
+  0.096875      0.001
+  0.098125      0.001
+  0.099375      0.001
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda
new file mode 100644
index 0000000000..38a021b100
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      nuTilda;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    lowerWall       
+    {
+        type            zeroGradient;
+    }
+
+    upperWall       
+    {
+        type            zeroGradient;
+    }
+
+    frontBack
+    {
+        type            cyclic;
+    }
+
+    defaultFaces    
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut
new file mode 100644
index 0000000000..5bcd4c4a1d
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    lowerWall
+    {
+        type            nutkWallFunction;
+        value           uniform 0;
+    }
+    upperWall
+    {
+        type            nutkWallFunction;
+        value           uniform 0;
+    }
+    frontBack
+    {
+        type            cyclic;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k
new file mode 100644
index 0000000000..5bcd4c4a1d
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    lowerWall
+    {
+        type            nutkWallFunction;
+        value           uniform 0;
+    }
+    upperWall
+    {
+        type            nutkWallFunction;
+        value           uniform 0;
+    }
+    frontBack
+    {
+        type            cyclic;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding
new file mode 100644
index 0000000000..21cc8ebc19
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    lowerWall
+    {
+        type            nutUSpaldingWallFunction;
+        value           uniform 0;
+    }
+    upperWall
+    {
+        type            nutUSpaldingWallFunction;
+        value           uniform 0;
+    }
+    frontBack
+    {
+        type            cyclic;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega
new file mode 100644
index 0000000000..75b8cd335b
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      omega;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 -1 0 0 0 0];
+
+internalField   uniform 1111.11;
+
+boundaryField
+{
+    lowerWall
+    {
+        type            omegaWallFunction;
+        value           uniform 1111.11;
+    }
+    upperWall
+    {
+        type            omegaWallFunction;
+        value           uniform 1111.11;
+    }
+    frontBack
+    {
+        type            cyclic;
+        value           uniform 1111.11;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean
new file mode 100755
index 0000000000..0d6bac1543
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allclean
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+
+rm -rf logs
+rm -f *.eps yPlus_vs_uPlus
+
+echo "done"
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
new file mode 100755
index 0000000000..6f45774974
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication blockMesh
+
+exponents="2 3 4 5 6 7 8"
+
+echo "# yPlus vs uPlus" > yPlus_vs_uPlus
+
+for e in $exponents; do
+    echo "    Setting nu to 1e-$e"
+
+    sed "s/XXX/$e/g" constant/transportProperties.template \
+        > constant/transportProperties
+
+    runApplication boundaryFoam
+
+    mv log.boundaryFoam log.boundaryFoam_$e
+
+    # extract y+, U+
+    # note: both must be added to foamLog.db
+    runApplication foamLog log.boundaryFoam_$e
+
+    mv log.foamLog log.foamLog_$e
+
+    if [ -e logs/yPlus_0 ]; then
+        yPlus=`awk < logs/yPlus_0 'END{print $2}'`
+        uPlus=`awk < logs/uPlus_0 'END{print $2}'`
+
+        echo "$yPlus $uPlus" >> yPlus_vs_uPlus
+    fi
+
+    rm -rf logs
+done
+
+
+# create validation plot
+# test if gnuplot exists on the system
+type -P gnuplot &>/dev/null || {
+    echo "gnuplot not found - skipping graph creation" >&2; exit 1;
+}
+graphName="OF_vs_ANAYTICAL.eps"
+
+echo "Creating graph of u+ vs y+ to $graphName"
+gnuplot<<EOF
+    set terminal postscript eps color enhanced
+    set output "$graphName"
+    set grid
+    set xlabel "y+"
+    set ylabel "u+"
+    set key top left
+    set size 0.75, 0.75
+    set parametric
+    # u+ range
+    set trange [0:35]
+    # Spaldings law
+    k=0.41
+    E=9.8
+    f(t) = t + 1/E*(exp(k*t) - 1 - k*t*(1 + 0.5*k*t) - 1/6*k*t**3)
+    set logscale x
+    set format x "10^{%T}"
+    plot f(t),t title "Spalding" with lines linetype -1, \
+        "yPlus_vs_uPlus" title "OpenFOAM" with points lt 1 pt 6
+EOF
+
+
+echo "done"
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/README b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/README
new file mode 100644
index 0000000000..1ceaf2ea37
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/README
@@ -0,0 +1,14 @@
+Test for momentum wall functions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Computes a series of steady boundary layer calculations, varying the Reynolds
+number. Wall u+ plotted as a function of log10(y+), and compared with wall
+profile given by Spalding's law.
+
+
+Usage:
+
+- run test using Allrun script
+- uses foamLog to generate u+ and y+ values
+- postscript (.eps) plot generated using gnuplot, OF_vs_ANAYTICAL.eps
+
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/RASProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/RASProperties
new file mode 100644
index 0000000000..e4100e04fb
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/RASProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel        kEpsilon; // SpalartAllmaras;
+
+turbulence      on;
+
+printCoeffs     on;
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..e74a803e10
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/blockMeshDict
@@ -0,0 +1,71 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.05;
+
+vertices
+(
+    (0 -1 0)
+    (0 0 0)
+    (0 1 0)
+    (0.1 -1 0)
+    (0.1 0 0)
+    (0.1 1 0)
+    (0 -1 0.1)
+    (0 0 0.1)
+    (0 1 0.1)
+    (0.1 -1 0.1)
+    (0.1 0 0.1)
+    (0.1 1 0.1)
+);
+
+blocks
+(
+    hex (0 3 4 1 6 9 10 7) (1 40 1) simpleGrading (1 1 1)
+    hex (1 4 5 2 7 10 11 8) (1 40 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+patches
+(
+    wall lowerWall
+    (
+        (0 3 9 6)
+    )
+
+    wall upperWall
+    (
+        (2 8 11 5)
+    )
+
+    cyclic frontBack
+    (
+        (0 6 7 1)
+        (1 7 8 2)
+
+        (9 3 4 10)
+        (10 4 5 11)
+    )
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/boundary
new file mode 100644
index 0000000000..34af32827c
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/polyMesh/boundary
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+4
+(
+    lowerWall
+    {
+        type            wall;
+        nFaces          1;
+        startFace       79;
+    }
+    upperWall
+    {
+        type            wall;
+        nFaces          1;
+        startFace       80;
+    }
+    frontBack
+    {
+        type            cyclic;
+        nFaces          160;
+        startFace       81;
+        featureCos      0.9;
+    }
+    defaultFaces
+    {
+        type            empty;
+        nFaces          160;
+        startFace       241;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
new file mode 100644
index 0000000000..acf7b7754f
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Ubar            Ubar [ 0 1 -1 0 0 0 0 ] ( 10 0 0 );
+
+transportModel  Newtonian;
+
+nu              nu [ 0 2 -1 0 0 0 0 ] 1e-3;
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties.template b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties.template
new file mode 100644
index 0000000000..03d9dabacf
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties.template
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Ubar            Ubar [ 0 1 -1 0 0 0 0 ] ( 10 0 0 );
+
+transportModel  Newtonian;
+
+nu              nu [ 0 2 -1 0 0 0 0 ] 1e-XXX;
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/foamLog.db b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/foamLog.db
new file mode 100644
index 0000000000..dafe0166cc
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/foamLog.db
@@ -0,0 +1,62 @@
+#------------------------------------------------------------------------------
+# Query database for Foam Log extraction.
+# Each line stands for one query:
+#
+#    name '/' line selector '/' column selector
+#
+# e.g.
+#    kMin/bounding k,/min:
+#
+# The extraction will select a line using 'bounding k,' and in the line
+# takes the word following 'min:' as the value.
+#
+# A special entry is the 'Separator' entry which delimits one iteration
+# from the other.
+#
+#------------------------------------------------------------------------------
+
+#- String to recognize new iteration by (usually same as 'Time')
+Separator/^[ \t]*Time = /Time =
+
+#- Time value:
+Time/^[ \t]*Time = /Time =
+
+#- Continuity errors:
+contLocal/time step continuity errors :/sum local =
+contGlobal/time step continuity errors :/ global =
+contCumulative/time step continuity errors :/cumulative =
+
+#- Special for combustion code:
+minFu/min\(fu\) = /min(fu) =
+minFt/min\(ft\) = /min(ft) =
+
+#- Execution time:
+executionTime/ExecutionTime = /ExecutionTime =
+
+#- Courant no:
+CourantMax/Courant Number /max:
+CourantMean/Courant Number /mean:
+
+#- K bounding
+kMin/bounding k,/min:
+kMax/bounding k,/max:
+kAvg/bounding k,/average:
+
+#- epsilon bounding
+epsMin/bounding epsilon,/min:
+epsMax/bounding epsilon,/max:
+epsAvg/bounding epsilon,/average:
+
+#- gamma bounding
+gammaMin/Min\(gamma\) =/Min(gamma) =
+gammaMax/Max\(gamma\) =/Max(gamma) =
+
+#- Wall function data - line begins with Rey =
+Rey/Rey = /Rey =
+uTau/Rey = /uTau =
+nutPlus/Rey = /nut+ =
+yPlus/Rey = /y+ =
+uPlus/Rey = /u+ =
+kPlus/Rey = /k+ =
+epsilonPlus/Rey = /epsilon+ =
+
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict
new file mode 100644
index 0000000000..7bf69941d9
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     boundaryFoam;
+
+libs
+(
+    "libOpenFOAM.so"
+    "libinterpolationTables_16x.so"
+    "libtabulatedWallFunctionFvPatchFields_16x.so"
+);
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         1000;
+
+deltaT          1;
+
+writeControl    timeStep;
+
+writeInterval   100;
+
+purgeWrite      1;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+graphFormat     raw;
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes
new file mode 100644
index 0000000000..bf71537dcb
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSchemes
@@ -0,0 +1,61 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         steadyState;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,k)      Gauss linear;
+    div(phi,epsilon) Gauss linear;
+    div(phi,omega)  Gauss linear;
+    div(phi,R)      Gauss linear;
+    div(phi,nuTilda) Gauss linear;
+    div((nuEff*dev(grad(U).T()))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         none;
+    laplacian(nuEff,U) Gauss linear corrected;
+    laplacian(DkEff,k) Gauss linear corrected;
+    laplacian(DepsilonEff,epsilon) Gauss linear corrected;
+    laplacian(DomegaEff,omega) Gauss linear corrected;
+    laplacian(DREff,R) Gauss linear corrected;
+    laplacian(DnuTildaEff,nuTilda) Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution
new file mode 100644
index 0000000000..0f80d7dab7
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/fvSolution
@@ -0,0 +1,88 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    U
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    omega
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    R
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    nuTilda
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+}
+
+PISO
+{
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+    momentumPredictor yes;
+    fluxGradp       no;
+}
+
+relaxationFactors
+{
+    U               0.5;
+    k               0.7;
+    epsilon         0.7;
+    omega           0.7;
+    R               0.7;
+    nuTilda         0.7;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/nut b/tutorials/incompressible/pimpleFoam/t-junction/0/nut
index e2834c67e4..b4a42336aa 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/nut
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/nut
@@ -41,7 +41,7 @@ boundaryField
 
     defaultFaces
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/nut b/tutorials/incompressible/pisoFoam/ras/cavity/0/nut
index 0f4ab2e87b..a6fe8c0fe7 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/0/nut
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/nut
@@ -23,12 +23,12 @@ boundaryField
 {
     movingWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     fixedWalls
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     frontAndBack
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
index 8bc3472e95..18870c0af0 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSolution
@@ -22,7 +22,7 @@ solvers
         preconditioner  DIC;
         tolerance       1e-6;
         relTol          0.01;
-    };
+    }
 
     hFinal
     {
@@ -30,7 +30,7 @@ solvers
         preconditioner  DIC;
         tolerance       1e-8;
         relTol          0;
-    };
+    }
 
     hU
     {
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/nut b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
index e9e99c91ff..96e4a43d3c 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
@@ -34,7 +34,7 @@ boundaryField
 
     wall
     {
-        type            nutSpalartAllmarasWallFunction;
+        type            nutUSpaldingWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
deleted file mode 100644
index eeb06bac7a..0000000000
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
+++ /dev/null
@@ -1,174 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-turbulenceModel SpalartAllmaras;
-
-turbulence      on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.0845;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.42;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.68;
-    alphak          alphaK [ 0 0 0 0 0 0 0 ] 1.39;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 1.39;
-    eta0            eta0 [ 0 0 0 0 0 0 0 ] 4.38;
-    beta            beta [ 0 0 0 0 0 0 0 ] 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76932;
-    A1              A1 [ 0 0 0 0 0 0 0 ] 1.25;
-    A2              A2 [ 0 0 0 0 0 0 0 ] 1000;
-    Ctau1           Ctau1 [ 0 0 0 0 0 0 0 ] -4;
-    Ctau2           Ctau2 [ 0 0 0 0 0 0 0 ] 13;
-    Ctau3           Ctau3 [ 0 0 0 0 0 0 0 ] -2;
-    alphaKsi        alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-}
-
-LienCubicKECoeffs
-{
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    A1              A1 [ 0 0 0 0 0 0 0 ] 1.25;
-    A2              A2 [ 0 0 0 0 0 0 0 ] 1000;
-    Ctau1           Ctau1 [ 0 0 0 0 0 0 0 ] -4;
-    Ctau2           Ctau2 [ 0 0 0 0 0 0 0 ] 13;
-    Ctau3           Ctau3 [ 0 0 0 0 0 0 0 ] -2;
-    alphaKsi        alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-}
-
-QZetaCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaZeta       alphaZeta [ 0 0 0 0 0 0 0 ] 0.76923;
-    anisotropic     no;
-}
-
-LaunderSharmaKECoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    A1              A1 [ 0 0 0 0 0 0 0 ] 1.25;
-    A2              A2 [ 0 0 0 0 0 0 0 ] 1000;
-    Ctau1           Ctau1 [ 0 0 0 0 0 0 0 ] -4;
-    Ctau2           Ctau2 [ 0 0 0 0 0 0 0 ] 13;
-    Ctau3           Ctau3 [ 0 0 0 0 0 0 0 ] -2;
-    alphaKsi        alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-    Am              Am [ 0 0 0 0 0 0 0 ] 0.016;
-    Aepsilon        Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
-    Amu             Amu [ 0 0 0 0 0 0 0 ] 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    Am              Am [ 0 0 0 0 0 0 0 ] 0.016;
-    Aepsilon        Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
-    Amu             Amu [ 0 0 0 0 0 0 0 ] 0.00222;
-}
-
-LRRCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    Clrr1           Clrr1 [ 0 0 0 0 0 0 0 ] 1.8;
-    Clrr2           Clrr2 [ 0 0 0 0 0 0 0 ] 0.6;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    Cs              Cs [ 0 0 0 0 0 0 0 ] 0.25;
-    Ceps            Ceps [ 0 0 0 0 0 0 0 ] 0.15;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    Clg1            Clg1 [ 0 0 0 0 0 0 0 ] 1.8;
-    Clg2            Clg2 [ 0 0 0 0 0 0 0 ] 0.6;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    C1Ref           C1Ref [ 0 0 0 0 0 0 0 ] 0.5;
-    C2Ref           C2Ref [ 0 0 0 0 0 0 0 ] 0.3;
-    Cs              Cs [ 0 0 0 0 0 0 0 ] 0.25;
-    Ceps            Ceps [ 0 0 0 0 0 0 0 ] 0.15;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    alphaR          alphaR [ 0 0 0 0 0 0 0 ] 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
-    alphaNut        alphaNut [ 0 0 0 0 0 0 0 ] 1.5;
-    Cb1             Cb1 [ 0 0 0 0 0 0 0 ] 0.1355;
-    Cb2             Cb2 [ 0 0 0 0 0 0 0 ] 0.622;
-    Cw2             Cw2 [ 0 0 0 0 0 0 0 ] 0.3;
-    Cw3             Cw3 [ 0 0 0 0 0 0 0 ] 2;
-    Cv1             Cv1 [ 0 0 0 0 0 0 0 ] 7.1;
-    Cv2             Cv2 [ 0 0 0 0 0 0 0 ] 5;
-}
-
-wallFunctionCoeffs
-{
-    kappa           kappa [ 0 0 0 0 0 0 0 ] 0.4187;
-    E               E [ 0 0 0 0 0 0 0 ] 9;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/nut b/tutorials/incompressible/simpleFoam/motorBike/0/nut
index b4358c7589..fa90ca590f 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0/nut
+++ b/tutorials/incompressible/simpleFoam/motorBike/0/nut
@@ -41,7 +41,7 @@ boundaryField
 
     lowerWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 
@@ -53,7 +53,7 @@ boundaryField
 
     "motorBike_.*"
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
 }
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
index b79c6ad432..e96b062da6 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  1.6                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
deleted file mode 100644
index eeb06bac7a..0000000000
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties
+++ /dev/null
@@ -1,174 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-turbulenceModel SpalartAllmaras;
-
-turbulence      on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.0845;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.42;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.68;
-    alphak          alphaK [ 0 0 0 0 0 0 0 ] 1.39;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 1.39;
-    eta0            eta0 [ 0 0 0 0 0 0 0 ] 4.38;
-    beta            beta [ 0 0 0 0 0 0 0 ] 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76932;
-    A1              A1 [ 0 0 0 0 0 0 0 ] 1.25;
-    A2              A2 [ 0 0 0 0 0 0 0 ] 1000;
-    Ctau1           Ctau1 [ 0 0 0 0 0 0 0 ] -4;
-    Ctau2           Ctau2 [ 0 0 0 0 0 0 0 ] 13;
-    Ctau3           Ctau3 [ 0 0 0 0 0 0 0 ] -2;
-    alphaKsi        alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-}
-
-LienCubicKECoeffs
-{
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    A1              A1 [ 0 0 0 0 0 0 0 ] 1.25;
-    A2              A2 [ 0 0 0 0 0 0 0 ] 1000;
-    Ctau1           Ctau1 [ 0 0 0 0 0 0 0 ] -4;
-    Ctau2           Ctau2 [ 0 0 0 0 0 0 0 ] 13;
-    Ctau3           Ctau3 [ 0 0 0 0 0 0 0 ] -2;
-    alphaKsi        alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-}
-
-QZetaCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaZeta       alphaZeta [ 0 0 0 0 0 0 0 ] 0.76923;
-    anisotropic     no;
-}
-
-LaunderSharmaKECoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    A1              A1 [ 0 0 0 0 0 0 0 ] 1.25;
-    A2              A2 [ 0 0 0 0 0 0 0 ] 1000;
-    Ctau1           Ctau1 [ 0 0 0 0 0 0 0 ] -4;
-    Ctau2           Ctau2 [ 0 0 0 0 0 0 0 ] 13;
-    Ctau3           Ctau3 [ 0 0 0 0 0 0 0 ] -2;
-    alphaKsi        alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
-    Am              Am [ 0 0 0 0 0 0 0 ] 0.016;
-    Aepsilon        Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
-    Amu             Amu [ 0 0 0 0 0 0 0 ] 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    alphak          alphak [ 0 0 0 0 0 0 0 ] 1;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    Am              Am [ 0 0 0 0 0 0 0 ] 0.016;
-    Aepsilon        Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
-    Amu             Amu [ 0 0 0 0 0 0 0 ] 0.00222;
-}
-
-LRRCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    Clrr1           Clrr1 [ 0 0 0 0 0 0 0 ] 1.8;
-    Clrr2           Clrr2 [ 0 0 0 0 0 0 0 ] 0.6;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    Cs              Cs [ 0 0 0 0 0 0 0 ] 0.25;
-    Ceps            Ceps [ 0 0 0 0 0 0 0 ] 0.15;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
-    Cmu             Cmu [ 0 0 0 0 0 0 0 ] 0.09;
-    Clg1            Clg1 [ 0 0 0 0 0 0 0 ] 1.8;
-    Clg2            Clg2 [ 0 0 0 0 0 0 0 ] 0.6;
-    C1              C1 [ 0 0 0 0 0 0 0 ] 1.44;
-    C2              C2 [ 0 0 0 0 0 0 0 ] 1.92;
-    C1Ref           C1Ref [ 0 0 0 0 0 0 0 ] 0.5;
-    C2Ref           C2Ref [ 0 0 0 0 0 0 0 ] 0.3;
-    Cs              Cs [ 0 0 0 0 0 0 0 ] 0.25;
-    Ceps            Ceps [ 0 0 0 0 0 0 0 ] 0.15;
-    alphaEps        alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
-    alphaR          alphaR [ 0 0 0 0 0 0 0 ] 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
-    alphaNut        alphaNut [ 0 0 0 0 0 0 0 ] 1.5;
-    Cb1             Cb1 [ 0 0 0 0 0 0 0 ] 0.1355;
-    Cb2             Cb2 [ 0 0 0 0 0 0 0 ] 0.622;
-    Cw2             Cw2 [ 0 0 0 0 0 0 0 ] 0.3;
-    Cw3             Cw3 [ 0 0 0 0 0 0 0 ] 2;
-    Cv1             Cv1 [ 0 0 0 0 0 0 0 ] 7.1;
-    Cv2             Cv2 [ 0 0 0 0 0 0 0 ] 5;
-}
-
-wallFunctionCoeffs
-{
-    kappa           kappa [ 0 0 0 0 0 0 0 ] 0.4187;
-    E               E [ 0 0 0 0 0 0 0 ] 9;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
index 2dcaef0c14..3b0a3e35b6 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
@@ -28,7 +28,7 @@ solvers
         agglomerator     faceAreaPair;
         nCellsInCoarsestLevel 10;
         mergeLevels      1;
-    };
+    }
 
     U
     {
@@ -37,7 +37,7 @@ solvers
         tolerance        1e-8;
         relTol           0.1;
         nSweeps          1;
-    };
+    }
 
     k
     {
@@ -46,7 +46,7 @@ solvers
         tolerance        1e-8;
         relTol           0.1;
         nSweeps          1;
-    };
+    }
 
     omega
     {
@@ -55,7 +55,7 @@ solvers
         tolerance        1e-8;
         relTol           0.1;
         nSweeps          1;
-    };
+    }
 }
 
 SIMPLE
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/nut b/tutorials/incompressible/simpleFoam/pitzDaily/0/nut
index e07c5bc529..9a66ad0c26 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/0/nut
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/nut
@@ -33,12 +33,12 @@ boundaryField
     }
     upperWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     lowerWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     frontAndBack
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut
index e07c5bc529..9a66ad0c26 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut
@@ -33,12 +33,12 @@ boundaryField
     }
     upperWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     lowerWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     frontAndBack
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/nut b/tutorials/incompressible/simpleSRFFoam/mixer/0/nut
index d60fe7a176..82d057a58b 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/0/nut
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/nut
@@ -33,13 +33,13 @@ boundaryField
     }
     innerWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         U               Urel;
         value           uniform 0;
     }
     outerWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         U               Urel;
         value           uniform 0;
     }
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
index 6321b9c336..b29e4e70c0 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
@@ -23,17 +23,17 @@ boundaryField
 {
     top
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     bottom
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     walls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     symmetry
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut
index 3b8469c894..fa451536fc 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut
@@ -23,17 +23,17 @@ boundaryField
 {
     top
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     bottom
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     walls
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     symmetry
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
index 5e1041dd83..d875b9f976 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
@@ -17,118 +17,37 @@ FoamFile
 
 solvers
 {
-    rho
+    "(rho|G)"
     {
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-05;
         relTol          0;
-    };
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    };
+    }
+
     p
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-06;
         relTol          0;
-    };
-    G
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-05;
-        relTol          0;
-    };
-    Yi
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    };
-    CO2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    };
-    O2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    };
-    N2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    };
-    CH4
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    };
-    H2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    };
-    H2O
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    };
-    CO
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    };
-    h
+    }
+
+    "(U|h|R|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0;
-    };
-    R
+    }
+
+    "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)"
     {
         solver          PBiCG;
         preconditioner  DILU;
-        tolerance       1e-05;
+        tolerance       1e-06;
         relTol          0;
-    };
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    };
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    };
+    }
 }
 
 PISO
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
index 458a72388d..c87862d4ae 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut
index c9695f501a..9a7573f3f1 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
index 458a72388d..c87862d4ae 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut
index c9695f501a..9a7573f3f1 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut
@@ -23,7 +23,7 @@ boundaryField
 {
     walls
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     inlet
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
index cdefcfb103..8083f38051 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
@@ -17,108 +17,50 @@ FoamFile
 
 solvers
 {
-    rho
+    "(rho|G)"
     {
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-05;
         relTol          0;
-    };
-    U
+    }
+
+    "(U|h|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0;
-    };
+    }
+
     p
     {
-	solver           GAMG;
-        tolerance        0;
-        relTol           0.1;
-
-        smoother         GaussSeidel;
-        nPreSweeps       0;
-        nPostSweeps      2;
-
+        solver          GAMG;
+        tolerance       0;
+        relTol          0.1;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
         cacheAgglomeration true;
-
         nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
-    };
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
     pFinal
     {
-        solver           GAMG;
-        tolerance        1e-6;
-        relTol           0;
+        $p;
+        tolerance       1e-06;
+        relTol          0;
+    }
 
-        smoother         GaussSeidel;
-        nPreSweeps       0;
-        nPostSweeps      2;
-
-        cacheAgglomeration true;
-
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
-    };
-    G
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-05;
-        relTol          0;
-    };
-    Yi
+    "(Yi|O2|N2|H2O)"
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-06;
         relTol          0;
-    };
-    O2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    };
-    N2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    };
-    H2O
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    };
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    };
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    };
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    };
+    }
 }
 
 PISO
@@ -128,7 +70,6 @@ PISO
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
     momentumPredictor yes;
-//    nUCorrectors    2;
 }
 
 additional
@@ -140,14 +81,7 @@ additional
 
 relaxationFactors
 {
-/*
-    U               1;
-    k               1;
-    kepsilon        1;
-    h               1;
-    rho             1;
-    p               1;
-*/
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
index f0ef609117..736a2e3e70 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
@@ -17,20 +17,22 @@ FoamFile
 
 solvers
 {
-    rho
+    "(rho|G)"
     {
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-05;
         relTol          0;
     }
-    U
+
+    "(U|h|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0;
     }
+
     p
     {
         solver          PCG;
@@ -38,62 +40,14 @@ solvers
         tolerance       1e-06;
         relTol          0;
     }
-    G
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-05;
-        relTol          0;
-    }
-    Yi
+
+    "(Yi|O2|N2|H2O)"
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-06;
         relTol          0;
     }
-    O2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-    N2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-    H2O
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
 }
 
 PISO
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat
index 6321b9c336..b29e4e70c0 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat
@@ -23,17 +23,17 @@ boundaryField
 {
     top
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     bottom
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     walls
     {
-        type            compressible::alphatWallFunction;
+        type            alphatWallFunction;
         value           uniform 0;
     }
     symmetry
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut
index 3b8469c894..fa451536fc 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut
@@ -23,17 +23,17 @@ boundaryField
 {
     top
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     bottom
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     walls
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
     symmetry
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution
index 9b1a12fa2b..0cdd3e30cf 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    rho
+    "(rho|G)"
     {
         solver          PCG;
         preconditioner  DIC;
@@ -25,14 +25,6 @@ solvers
         relTol          0;
     }
 
-    U
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
     p
     {
         solver          PBiCG;
@@ -41,108 +33,16 @@ solvers
         relTol          0;
     }
 
-    G
+    "(U|h|R|k|epsilon)"
     {
-        solver          PCG;
-        preconditioner  DIC;
+        $p;
         tolerance       1e-05;
         relTol          0;
     }
 
-    Yi
+    "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    CO2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    O2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    N2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    CH4
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    H2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    H2O
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    CO
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    h
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
+        $p;
     }
 }
 
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution
index eab8882126..1d754fee8a 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution
@@ -19,44 +19,38 @@ solvers
 {
     p
     {
-        solver           PCG;
-        preconditioner   DIC;
-        tolerance        1e-06;
-        relTol           0;
-    };
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-06;
+        relTol          0;
+    }
 
     U
     {
-        solver           PBiCG;
-        preconditioner   DILU;
-        tolerance        1e-05;
-        relTol           0;
-    };
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
     cellDisplacement
     {
         solver          GAMG;
-        tolerance       1e-8;
+        tolerance       1e-08;
         relTol          0;
         smoother        GaussSeidel;
         cacheAgglomeration true;
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
-    };
-    cellMotionU
+    }
+
+    "(cellMotionU|cellMotionUz)"
     {
-        solver           PCG;
-        preconditioner   DIC;
-        tolerance        1e-08;
-        relTol           0;
-    };
-    cellMotionUz
-    {
-        solver           PCG;
-        preconditioner   DIC;
-        tolerance        1e-08;
-        relTol           0;
-    };
+        $p;
+        tolerance       1e-08;
+        relTol          0;
+    }
 }
 
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution
index d59f49c6ca..efb3bcdede 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution
@@ -25,7 +25,7 @@ solvers
         relTol          0;
     }
 
-    Ua
+    "(Ua|Ub|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -33,45 +33,13 @@ solvers
         relTol          0;
     }
 
-    Ub
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    alpha
+    "(alpha|beta)"
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-10;
         relTol          0;
     }
-
-    beta
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-10;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
 }
 
 PISO
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
index ae28961258..e74558359b 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "system";
     object      fvSolution;
@@ -17,31 +17,7 @@ FoamFile
 
 solvers
 {
-    omega
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    rho
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    U
+    "(rho|U|k|omega)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -65,16 +41,9 @@ solvers
 
     pFinal
     {
-        solver          GAMG;
+        $p;
         tolerance       1e-08;
         relTol          0;
-        smoother        GaussSeidel;
-        nPreSweeps      0;
-        nPostSweeps     2;
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator    faceAreaPair;
-        mergeLevels     1;
     }
 }
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
index ae28961258..e74558359b 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "system";
     object      fvSolution;
@@ -17,31 +17,7 @@ FoamFile
 
 solvers
 {
-    omega
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    rho
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    U
+    "(rho|U|k|omega)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -65,16 +41,9 @@ solvers
 
     pFinal
     {
-        solver          GAMG;
+        $p;
         tolerance       1e-08;
         relTol          0;
-        smoother        GaussSeidel;
-        nPreSweeps      0;
-        nPostSweeps     2;
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator    faceAreaPair;
-        mergeLevels     1;
     }
 }
 
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut
index 793a490863..ba78652d58 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut
@@ -33,7 +33,7 @@ boundaryField
     }
     walls
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     frontBack
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
index 188e593e19..c1f55e94e3 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
@@ -17,31 +17,7 @@ FoamFile
 
 solvers
 {
-    omega
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    rho
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    U
+    "(rho|U|k|omega)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -65,16 +41,9 @@ solvers
 
     pFinal
     {
-        solver          GAMG;
+        $p;
         tolerance       1e-08;
         relTol          0;
-        smoother        GaussSeidel;
-        nPreSweeps      0;
-        nPostSweeps     2;
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator    faceAreaPair;
-        mergeLevels     1;
     }
 }
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution
index 872b88e305..3a08b2c430 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution
@@ -34,7 +34,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       1e-05;
         relTol          0;
         maxIter         100;
@@ -78,7 +77,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       1e-07;
         relTol          0;
         maxIter         20;
@@ -93,23 +91,7 @@ solvers
         nSweeps         1;
     }
 
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    B
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    nuTilda
+    "(k|B|nuTilda)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution
index 872b88e305..3a08b2c430 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution
@@ -34,7 +34,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       1e-05;
         relTol          0;
         maxIter         100;
@@ -78,7 +77,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       1e-07;
         relTol          0;
         maxIter         20;
@@ -93,23 +91,7 @@ solvers
         nSweeps         1;
     }
 
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    B
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    nuTilda
+    "(k|B|nuTilda)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
index 577db9c0f6..f22eaa81b5 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
@@ -34,7 +34,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       0.0001;
         relTol          0;
         maxIter         100;
@@ -73,7 +72,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       1e-08;
         relTol          0;
         maxIter         20;
@@ -88,23 +86,7 @@ solvers
         nSweeps         1;
     }
 
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    B
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    nuTilda
+    "(k|B|nuTilda)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -121,9 +103,8 @@ PISO
     nAlphaCorr      1;
     nAlphaSubCycles 3;
     cAlpha          1;
-
-    pRefPoint      (0.51 0.51 0.51);
-    pRefValue      0;
+    pRefPoint       ( 0.51 0.51 0.51 );
+    pRefValue       0;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/fvSolution
index b9b4490f4c..53033e72f4 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/fvSolution
@@ -35,8 +35,7 @@ solvers
 
     pFinal
     {
-        solver          PCG;
-        preconditioner  DIC;
+        $p;
         tolerance       1e-07;
         relTol          0;
     }
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
index fe91ceb9b0..a4167c7f07 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
@@ -35,8 +35,7 @@ solvers
 
     pFinal
     {
-        solver          PCG;
-        preconditioner  DIC;
+        $p;
         tolerance       1e-07;
         relTol          0;
     }
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
index 296fc3df64..0c7e65f659 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
@@ -34,7 +34,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       1e-05;
         relTol          0;
         maxIter         100;
@@ -73,7 +72,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       1e-07;
         relTol          0;
         maxIter         20;
@@ -88,23 +86,7 @@ solvers
         nSweeps         1;
     }
 
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    B
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    nuTilda
+    "(k|B|nuTilda)"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/mut b/tutorials/multiphase/interFoam/ras/damBreak/0/mut
index 8a09c067b2..41747664d5 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/mut
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/mut
@@ -23,19 +23,19 @@ boundaryField
 {
     leftWall
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            mutWallFunction;
+        type            mutkWallFunction;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/nut b/tutorials/multiphase/interFoam/ras/damBreak/0/nut
index 1ee1e7242e..7924a8da87 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/nut
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/nut
@@ -23,17 +23,17 @@ boundaryField
 {
     leftWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     rightWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     lowerWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         value           uniform 0;
     }
     atmosphere
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
index 921889c586..e30eb5d36e 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
@@ -35,8 +35,7 @@ solvers
 
     pFinal
     {
-        solver          PCG;
-        preconditioner  DIC;
+        $p;
         tolerance       1e-07;
         relTol          0;
     }
@@ -49,34 +48,9 @@ solvers
         relTol          0;
     }
 
-    k
+    "(k|epsilon|R|nuTilda)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    nuTilda
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
+        $U;
         tolerance       1e-08;
         relTol          0;
     }
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index 9f6930eccf..8b11d7fe20 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -34,7 +34,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     2;
         }
-
         tolerance       1e-05;
         relTol          0;
         maxIter         100;
@@ -73,22 +72,12 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       1e-07;
         relTol          0;
         maxIter         20;
     }
 
-    U
-    {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        tolerance       1e-08;
-        relTol          0;
-        nSweeps         1;
-    }
-
-    alpha
+    "(U|alpha)"
     {
         solver          smoothSolver;
         smoother        GaussSeidel;
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
index 9f6930eccf..8b11d7fe20 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
@@ -34,7 +34,6 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     2;
         }
-
         tolerance       1e-05;
         relTol          0;
         maxIter         100;
@@ -73,22 +72,12 @@ solvers
             agglomerator    faceAreaPair;
             mergeLevels     1;
         }
-
         tolerance       1e-07;
         relTol          0;
         maxIter         20;
     }
 
-    U
-    {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        tolerance       1e-08;
-        relTol          0;
-        nSweeps         1;
-    }
-
-    alpha
+    "(U|alpha)"
     {
         solver          smoothSolver;
         smoother        GaussSeidel;
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/U b/tutorials/multiphase/settlingFoam/ras/dahl/0/U
index 1559025ce3..a0a0043af1 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/U
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/U
@@ -20,35 +20,35 @@ internalField   uniform (0.0191 0 0);
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform (0.0191 0 0);
     }
 
-    outlet          
+    outlet
     {
         type            zeroGradient;
     }
 
-    bottomWall      
+    bottomWall
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    endWall         
+    endWall
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    top             
+    top
     {
-        type            symmetryPlane;
+        type            slip;
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha b/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
index bf0cc9d206..ca6b9f8f7a 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
@@ -20,33 +20,33 @@ internalField   uniform 0.001;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform 0.001;
     }
 
-    outlet          
+    outlet
     {
         type            zeroGradient;
     }
 
-    bottomWall      
+    bottomWall
     {
         type            zeroGradient;
     }
 
-    endWall         
+    endWall
     {
         type            zeroGradient;
     }
 
-    top             
+    top
     {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon b/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon
index 3e878bfecc..27b4ba3c1f 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon
@@ -20,33 +20,33 @@ internalField   uniform 1.50919e-06;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform 1.50919e-06;
     }
 
-    outlet          
+    outlet
     {
         type            zeroGradient;
     }
 
-    bottomWall      
+    bottomWall
     {
         type            zeroGradient;
     }
 
-    endWall         
+    endWall
     {
         type            zeroGradient;
     }
 
-    top             
+    top
     {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/k b/tutorials/multiphase/settlingFoam/ras/dahl/0/k
index 152c9e06dc..6bd1a6b416 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/k
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/k
@@ -20,33 +20,33 @@ internalField   uniform 0.00015;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform 0.00015;
     }
 
-    outlet          
+    outlet
     {
         type            zeroGradient;
     }
 
-    bottomWall      
+    bottomWall
     {
         type            zeroGradient;
     }
 
-    endWall         
+    endWall
     {
         type            zeroGradient;
     }
 
-    top             
+    top
     {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/p b/tutorials/multiphase/settlingFoam/ras/dahl/0/p
index 21283df64a..fa58407df2 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/p
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/p
@@ -39,13 +39,13 @@ boundaryField
 
     endWall
     {
-        type            buoyantPressure;
-        value           uniform 0;
+        type            zeroGradient;
     }
 
     top
     {
-        type            symmetryPlane;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     frontAndBack
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/g b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
index 27d4d32488..8a9ae72772 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-value           ( 0 -9.81 0 );
+value           (0 -9.81 0);
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict
index aca4ffd37c..28b3bb25fe 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict
@@ -16,7 +16,7 @@ FoamFile
 
 convertToMeters 1;
 
-vertices        
+vertices
 (
     (0 0 -0.1)
     (8.65 0 -0.1)
@@ -32,40 +32,40 @@ vertices
     (0 1 0.1)
 );
 
-blocks          
+blocks
 (
     hex (0 1 2 3 6 7 8 9) (200 4 1) simpleGrading (1 1 1)
     hex (3 2 4 5 9 8 10 11) (200 36 1) simpleGrading (1 1 1)
 );
 
-edges           
+edges
 (
 );
 
-patches         
+patches
 (
-    patch inlet 
+    patch inlet
     (
         (0 6 9 3)
         (3 9 11 5)
     )
-    patch outlet 
+    patch outlet
     (
         (1 2 8 7)
     )
-    patch bottomWall 
+    patch bottomWall
     (
         (0 1 7 6)
     )
-    wall endWall 
+    wall endWall
     (
         (2 4 10 8)
     )
-    symmetryPlane top 
+    patch top
     (
         (5 11 10 4)
     )
-    empty frontAndBack 
+    empty frontAndBack
     (
         (0 3 2 1)
         (6 7 8 9)
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
index 15a60bdd6a..03af5cc61a 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  1.6.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -43,7 +43,7 @@ FoamFile
     }
     top
     {
-        type            symmetryPlane;
+        type            patch;
         nFaces          200;
         startFace       16040;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
index 02a73ebf91..ef409e071a 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
@@ -25,7 +25,7 @@ stopAt          endTime;
 
 endTime         6400;
 
-deltaT          0.2;
+deltaT          0.1;
 
 writeControl    runTime;
 
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/U b/tutorials/multiphase/settlingFoam/ras/tank3D/0/U
index 709c50ae80..34520705ad 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/U
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/U
@@ -20,120 +20,120 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    SYMP3           
+    SYMP3
     {
-        type            symmetryPlane;
+        type            slip;
     }
 
-    INLE1           
+    INLE1
     {
         type            fixedValue;
         value           uniform (0.1315 0 0);
     }
 
-    OUTL9           
+    OUTL9
     {
         type            fixedValue;
         value           uniform (0 0.0177 0);
     }
 
-    OUTL10          
+    OUTL10
     {
         type            fixedValue;
         value           uniform (0 0.0177 0);
     }
 
-    OUTL11          
+    OUTL11
     {
         type            fixedValue;
         value           uniform (0 0.0177 0);
     }
 
-    OUTL12          
+    OUTL12
     {
         type            fixedValue;
         value           uniform (0 0.0177 0);
     }
 
-    WALL6           
+    WALL6
     {
         type            fixedValue;
         value           uniform (-0.003 0 0);
     }
 
-    WALL8           
+    WALL8
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL61          
+    WALL61
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL62          
+    WALL62
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL63          
+    WALL63
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL64          
+    WALL64
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL65          
+    WALL65
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL66          
+    WALL66
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL67          
+    WALL67
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL68          
+    WALL68
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL69          
+    WALL69
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL7           
+    WALL7
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL70          
+    WALL70
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    OUTL15          
+    OUTL15
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha b/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
index 1f11257066..18e136580a 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
@@ -20,103 +20,103 @@ internalField   uniform 0;
 
 boundaryField
 {
-    SYMP3           
+    SYMP3
     {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
 
-    INLE1           
+    INLE1
     {
         type            fixedValue;
         value           uniform 0.002;
     }
 
-    OUTL9           
+    OUTL9
     {
         type            zeroGradient;
     }
 
-    OUTL10          
+    OUTL10
     {
         type            zeroGradient;
     }
 
-    OUTL11          
+    OUTL11
     {
         type            zeroGradient;
     }
 
-    OUTL12          
+    OUTL12
     {
         type            zeroGradient;
     }
 
-    WALL6           
+    WALL6
     {
         type            zeroGradient;
     }
 
-    WALL8           
+    WALL8
     {
         type            zeroGradient;
     }
 
-    WALL61          
+    WALL61
     {
         type            zeroGradient;
     }
 
-    WALL62          
+    WALL62
     {
         type            zeroGradient;
     }
 
-    WALL63          
+    WALL63
     {
         type            zeroGradient;
     }
 
-    WALL64          
+    WALL64
     {
         type            zeroGradient;
     }
 
-    WALL65          
+    WALL65
     {
         type            zeroGradient;
     }
 
-    WALL66          
+    WALL66
     {
         type            zeroGradient;
     }
 
-    WALL67          
+    WALL67
     {
         type            zeroGradient;
     }
 
-    WALL68          
+    WALL68
     {
         type            zeroGradient;
     }
 
-    WALL69          
+    WALL69
     {
         type            zeroGradient;
     }
 
-    WALL7           
+    WALL7
     {
         type            zeroGradient;
     }
 
-    WALL70          
+    WALL70
     {
         type            zeroGradient;
     }
 
-    OUTL15          
+    OUTL15
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon b/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon
index e1f67f23eb..634512f951 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon
@@ -20,103 +20,103 @@ internalField   uniform 1.973e-07;
 
 boundaryField
 {
-    SYMP3           
+    SYMP3
     {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
 
-    INLE1           
+    INLE1
     {
         type            fixedValue;
         value           uniform 1.973e-07;
     }
 
-    OUTL9           
+    OUTL9
     {
         type            zeroGradient;
     }
 
-    OUTL10          
+    OUTL10
     {
         type            zeroGradient;
     }
 
-    OUTL11          
+    OUTL11
     {
         type            zeroGradient;
     }
 
-    OUTL12          
+    OUTL12
     {
         type            zeroGradient;
     }
 
-    WALL6           
+    WALL6
     {
         type            zeroGradient;
     }
 
-    WALL8           
+    WALL8
     {
         type            zeroGradient;
     }
 
-    WALL61          
+    WALL61
     {
         type            zeroGradient;
     }
 
-    WALL62          
+    WALL62
     {
         type            zeroGradient;
     }
 
-    WALL63          
+    WALL63
     {
         type            zeroGradient;
     }
 
-    WALL64          
+    WALL64
     {
         type            zeroGradient;
     }
 
-    WALL65          
+    WALL65
     {
         type            zeroGradient;
     }
 
-    WALL66          
+    WALL66
     {
         type            zeroGradient;
     }
 
-    WALL67          
+    WALL67
     {
         type            zeroGradient;
     }
 
-    WALL68          
+    WALL68
     {
         type            zeroGradient;
     }
 
-    WALL69          
+    WALL69
     {
         type            zeroGradient;
     }
 
-    WALL7           
+    WALL7
     {
         type            zeroGradient;
     }
 
-    WALL70          
+    WALL70
     {
         type            zeroGradient;
     }
 
-    OUTL15          
+    OUTL15
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/k b/tutorials/multiphase/settlingFoam/ras/tank3D/0/k
index b3899fb1d7..5bc3ea2d51 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/k
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/k
@@ -20,103 +20,103 @@ internalField   uniform 0.000259;
 
 boundaryField
 {
-    SYMP3           
+    SYMP3
     {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
 
-    INLE1           
+    INLE1
     {
         type            fixedValue;
         value           uniform 0.000259;
     }
 
-    OUTL9           
+    OUTL9
     {
         type            zeroGradient;
     }
 
-    OUTL10          
+    OUTL10
     {
         type            zeroGradient;
     }
 
-    OUTL11          
+    OUTL11
     {
         type            zeroGradient;
     }
 
-    OUTL12          
+    OUTL12
     {
         type            zeroGradient;
     }
 
-    WALL6           
+    WALL6
     {
         type            zeroGradient;
     }
 
-    WALL8           
+    WALL8
     {
         type            zeroGradient;
     }
 
-    WALL61          
+    WALL61
     {
         type            zeroGradient;
     }
 
-    WALL62          
+    WALL62
     {
         type            zeroGradient;
     }
 
-    WALL63          
+    WALL63
     {
         type            zeroGradient;
     }
 
-    WALL64          
+    WALL64
     {
         type            zeroGradient;
     }
 
-    WALL65          
+    WALL65
     {
         type            zeroGradient;
     }
 
-    WALL66          
+    WALL66
     {
         type            zeroGradient;
     }
 
-    WALL67          
+    WALL67
     {
         type            zeroGradient;
     }
 
-    WALL68          
+    WALL68
     {
         type            zeroGradient;
     }
 
-    WALL69          
+    WALL69
     {
         type            zeroGradient;
     }
 
-    WALL7           
+    WALL7
     {
         type            zeroGradient;
     }
 
-    WALL70          
+    WALL70
     {
         type            zeroGradient;
     }
 
-    OUTL15          
+    OUTL15
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
index b73d22a823..0a61164085 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
@@ -22,7 +22,8 @@ boundaryField
 {
     SYMP3
     {
-        type            symmetryPlane;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     INLE1
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
index 231be44262..411704d783 100755
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
@@ -1,8 +1,8 @@
 #!/bin/sh
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 application=`getApplication`
 
-#runApplication blockMesh
 runApplication $application
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary
index 40f8d8e84b..5d48248b2e 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary
@@ -17,7 +17,7 @@ FoamFile
 (
     SYMP3
     {
-        type            symmetryPlane;
+        type            patch;
         startFace       53708;
         nFaces          3191;
     }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
index 0589345336..5c86c7303d 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       dictionary;
     location    "system";
     object      fvSolution;
@@ -32,7 +32,7 @@ solvers
         mergeLevels     1;
     }
 
-    Ua
+    "(Ua|Ub|Theta|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -40,53 +40,13 @@ solvers
         relTol          0;
     }
 
-    Ub
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    alpha
+    "(alpha|beta)"
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-10;
         relTol          0;
     }
-
-    beta
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-10;
-        relTol          0;
-    }
-
-    Theta
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
 }
 
 PISO
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
index 733ad77e71..442a4c551f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
@@ -32,7 +32,7 @@ solvers
         mergeLevels     1;
     }
 
-    Ua
+    "(Ua|Ub|Theta|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -40,53 +40,13 @@ solvers
         relTol          0;
     }
 
-    Ub
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    alpha
+    "(alpha|beta)"
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-10;
         relTol          0;
     }
-
-    beta
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-10;
-        relTol          0;
-    }
-
-    Theta
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
 }
 
 PISO
@@ -106,8 +66,7 @@ relaxationFactors
     alpha           1;
     beta            1;
     Theta           1;
-    k               1;
-    epsilon         1;
+    "(k|epsilon)"   1;
 }
 
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
index efb0cb6b6a..6f373c13fd 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
@@ -32,7 +32,7 @@ solvers
         mergeLevels     1;
     }
 
-    Ua
+    "(Ua|Ub|Theta|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -40,53 +40,13 @@ solvers
         relTol          0;
     }
 
-    Ub
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    alpha
+    "(alpha|beta)"
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-10;
         relTol          0;
     }
-
-    beta
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-10;
-        relTol          0;
-    }
-
-    Theta
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    k
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    epsilon
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
 }
 
 PISO
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution
index e921d9233a..143f9e36a7 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution
@@ -17,19 +17,7 @@ FoamFile
 
 solvers
 {
-    D
-    {
-        solver          GAMG;
-        tolerance       1e-06;
-        relTol          0.9;
-        smoother        GaussSeidel;
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 20;
-        agglomerator    faceAreaPair;
-        mergeLevels     1;
-    }
-
-    T
+    "(D|T)"
     {
         solver          GAMG;
         tolerance       1e-06;
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
index fd610d55c5..68a7119006 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
@@ -17,25 +17,13 @@ FoamFile
 
 solvers
 {
-    D
+    "(D|Dcorr)"
     {
         solver          GAMG;
         tolerance       1e-06;
         relTol          0.99;
         smoother        GaussSeidel;
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 6;
-        agglomerator    faceAreaPair;
-        mergeLevels     1;
-    }
-
-    Dcorr
-    {
-        solver          GAMG;
-        tolerance       1e-06;
-        relTol          0.99;
-        smoother        GaussSeidel;
-        cacheAgglomeration true;
+        cacheAgglomeration  true;
         nCellsInCoarsestLevel 6;
         agglomerator    faceAreaPair;
         mergeLevels     1;
diff --git a/wmake/Makefile b/wmake/Makefile
index 28b7015b71..6b4fd0abe6 100644
--- a/wmake/Makefile
+++ b/wmake/Makefile
@@ -22,11 +22,11 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     Makefile
 #
 # Description
-#     Generic Makefile used by wmake
+#     A generic Makefile, used by wmake
 #
 #------------------------------------------------------------------------------
 
diff --git a/wmake/MakefileApps b/wmake/MakefileApps
index 56c089c853..55efa80ff8 100644
--- a/wmake/MakefileApps
+++ b/wmake/MakefileApps
@@ -22,11 +22,11 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     MakefileApps
 #
 # Description
-#     Makefile used by 
+#     Makefile used by
 #         wmake all
 #     to make the applications in the subdirectories of the current directory
 #
diff --git a/wmake/MakefileFiles b/wmake/MakefileFiles
index 4c2ef52826..d927682d9b 100644
--- a/wmake/MakefileFiles
+++ b/wmake/MakefileFiles
@@ -22,11 +22,11 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     MakefileFiles
 #
 # Description
-#     General, easy to use make system for multi-platform development.
+#     A Makefile for the 'files', used by wmake
 #
 #------------------------------------------------------------------------------
 
@@ -40,7 +40,7 @@ include $(RULES)/general
 include $(OBJECTS_DIR)/options
 
 #------------------------------------------------------------------------------
-# declare names of make system control files derived from file files
+# declare names of make system control files derived from file 'files'
 #------------------------------------------------------------------------------
 
 FILES   = $(WM_OPTIONS)/files
@@ -51,7 +51,7 @@ DFILES  = $(WM_OPTIONS)/dependencyFiles
 IFILES  = $(WM_OPTIONS)/includeDeps
 
 #------------------------------------------------------------------------------
-# Declare dependecy of all make system files on FILE
+# Declare dependecy of all make system files on FILES
 # Causes all derived files to be remade if any are changed or missing
 #------------------------------------------------------------------------------
 
diff --git a/wmake/MakefileOptions b/wmake/MakefileOptions
index 92834a9a65..3e7779ff52 100644
--- a/wmake/MakefileOptions
+++ b/wmake/MakefileOptions
@@ -22,11 +22,11 @@
 #     along with OpenFOAM; if not, write to the Free Software Foundation,
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
-# Script
+# File
 #     MakefileOptions
 #
 # Description
-#     General, easy to use make system for multi-platform development.
+#     A Makefile for the 'options', used by wmake
 #
 #------------------------------------------------------------------------------
 
@@ -37,13 +37,13 @@ include $(GENERAL_RULES)/general
 include $(RULES)/general
 
 #------------------------------------------------------------------------------
-# declare names of make system control files derived from file files
+# declare names of make system control files derived from file 'options'
 #------------------------------------------------------------------------------
 
 OPTIONS = $(WM_OPTIONS)/options
 
 #------------------------------------------------------------------------------
-# Declare dependency of all make system files on FILE
+# Declare dependency of all make system files on OPTIONS
 # Causes all derived files to be remade if any are changed or missing
 #------------------------------------------------------------------------------
 
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index 4e7e3b4ef9..b31cd53a7f 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -1,7 +1,4 @@
-CGAL_PATH = ${WM_THIRD_PARTY_DIR}/CGAL-${CGAL_VERSION}
-
 CGAL_INC = \
     -Wno-old-style-cast \
     -I${CGAL_SRC}/include \
-    -I${CGAL_PATH} \
-    -I${BOOST_SRC}
+    -I${BOOST_ROOT}/include/boost-${BOOST_LIB_VERSION}
diff --git a/wmake/rules/linux64Gcc/cOpt b/wmake/rules/linux64Gcc/cOpt
index a8b0635478..17318709f1 100644
--- a/wmake/rules/linux64Gcc/cOpt
+++ b/wmake/rules/linux64Gcc/cOpt
@@ -1,2 +1,2 @@
-cDBUG       = 
+cDBUG       =
 cOPT        = -O3
diff --git a/wmake/rules/linux64Gcc/mplib b/wmake/rules/linux64Gcc/mplib
index 8a84b40146..294bd86150 100644
--- a/wmake/rules/linux64Gcc/mplib
+++ b/wmake/rules/linux64Gcc/mplib
@@ -1,3 +1,3 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
+PFLAGS     =
+PINC       =
+PLIBS      =
diff --git a/wmake/rules/linux64Gcc/mplibGAMMA b/wmake/rules/linux64Gcc/mplibGAMMA
index d62c6250ff..11606f2984 100644
--- a/wmake/rules/linux64Gcc/mplibGAMMA
+++ b/wmake/rules/linux64Gcc/mplibGAMMA
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linux64Gcc/mplibMPICH b/wmake/rules/linux64Gcc/mplibMPICH
index ac17f7c1d2..cb628e1117 100644
--- a/wmake/rules/linux64Gcc/mplibMPICH
+++ b/wmake/rules/linux64Gcc/mplibMPICH
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc42/c++Opt b/wmake/rules/linux64Gcc42/c++Opt
index 8ac07d2124..3446f7f58c 100644
--- a/wmake/rules/linux64Gcc42/c++Opt
+++ b/wmake/rules/linux64Gcc42/c++Opt
@@ -1,4 +1,4 @@
-c++DBUG     = 
+c++DBUG     =
 c++OPT      = -O3
 #c++OPT      = -march=nocona -O3
 # -ftree-vectorize -ftree-vectorizer-verbose=3
diff --git a/wmake/rules/linux64Gcc42/cOpt b/wmake/rules/linux64Gcc42/cOpt
index a8b0635478..17318709f1 100644
--- a/wmake/rules/linux64Gcc42/cOpt
+++ b/wmake/rules/linux64Gcc42/cOpt
@@ -1,2 +1,2 @@
-cDBUG       = 
+cDBUG       =
 cOPT        = -O3
diff --git a/wmake/rules/linux64Gcc42/mplib b/wmake/rules/linux64Gcc42/mplib
index 8a84b40146..294bd86150 100644
--- a/wmake/rules/linux64Gcc42/mplib
+++ b/wmake/rules/linux64Gcc42/mplib
@@ -1,3 +1,3 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
+PFLAGS     =
+PINC       =
+PLIBS      =
diff --git a/wmake/rules/linux64Gcc42/mplibGAMMA b/wmake/rules/linux64Gcc42/mplibGAMMA
index d62c6250ff..11606f2984 100644
--- a/wmake/rules/linux64Gcc42/mplibGAMMA
+++ b/wmake/rules/linux64Gcc42/mplibGAMMA
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linux64Gcc42/mplibMPICH b/wmake/rules/linux64Gcc42/mplibMPICH
index ac17f7c1d2..cb628e1117 100644
--- a/wmake/rules/linux64Gcc42/mplibMPICH
+++ b/wmake/rules/linux64Gcc42/mplibMPICH
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc43/c++Opt b/wmake/rules/linux64Gcc43/c++Opt
index 8ac07d2124..3446f7f58c 100644
--- a/wmake/rules/linux64Gcc43/c++Opt
+++ b/wmake/rules/linux64Gcc43/c++Opt
@@ -1,4 +1,4 @@
-c++DBUG     = 
+c++DBUG     =
 c++OPT      = -O3
 #c++OPT      = -march=nocona -O3
 # -ftree-vectorize -ftree-vectorizer-verbose=3
diff --git a/wmake/rules/linux64Gcc43/cOpt b/wmake/rules/linux64Gcc43/cOpt
index a8b0635478..17318709f1 100644
--- a/wmake/rules/linux64Gcc43/cOpt
+++ b/wmake/rules/linux64Gcc43/cOpt
@@ -1,2 +1,2 @@
-cDBUG       = 
+cDBUG       =
 cOPT        = -O3
diff --git a/wmake/rules/linux64Gcc43/mplib b/wmake/rules/linux64Gcc43/mplib
index 8a84b40146..294bd86150 100644
--- a/wmake/rules/linux64Gcc43/mplib
+++ b/wmake/rules/linux64Gcc43/mplib
@@ -1,3 +1,3 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
+PFLAGS     =
+PINC       =
+PLIBS      =
diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc43/mplibGAMMA
index d62c6250ff..11606f2984 100644
--- a/wmake/rules/linux64Gcc43/mplibGAMMA
+++ b/wmake/rules/linux64Gcc43/mplibGAMMA
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc43/mplibMPICH
index ac17f7c1d2..cb628e1117 100644
--- a/wmake/rules/linux64Gcc43/mplibMPICH
+++ b/wmake/rules/linux64Gcc43/mplibMPICH
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc44/X b/wmake/rules/linux64Gcc44/X
new file mode 100644
index 0000000000..5d1f9c5cc5
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/X
@@ -0,0 +1,3 @@
+XFLAGS     =
+XINC       = $(XFLAGS) -I/usr/X11R6/include
+XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11
diff --git a/wmake/rules/linux64Gcc44/c b/wmake/rules/linux64Gcc44/c
new file mode 100644
index 0000000000..80bb80f32f
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/c
@@ -0,0 +1,16 @@
+.SUFFIXES: .c .h
+
+cWARN        = -Wall
+
+cc          = gcc -m64
+
+include $(RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linux64Gcc44/c++ b/wmake/rules/linux64Gcc44/c++
new file mode 100644
index 0000000000..36b5c29b20
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/c++
@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
+
+CC          = g++ -m64
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-40
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared
+LINKEXE     = $(CC) $(c++FLAGS)
diff --git a/wmake/rules/linux64Gcc44/c++Debug b/wmake/rules/linux64Gcc44/c++Debug
new file mode 100644
index 0000000000..19bdb9c334
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/c++Debug
@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linux64Gcc44/c++Opt b/wmake/rules/linux64Gcc44/c++Opt
new file mode 100644
index 0000000000..3446f7f58c
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/c++Opt
@@ -0,0 +1,4 @@
+c++DBUG     =
+c++OPT      = -O3
+#c++OPT      = -march=nocona -O3
+# -ftree-vectorize -ftree-vectorizer-verbose=3
diff --git a/wmake/rules/linux64Gcc44/c++Prof b/wmake/rules/linux64Gcc44/c++Prof
new file mode 100644
index 0000000000..3bda4dad55
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/c++Prof
@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2
diff --git a/wmake/rules/linux64Gcc44/cDebug b/wmake/rules/linux64Gcc44/cDebug
new file mode 100644
index 0000000000..72b638f458
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/cDebug
@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/linux64Gcc44/cOpt b/wmake/rules/linux64Gcc44/cOpt
new file mode 100644
index 0000000000..17318709f1
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/cOpt
@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3
diff --git a/wmake/rules/linux64Gcc44/cProf b/wmake/rules/linux64Gcc44/cProf
new file mode 100644
index 0000000000..ca3ac9bf5f
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/cProf
@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2
diff --git a/wmake/rules/linux64Gcc44/general b/wmake/rules/linux64Gcc44/general
new file mode 100644
index 0000000000..10237bd1b6
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/general
@@ -0,0 +1,10 @@
+CPP        = /lib/cpp $(GFLAGS)
+LD         = ld
+
+PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/X
+include $(RULES)/c
+include $(RULES)/c++
diff --git a/wmake/rules/linux64Gcc44/mplib b/wmake/rules/linux64Gcc44/mplib
new file mode 100644
index 0000000000..294bd86150
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplib
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       =
+PLIBS      =
diff --git a/wmake/rules/linux64Gcc44/mplibGAMMA b/wmake/rules/linux64Gcc44/mplibGAMMA
new file mode 100644
index 0000000000..11606f2984
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplibGAMMA
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linux64Gcc44/mplibHPMPI b/wmake/rules/linux64Gcc44/mplibHPMPI
new file mode 100644
index 0000000000..574492a236
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplibHPMPI
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
diff --git a/wmake/rules/linux64Gcc44/mplibMPICH b/wmake/rules/linux64Gcc44/mplibMPICH
new file mode 100644
index 0000000000..cb628e1117
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplibMPICH
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc44/mplibMPICH-GM b/wmake/rules/linux64Gcc44/mplibMPICH-GM
new file mode 100644
index 0000000000..88493ebc70
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplibMPICH-GM
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linux64Gcc44/mplibOPENMPI b/wmake/rules/linux64Gcc44/mplibOPENMPI
new file mode 100644
index 0000000000..834d2d3e22
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplibOPENMPI
@@ -0,0 +1,3 @@
+PFLAGS     = -DOMPI_SKIP_MPICXX
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linux64Gcc44/mplibQSMPI b/wmake/rules/linux64Gcc44/mplibQSMPI
new file mode 100644
index 0000000000..95ea327379
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplibQSMPI
@@ -0,0 +1,4 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
+
diff --git a/wmake/rules/linuxGcc/c++Opt b/wmake/rules/linuxGcc/c++Opt
index 4cb95b5b3a..2aedabd628 100644
--- a/wmake/rules/linuxGcc/c++Opt
+++ b/wmake/rules/linuxGcc/c++Opt
@@ -1,2 +1,2 @@
-c++DBUG     = 
+c++DBUG     =
 c++OPT      = -O3
diff --git a/wmake/rules/linuxGcc/cOpt b/wmake/rules/linuxGcc/cOpt
index a8b0635478..17318709f1 100644
--- a/wmake/rules/linuxGcc/cOpt
+++ b/wmake/rules/linuxGcc/cOpt
@@ -1,2 +1,2 @@
-cDBUG       = 
+cDBUG       =
 cOPT        = -O3
diff --git a/wmake/rules/linuxGcc/mplib b/wmake/rules/linuxGcc/mplib
index 8a84b40146..294bd86150 100644
--- a/wmake/rules/linuxGcc/mplib
+++ b/wmake/rules/linuxGcc/mplib
@@ -1,3 +1,3 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
+PFLAGS     =
+PINC       =
+PLIBS      =
diff --git a/wmake/rules/linuxGcc/mplibGAMMA b/wmake/rules/linuxGcc/mplibGAMMA
index d62c6250ff..11606f2984 100644
--- a/wmake/rules/linuxGcc/mplibGAMMA
+++ b/wmake/rules/linuxGcc/mplibGAMMA
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc/mplibMPICH b/wmake/rules/linuxGcc/mplibMPICH
index ac17f7c1d2..cb628e1117 100644
--- a/wmake/rules/linuxGcc/mplibMPICH
+++ b/wmake/rules/linuxGcc/mplibMPICH
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc42/c++Opt b/wmake/rules/linuxGcc42/c++Opt
index 4cb95b5b3a..2aedabd628 100644
--- a/wmake/rules/linuxGcc42/c++Opt
+++ b/wmake/rules/linuxGcc42/c++Opt
@@ -1,2 +1,2 @@
-c++DBUG     = 
+c++DBUG     =
 c++OPT      = -O3
diff --git a/wmake/rules/linuxGcc42/cOpt b/wmake/rules/linuxGcc42/cOpt
index a8b0635478..17318709f1 100644
--- a/wmake/rules/linuxGcc42/cOpt
+++ b/wmake/rules/linuxGcc42/cOpt
@@ -1,2 +1,2 @@
-cDBUG       = 
+cDBUG       =
 cOPT        = -O3
diff --git a/wmake/rules/linuxGcc42/mplib b/wmake/rules/linuxGcc42/mplib
index 8a84b40146..294bd86150 100644
--- a/wmake/rules/linuxGcc42/mplib
+++ b/wmake/rules/linuxGcc42/mplib
@@ -1,3 +1,3 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
+PFLAGS     =
+PINC       =
+PLIBS      =
diff --git a/wmake/rules/linuxGcc42/mplibGAMMA b/wmake/rules/linuxGcc42/mplibGAMMA
index d62c6250ff..11606f2984 100644
--- a/wmake/rules/linuxGcc42/mplibGAMMA
+++ b/wmake/rules/linuxGcc42/mplibGAMMA
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc42/mplibMPICH b/wmake/rules/linuxGcc42/mplibMPICH
index ac17f7c1d2..cb628e1117 100644
--- a/wmake/rules/linuxGcc42/mplibMPICH
+++ b/wmake/rules/linuxGcc42/mplibMPICH
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc43/c++Opt b/wmake/rules/linuxGcc43/c++Opt
index 4cb95b5b3a..2aedabd628 100644
--- a/wmake/rules/linuxGcc43/c++Opt
+++ b/wmake/rules/linuxGcc43/c++Opt
@@ -1,2 +1,2 @@
-c++DBUG     = 
+c++DBUG     =
 c++OPT      = -O3
diff --git a/wmake/rules/linuxGcc43/cOpt b/wmake/rules/linuxGcc43/cOpt
index a8b0635478..17318709f1 100644
--- a/wmake/rules/linuxGcc43/cOpt
+++ b/wmake/rules/linuxGcc43/cOpt
@@ -1,2 +1,2 @@
-cDBUG       = 
+cDBUG       =
 cOPT        = -O3
diff --git a/wmake/rules/linuxGcc43/mplib b/wmake/rules/linuxGcc43/mplib
index 8a84b40146..294bd86150 100644
--- a/wmake/rules/linuxGcc43/mplib
+++ b/wmake/rules/linuxGcc43/mplib
@@ -1,3 +1,3 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
+PFLAGS     =
+PINC       =
+PLIBS      =
diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc43/mplibGAMMA
index d62c6250ff..11606f2984 100644
--- a/wmake/rules/linuxGcc43/mplibGAMMA
+++ b/wmake/rules/linuxGcc43/mplibGAMMA
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc43/mplibMPICH
index ac17f7c1d2..cb628e1117 100644
--- a/wmake/rules/linuxGcc43/mplibMPICH
+++ b/wmake/rules/linuxGcc43/mplibMPICH
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc44/X b/wmake/rules/linuxGcc44/X
new file mode 100644
index 0000000000..bed8bfeddf
--- /dev/null
+++ b/wmake/rules/linuxGcc44/X
@@ -0,0 +1,3 @@
+XFLAGS     =
+XINC       = $(XFLAGS) -I/usr/X11R6/include
+XLIBS      = -L/usr/X11R6/lib -lXext -lX11
diff --git a/wmake/rules/linuxGcc44/c b/wmake/rules/linuxGcc44/c
new file mode 100644
index 0000000000..8db5da1047
--- /dev/null
+++ b/wmake/rules/linuxGcc44/c
@@ -0,0 +1,16 @@
+.SUFFIXES: .c .h
+
+cWARN        = -Wall
+
+cc          = gcc -m32
+
+include $(RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linuxGcc44/c++ b/wmake/rules/linuxGcc44/c++
new file mode 100644
index 0000000000..64d6797573
--- /dev/null
+++ b/wmake/rules/linuxGcc44/c++
@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
+
+CC          = g++ -m32
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-40
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared
+LINKEXE     = $(CC) $(c++FLAGS)
diff --git a/wmake/rules/linuxGcc44/c++Debug b/wmake/rules/linuxGcc44/c++Debug
new file mode 100644
index 0000000000..19bdb9c334
--- /dev/null
+++ b/wmake/rules/linuxGcc44/c++Debug
@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxGcc44/c++Opt b/wmake/rules/linuxGcc44/c++Opt
new file mode 100644
index 0000000000..2aedabd628
--- /dev/null
+++ b/wmake/rules/linuxGcc44/c++Opt
@@ -0,0 +1,2 @@
+c++DBUG     =
+c++OPT      = -O3
diff --git a/wmake/rules/linuxGcc44/c++Prof b/wmake/rules/linuxGcc44/c++Prof
new file mode 100644
index 0000000000..3bda4dad55
--- /dev/null
+++ b/wmake/rules/linuxGcc44/c++Prof
@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2
diff --git a/wmake/rules/linuxGcc44/cDebug b/wmake/rules/linuxGcc44/cDebug
new file mode 100644
index 0000000000..72b638f458
--- /dev/null
+++ b/wmake/rules/linuxGcc44/cDebug
@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/linuxGcc44/cOpt b/wmake/rules/linuxGcc44/cOpt
new file mode 100644
index 0000000000..17318709f1
--- /dev/null
+++ b/wmake/rules/linuxGcc44/cOpt
@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3
diff --git a/wmake/rules/linuxGcc44/cProf b/wmake/rules/linuxGcc44/cProf
new file mode 100644
index 0000000000..ca3ac9bf5f
--- /dev/null
+++ b/wmake/rules/linuxGcc44/cProf
@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2
diff --git a/wmake/rules/linuxGcc44/general b/wmake/rules/linuxGcc44/general
new file mode 100644
index 0000000000..02ad6973ff
--- /dev/null
+++ b/wmake/rules/linuxGcc44/general
@@ -0,0 +1,10 @@
+CPP        = /lib/cpp $(GFLAGS)
+LD         = ld -melf_i386
+
+PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/X
+include $(RULES)/c
+include $(RULES)/c++
diff --git a/wmake/rules/linuxGcc44/mplib b/wmake/rules/linuxGcc44/mplib
new file mode 100644
index 0000000000..294bd86150
--- /dev/null
+++ b/wmake/rules/linuxGcc44/mplib
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       =
+PLIBS      =
diff --git a/wmake/rules/linuxGcc44/mplibGAMMA b/wmake/rules/linuxGcc44/mplibGAMMA
new file mode 100644
index 0000000000..11606f2984
--- /dev/null
+++ b/wmake/rules/linuxGcc44/mplibGAMMA
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc44/mplibHPMPI b/wmake/rules/linuxGcc44/mplibHPMPI
new file mode 100644
index 0000000000..8aff40632b
--- /dev/null
+++ b/wmake/rules/linuxGcc44/mplibHPMPI
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
diff --git a/wmake/rules/linuxGcc44/mplibMPICH b/wmake/rules/linuxGcc44/mplibMPICH
new file mode 100644
index 0000000000..cb628e1117
--- /dev/null
+++ b/wmake/rules/linuxGcc44/mplibMPICH
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc44/mplibMPICH-GM b/wmake/rules/linuxGcc44/mplibMPICH-GM
new file mode 100644
index 0000000000..88493ebc70
--- /dev/null
+++ b/wmake/rules/linuxGcc44/mplibMPICH-GM
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxGcc44/mplibOPENMPI b/wmake/rules/linuxGcc44/mplibOPENMPI
new file mode 100644
index 0000000000..834d2d3e22
--- /dev/null
+++ b/wmake/rules/linuxGcc44/mplibOPENMPI
@@ -0,0 +1,3 @@
+PFLAGS     = -DOMPI_SKIP_MPICXX
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/wmakeCheckPwd b/wmake/wmakeCheckPwd
new file mode 100755
index 0000000000..48266543fa
--- /dev/null
+++ b/wmake/wmakeCheckPwd
@@ -0,0 +1,103 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 1991-2009 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 2 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, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     wmakeCheckPwd
+#
+# Description
+#     Check that the current working directory is equal to a particular
+#     target directory, resolving the absolute path as required
+#
+#-------------------------------------------------------------------------------
+unset quietOpt
+
+usage() {
+    [ "$quietOpt" = true ] && exit 1
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+
+usage: ${0##*/} [OPTION] dirName
+
+options:
+  -q | -quiet   suppress all normal output
+
+  Check that the current working directory is equal to a particular
+  target directory, resolving the absolute path as required
+
+  Exit status 0 when the directories are identical
+  Exit status 1 on error
+
+USAGE
+    exit 1
+}
+
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -q | -quiet)
+        quietOpt=true
+        shift
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
+
+[ "$#" -eq 1 ] || usage
+dirName="$1"
+
+
+# trivial checks first
+[ "$PWD" = "$dirName" ] && exit 0
+
+[ -d "$dirName" ] || {
+    [ "$quietOpt" = true ] || echo "Error: Directory does not exist $dirName"
+    exit 1
+}
+
+
+# use /bin/pwd to get the absolute path (could be linked)
+thisDir=$(/bin/pwd)
+target=$(cd $dirName 2>/dev/null && /bin/pwd)
+
+# okay
+[ "$thisDir" = "$target" ] && exit 0
+
+# some other error
+[ "$quietOpt" = true ] || echo "Error: Current directory is not $dirName"
+exit 1
+
+#------------------------------------------------------------------------------
diff --git a/wmake/wmakeFilesAndOptions b/wmake/wmakeFilesAndOptions
index 4cf7fcbde8..d9fdca1854 100755
--- a/wmake/wmakeFilesAndOptions
+++ b/wmake/wmakeFilesAndOptions
@@ -55,12 +55,12 @@ else
 fi
 
 [ -e Make/files ] || {
-    echo "$Script: Creating files"
+    echo "$Script: Creating Make/files"
     $WM_DIR/scripts/makeFiles
 }
 
 [ -e Make/options ] || {
-    echo "$Script: Creating options"
+    echo "$Script: Creating Make/options"
     $WM_DIR/scripts/makeOptions
 }
 
diff --git a/wmake/wmakePrintBuild b/wmake/wmakePrintBuild
index d82c9ef92d..da3c8d4086 100755
--- a/wmake/wmakePrintBuild
+++ b/wmake/wmakePrintBuild
@@ -27,15 +27,13 @@
 #     wmakePrintBuild
 #
 # Description
-#     Print the version used when building the project.
+#     Print the version used when building the project
 #
 #------------------------------------------------------------------------------
-Script=${0##*/}
-
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
-usage: $Script [OPTION]
+usage: ${0##*/} [OPTION]
 options:
   -check          check the git head commit vs. \$WM_PROJECT_DIR/.build
                   (exit code 0 for no changes)
@@ -76,7 +74,7 @@ do
         ;;
     -v | -version)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-        version=$2
+        version="$2"
         shift 2
         ;;
     *)
@@ -101,7 +99,10 @@ else
     # get the head SHA1 when building under git
     # if there are multiple values (eg, HEAD, origin/HEAD, ...)
     # only take the first one, which is 'HEAD'
-    version=$(git show-ref --hash=12 --head HEAD 2>/dev/null | head -1)
+    version=$(
+        cd $WM_PROJECT_DIR 2>/dev/null && \
+        git show-ref --hash=12 --head HEAD 2>/dev/null | head -1
+    )
 
     if [ -n "$version" ]
     then